diff -r e6a39382bb9c -r c8fb4cf7b3ae textinput/ptienginev2/languages/PtiKeymappings_ITUT_17.cpp --- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_17.cpp Tue Apr 27 16:59:43 2010 +0300 +++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_17.cpp Tue May 11 16:31:42 2010 +0300 @@ -1,8 +1,8 @@ /* -* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0"" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -97,192 +97,208 @@ // const TUint16 StandardQwertyData_table_Hungarian[] = { - 0x31, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x30, - 0x2d, - 0x71, - 0x77, - 0x65,0x119,0x11b,0xe9, - 0x72,0x155,0x159, - 0x74,0x163,0x165, - 0x79,0xfd, - 0x75,0xfa,0x16f,0x171, - 0x69,0xed,0xee, - 0x6f,0xf3,0xf4,0x151, - 0x70, - 0xf6,0x151, - 0x23, - 0x61,0xe4,0xe2,0x103,0x105,0xe1, - 0x73,0xdf,0x15b,0x15f,0x161, - 0x64,0x111,0x10f, - 0x66, - 0x67, - 0x68, - 0x6a, - 0x6b, - 0x6c,0x142, - 0xe9, - 0xe1, - 0x7a,0x17a,0x17c,0x17e, - 0x78, - 0x63,0x107,0x10d, - 0x76, - 0x62, - 0x6e,0x144,0x148, - 0x6d, - 0x2c, - 0x2e, - 0xfc,0x171, - 0x27, - 0x22, - 0x2b, - 0x21, - 0x40, - 0x2f, - 0x3d, - 0x28, - 0x29, - 0x20ac, - 0x3b, - 0x51, - 0x57, - 0x45,0x118,0x11a,0xc9, - 0x52,0x154,0x158, - 0x54,0x162,0x164, - 0x59,0xdd, - 0x55,0xda,0x16e,0x170, - 0x49,0xcd,0xce, - 0x4f,0xd3,0xd4,0x150, - 0x50, - 0xd6,0x150, - 0x2a, - 0x41,0xc4,0xc2,0x102,0x104,0xc1, - 0x53,0x15a,0x15e,0x160, - 0x44,0x110,0x10e, - 0x46, - 0x47, - 0x48, - 0x4a, - 0x4b, - 0x4c,0x141, - 0xc9, - 0xc1, - 0x5a,0x179,0x17b,0x17d, - 0x58, - 0x43,0x106,0x10c, - 0x56, - 0x42, - 0x4e,0x143,0x147, - 0x4d, - 0x3f, - 0x3a, - 0xdc,0x170, + 0x0071, + 0x0077, + 0x0065,0x00EB,0x00E9, + 0x0072,0x0155, + 0x0074, + 0x0079,0x00FF,0x00FD, + 0x0075,0x00FC,0x00FA,0x0171, + 0x0069,0x00EF,0x00ED, + 0x006F,0x00F6,0x00F3,0x0151, + 0x0070, + 0xF002,0x00B4, + 0x0061,0x00E1, + 0x0073,0x015B, + 0x0064, + 0x0066, + 0x0067, + 0x0068, + 0x006A, + 0x006B, + 0x006C,0x013A, + 0xF001,0x00A8, + 0xF003,0x02DD, + 0x007A,0x017A, + 0x0078, + 0x0063,0x0107, + 0x0076, + 0x0062, + 0x006E,0x0144, + 0x006D, + 0x002C, + 0x002E, + 0x003F, + 0x002D, + 0x0051, + 0x0057, + 0x0045,0x00CB,0x00C9, + 0x0052,0x0154, + 0x0054, + 0x0059,0x0178,0x00DD, + 0x0055,0x00DC,0x00DA,0x0170, + 0x0049,0x00CF,0x00CD, + 0x004F,0x00D6,0x00D3,0x0150, + 0x0050, + 0xF002,0x00B4, + 0x0041,0x00C1, + 0x0053,0x015A, + 0x0044, + 0x0046, + 0x0047, + 0x0048, + 0x004A, + 0x004B, + 0x004C,0x0139, + 0xF001,0x00A8, + 0xF003,0x02DD, + 0x005A,0x0179, + 0x0058, + 0x0043,0x0106, + 0x0056, + 0x0042, + 0x004E,0x0143, + 0x004D, + 0x0027, + 0x002F, + 0x0021, + 0x002B, }; -const TInt KStandardQwertyDataSize_Hungarian = 161; +const TInt KStandardQwertyDataSize_Hungarian = 110; const TPtiKeyBinding StandardQwertyKeyBindings_table_Hungarian[] = { - {EPtiKeyQwerty1, EPtiCaseLower, 0, 1}, - {EPtiKeyQwerty2, EPtiCaseLower, 1, 1}, - {EPtiKeyQwerty3, EPtiCaseLower, 2, 1}, - {EPtiKeyQwerty4, EPtiCaseLower, 3, 1}, - {EPtiKeyQwerty5, EPtiCaseLower, 4, 1}, - {EPtiKeyQwerty6, EPtiCaseLower, 5, 1}, - {EPtiKeyQwerty7, EPtiCaseLower, 6, 1}, - {EPtiKeyQwerty8, EPtiCaseLower, 7, 1}, - {EPtiKeyQwerty9, EPtiCaseLower, 8, 1}, - {EPtiKeyQwerty0, EPtiCaseLower, 9, 1}, - {EPtiKeyQwertyPlus, EPtiCaseLower, 10, 1}, - {EPtiKeyQwertyQ, EPtiCaseLower, 11, 1}, - {EPtiKeyQwertyW, EPtiCaseLower, 12, 1}, - {EPtiKeyQwertyE, EPtiCaseLower, 13, 4}, - {EPtiKeyQwertyR, EPtiCaseLower, 17, 3}, - {EPtiKeyQwertyT, EPtiCaseLower, 20, 3}, - {EPtiKeyQwertyY, EPtiCaseLower, 23, 2}, - {EPtiKeyQwertyU, EPtiCaseLower, 25, 4}, - {EPtiKeyQwertyI, EPtiCaseLower, 29, 3}, - {EPtiKeyQwertyO, EPtiCaseLower, 32, 4}, - {EPtiKeyQwertyP, EPtiCaseLower, 36, 1}, - {EPtiKeyQwertyMinus, EPtiCaseLower, 37, 2}, - {EPtiKeyQwertyHash, EPtiCaseLower, 39, 1}, - {EPtiKeyQwertyA, EPtiCaseLower, 40, 6}, - {EPtiKeyQwertyS, EPtiCaseLower, 46, 5}, - {EPtiKeyQwertyD, EPtiCaseLower, 51, 3}, - {EPtiKeyQwertyF, EPtiCaseLower, 54, 1}, - {EPtiKeyQwertyG, EPtiCaseLower, 55, 1}, - {EPtiKeyQwertyH, EPtiCaseLower, 56, 1}, - {EPtiKeyQwertyJ, EPtiCaseLower, 57, 1}, - {EPtiKeyQwertyK, EPtiCaseLower, 58, 1}, - {EPtiKeyQwertyL, EPtiCaseLower, 59, 2}, - {EPtiKeyQwertySemicolon, EPtiCaseLower, 61, 1}, - {EPtiKeyQwertyApostrophe, EPtiCaseLower, 62, 1}, - {EPtiKeyQwertyZ, EPtiCaseLower, 63, 4}, - {EPtiKeyQwertyX, EPtiCaseLower, 67, 1}, - {EPtiKeyQwertyC, EPtiCaseLower, 68, 3}, - {EPtiKeyQwertyV, EPtiCaseLower, 71, 1}, - {EPtiKeyQwertyB, EPtiCaseLower, 72, 1}, - {EPtiKeyQwertyN, EPtiCaseLower, 73, 3}, - {EPtiKeyQwertyM, EPtiCaseLower, 76, 1}, - {EPtiKeyQwertyComma, EPtiCaseLower, 77, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseLower, 78, 1}, - {EPtiKeyQwertySlash, EPtiCaseLower, 79, 2}, - {EPtiKeyQwerty1, EPtiCaseUpper, 81, 1}, - {EPtiKeyQwerty2, EPtiCaseUpper, 82, 1}, - {EPtiKeyQwerty3, EPtiCaseUpper, 83, 1}, - {EPtiKeyQwerty4, EPtiCaseUpper, 84, 1}, - {EPtiKeyQwerty5, EPtiCaseUpper, 85, 1}, - {EPtiKeyQwerty6, EPtiCaseUpper, 86, 1}, - {EPtiKeyQwerty7, EPtiCaseUpper, 87, 1}, - {EPtiKeyQwerty8, EPtiCaseUpper, 88, 1}, - {EPtiKeyQwerty9, EPtiCaseUpper, 89, 1}, - {EPtiKeyQwerty0, EPtiCaseUpper, 90, 1}, - {EPtiKeyQwertyPlus, EPtiCaseUpper, 91, 1}, - {EPtiKeyQwertyQ, EPtiCaseUpper, 92, 1}, - {EPtiKeyQwertyW, EPtiCaseUpper, 93, 1}, - {EPtiKeyQwertyE, EPtiCaseUpper, 94, 4}, - {EPtiKeyQwertyR, EPtiCaseUpper, 98, 3}, - {EPtiKeyQwertyT, EPtiCaseUpper, 101, 3}, - {EPtiKeyQwertyY, EPtiCaseUpper, 104, 2}, - {EPtiKeyQwertyU, EPtiCaseUpper, 106, 4}, - {EPtiKeyQwertyI, EPtiCaseUpper, 110, 3}, - {EPtiKeyQwertyO, EPtiCaseUpper, 113, 4}, - {EPtiKeyQwertyP, EPtiCaseUpper, 117, 1}, - {EPtiKeyQwertyMinus, EPtiCaseUpper, 118, 2}, - {EPtiKeyQwertyHash, EPtiCaseUpper, 120, 1}, - {EPtiKeyQwertyA, EPtiCaseUpper, 121, 6}, - {EPtiKeyQwertyS, EPtiCaseUpper, 127, 4}, - {EPtiKeyQwertyD, EPtiCaseUpper, 131, 3}, - {EPtiKeyQwertyF, EPtiCaseUpper, 134, 1}, - {EPtiKeyQwertyG, EPtiCaseUpper, 135, 1}, - {EPtiKeyQwertyH, EPtiCaseUpper, 136, 1}, - {EPtiKeyQwertyJ, EPtiCaseUpper, 137, 1}, - {EPtiKeyQwertyK, EPtiCaseUpper, 138, 1}, - {EPtiKeyQwertyL, EPtiCaseUpper, 139, 2}, - {EPtiKeyQwertySemicolon, EPtiCaseUpper, 141, 1}, - {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 142, 1}, - {EPtiKeyQwertyZ, EPtiCaseUpper, 143, 4}, - {EPtiKeyQwertyX, EPtiCaseUpper, 147, 1}, - {EPtiKeyQwertyC, EPtiCaseUpper, 148, 3}, - {EPtiKeyQwertyV, EPtiCaseUpper, 151, 1}, - {EPtiKeyQwertyB, EPtiCaseUpper, 152, 1}, - {EPtiKeyQwertyN, EPtiCaseUpper, 153, 3}, - {EPtiKeyQwertyM, EPtiCaseUpper, 156, 1}, - {EPtiKeyQwertyComma, EPtiCaseUpper, 157, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseUpper, 158, 1}, - {EPtiKeyQwertySlash, EPtiCaseUpper, 159, 2}, + {EPtiKeyQwertyAtCharacter, EPtiCaseLower, 0, 1}, + {EPtiKeyQwerty1, EPtiCaseLower, 1, 1}, + {EPtiKeyQwerty2, EPtiCaseLower, 2, 3}, + {EPtiKeyQwerty3, EPtiCaseLower, 5, 2}, + {EPtiKeyQwerty4, EPtiCaseLower, 7, 1}, + {EPtiKeyQwerty5, EPtiCaseLower, 8, 3}, + {EPtiKeyQwerty6, EPtiCaseLower, 11, 4}, + {EPtiKeyQwerty7, EPtiCaseLower, 15, 3}, + {EPtiKeyQwerty8, EPtiCaseLower, 18, 4}, + {EPtiKeyQwerty9, EPtiCaseLower, 22, 1}, + {EPtiKeyQwerty0, EPtiCaseLower, 23, 2}, + {EPtiKeyQwertyPlus, EPtiCaseLower, 25, 2}, + {EPtiKeyQwertyQ, EPtiCaseLower, 27, 2}, + {EPtiKeyQwertyW, EPtiCaseLower, 29, 1}, + {EPtiKeyQwertyE, EPtiCaseLower, 30, 1}, + {EPtiKeyQwertyR, EPtiCaseLower, 31, 1}, + {EPtiKeyQwertyT, EPtiCaseLower, 32, 1}, + {EPtiKeyQwertyY, EPtiCaseLower, 33, 1}, + {EPtiKeyQwertyU, EPtiCaseLower, 34, 1}, + {EPtiKeyQwertyI, EPtiCaseLower, 35, 2}, + {EPtiKeyQwertyO, EPtiCaseLower, 37, 2}, + {EPtiKeyQwertyP, EPtiCaseLower, 39, 2}, + {EPtiKeyQwertyMinus, EPtiCaseLower, 41, 0}, + {EPtiKeyQwertyHash, EPtiCaseLower, 41, 2}, + {EPtiKeyQwertyA, EPtiCaseLower, 43, 1}, + {EPtiKeyQwertyS, EPtiCaseLower, 44, 2}, + {EPtiKeyQwertyD, EPtiCaseLower, 46, 1}, + {EPtiKeyQwertyF, EPtiCaseLower, 47, 1}, + {EPtiKeyQwertyG, EPtiCaseLower, 48, 2}, + {EPtiKeyQwertyH, EPtiCaseLower, 50, 1}, + {EPtiKeyQwertyJ, EPtiCaseLower, 51, 1}, + {EPtiKeyQwertyK, EPtiCaseLower, 52, 1}, + {EPtiKeyQwertyL, EPtiCaseLower, 53, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseLower, 54, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseLower, 55, 0}, + {0x5b, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyZ, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyX, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyC, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyV, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyB, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyN, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyM, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyComma, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertySlash, EPtiCaseLower, 55, 0}, + {EPtiKeyQwertyAtCharacter, EPtiCaseUpper, 55, 1}, + {EPtiKeyQwerty1, EPtiCaseUpper, 56, 1}, + {EPtiKeyQwerty2, EPtiCaseUpper, 57, 3}, + {EPtiKeyQwerty3, EPtiCaseUpper, 60, 2}, + {EPtiKeyQwerty4, EPtiCaseUpper, 62, 1}, + {EPtiKeyQwerty5, EPtiCaseUpper, 63, 3}, + {EPtiKeyQwerty6, EPtiCaseUpper, 66, 4}, + {EPtiKeyQwerty7, EPtiCaseUpper, 70, 3}, + {EPtiKeyQwerty8, EPtiCaseUpper, 73, 4}, + {EPtiKeyQwerty9, EPtiCaseUpper, 77, 1}, + {EPtiKeyQwerty0, EPtiCaseUpper, 78, 2}, + {EPtiKeyQwertyPlus, EPtiCaseUpper, 80, 2}, + {EPtiKeyQwertyQ, EPtiCaseUpper, 82, 2}, + {EPtiKeyQwertyW, EPtiCaseUpper, 84, 1}, + {EPtiKeyQwertyE, EPtiCaseUpper, 85, 1}, + {EPtiKeyQwertyR, EPtiCaseUpper, 86, 1}, + {EPtiKeyQwertyT, EPtiCaseUpper, 87, 1}, + {EPtiKeyQwertyY, EPtiCaseUpper, 88, 1}, + {EPtiKeyQwertyU, EPtiCaseUpper, 89, 1}, + {EPtiKeyQwertyI, EPtiCaseUpper, 90, 2}, + {EPtiKeyQwertyO, EPtiCaseUpper, 92, 2}, + {EPtiKeyQwertyP, EPtiCaseUpper, 94, 2}, + {EPtiKeyQwertyMinus, EPtiCaseUpper, 96, 0}, + {EPtiKeyQwertyHash, EPtiCaseUpper, 96, 2}, + {EPtiKeyQwertyA, EPtiCaseUpper, 98, 1}, + {EPtiKeyQwertyS, EPtiCaseUpper, 99, 2}, + {EPtiKeyQwertyD, EPtiCaseUpper, 101, 1}, + {EPtiKeyQwertyF, EPtiCaseUpper, 102, 1}, + {EPtiKeyQwertyG, EPtiCaseUpper, 103, 2}, + {EPtiKeyQwertyH, EPtiCaseUpper, 105, 1}, + {EPtiKeyQwertyJ, EPtiCaseUpper, 106, 1}, + {EPtiKeyQwertyK, EPtiCaseUpper, 107, 1}, + {EPtiKeyQwertyL, EPtiCaseUpper, 108, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseUpper, 109, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 110, 0}, + {0x5b, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyZ, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyX, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyC, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyV, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyB, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyN, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyM, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyComma, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseUpper, 110, 0}, + {EPtiKeyQwertySlash, EPtiCaseUpper, 110, 0}, }; -const TInt KMaxStandardQwertyIndex_Hungarian = 88; +const TInt KMaxStandardQwertyIndex_Hungarian = 92; + + +// +// Dead key data table for StandardQwerty +// +const TUint16 StandardQwertyDeadKeyData_table_Hungarian[] = + { + 2, 0x00EB,0x00E9,0xf000,0xf000,0xf000, + 3, 0xF000,0xF000,0x0155,0xf000,0xf000, + 5, 0x00FF,0x00FD,0xf000,0xf000,0xf000, + 6, 0x00FC,0x00FA,0x0171,0xf000,0xf000, + 7, 0x00EF,0x00ED,0xf000,0xf000,0xf000, + 8, 0x00F6,0x00F3,0x0151,0xf000,0xf000, + 11, 0xF000,0x00E1,0xf000,0xf000,0xf000, + 12, 0xF000,0xF000,0x015B,0xf000,0xf000, + 19, 0xF000,0x013A,0xf000,0xf000,0xf000, + 22, 0xF000,0x017A,0xf000,0xf000,0xf000, + 24, 0xF000,0x0107,0xf000,0xf000,0xf000, + 27, 0xF000,0x0144,0xf000,0xf000,0xf000, + 35, 0x00CB,0x00C9,0xf000,0xf000,0xf000, + 36, 0xF000,0xF000,0x0154,0xf000,0xf000, + 38, 0x0178,0x00DD,0xf000,0xf000,0xf000, + 39, 0x00DC,0x00DA,0x0170,0xf000,0xf000, + 40, 0x00CF,0x00CD,0xf000,0xf000,0xf000, + 41, 0x00D6,0x00D3,0x0150,0xf000,0xf000, + 44, 0xF000,0x00C1,0xf000,0xf000,0xf000, + 45, 0xF000,0xF000,0x015A,0xf000,0xf000, + 52, 0xF000,0x0139,0xf000,0xf000,0xf000, + 55, 0xF000,0x0179,0xf000,0xf000,0xf000, + 57, 0xF000,0x0106,0xf000,0xf000,0xf000, + 60, 0xF000,0x0143,0xf000,0xf000,0xf000, + }; + +const TInt KStandardQwertyDeadKeyTableRows_Hungarian = 24; // // MiniQwerty keymap data table @@ -539,3 +555,16 @@ } +const TUint16* CPtiLangDataImplHungarian::DeadKeyDataArray(TPtiKeyboardType aKeyboardType, TInt& aNumRowsInArray) const + { + if (aKeyboardType == EPtiKeyboardQwerty4x12) + { + aNumRowsInArray = KStandardQwertyDeadKeyTableRows_Hungarian; + return StandardQwertyDeadKeyData_table_Hungarian; + } + + aNumRowsInArray = 0; + return NULL; + } + +