diff -r ebd48d2de13c -r ecbabf52600f textinput/ptienginev2/languages/PtiKeymappings_ITUT_01.cpp --- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_01.cpp Tue Aug 31 15:31:50 2010 +0300 +++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_01.cpp Wed Sep 01 12:23:33 2010 +0100 @@ -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,168 @@ // const TUint16 StandardQwertyData_table_English[] = { - 0x31, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x30, - 0x2b, - 0x71, - 0x77, - 0x65,0xe8,0xe9,0xea,0xeb, - 0x72, - 0x74,0xfe, - 0x79,0xfd, - 0x75,0xf9,0xfa,0xfb,0xfc, - 0x69,0xec,0xed,0xee,0xef, - 0x6f,0xf6,0xf8,0xf2,0xf3,0xf4,0xf5, - 0x70, - 0x2d, - 0x23, - 0x61,0xe4,0xe6,0xe5,0xe0,0xe1,0xe2,0xe3, - 0x73,0xdf, - 0x64,0xf0, - 0x66, - 0x67, - 0x68, - 0x6a, - 0x6b, - 0x6c, - 0x3b, - 0x27, - 0x7a, - 0x78, - 0x63,0xe7, - 0x76, - 0x62, - 0x6e,0xf1, - 0x6d, - 0x2c, - 0x2e, - 0x2f, - 0x21, - 0x22, - 0xa3, - 0x24, - 0x20ac, - 0x25, - 0x26, - 0x2a, - 0x28, - 0x29, - 0x3d, - 0x51, - 0x57, - 0x45,0xc8,0xc9,0xca,0xcb, - 0x52, - 0x54,0xde, - 0x59,0xdd, - 0x55,0xd9,0xda,0xdb,0xdc, - 0x49,0xcc,0xcd,0xce,0xcf, - 0x4f,0xd6,0xd8,0xd2,0xd3,0xd4,0xd5, - 0x50, - 0x5f, - 0x7e, - 0x41,0xc4,0xc6,0xc5,0xc0,0xc1,0xc2,0xc3, - 0x53, - 0x44,0xd0, - 0x46, - 0x47, - 0x48, - 0x4a, - 0x4b, - 0x4c, - 0x3a, - 0x40, - 0x5a, - 0x58, - 0x43,0xc7, - 0x56, - 0x42, - 0x4e,0xd1, - 0x4d, - 0x3c, - 0x3e, - 0x3f, + 0x0071, + 0x0077, + 0x0065, + 0x0072, + 0x0074, + 0x0079, + 0x0075, + 0x0069, + 0x006F, + 0x0070, + 0x0061, + 0x0073, + 0x0064, + 0x0066, + 0x0067, + 0x0068, + 0x006A, + 0x006B, + 0x006C, + 0x0027, + 0x007A, + 0x0078, + 0x0063, + 0x0076, + 0x0062, + 0x006E, + 0x006D, + 0x002C, + 0x002E, + 0x003F, + 0x0051, + 0x0057, + 0x0045, + 0x0052, + 0x0054, + 0x0059, + 0x0055, + 0x0049, + 0x004F, + 0x0050, + 0x0041, + 0x0053, + 0x0044, + 0x0046, + 0x0047, + 0x0048, + 0x004A, + 0x004B, + 0x004C, + 0x002F, + 0x005A, + 0x0058, + 0x0043, + 0x0056, + 0x0042, + 0x004E, + 0x004D, + 0x002B, + 0x002D, + 0x0021, }; -const TInt KStandardQwertyDataSize_English = 149; +const TInt KStandardQwertyDataSize_English = 60; const TPtiKeyBinding StandardQwertyKeyBindings_table_English[] = { - {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}, + {EPtiKeyQwertyAtCharacter, EPtiCaseLower, 0, 1}, + {EPtiKeyQwerty1, EPtiCaseLower, 1, 1}, + {EPtiKeyQwerty2, EPtiCaseLower, 2, 1}, + {EPtiKeyQwerty3, EPtiCaseLower, 3, 1}, + {EPtiKeyQwerty4, EPtiCaseLower, 4, 1}, + {EPtiKeyQwerty5, EPtiCaseLower, 5, 1}, + {EPtiKeyQwerty6, EPtiCaseLower, 6, 1}, + {EPtiKeyQwerty7, EPtiCaseLower, 7, 1}, + {EPtiKeyQwerty8, EPtiCaseLower, 8, 1}, + {EPtiKeyQwerty9, EPtiCaseLower, 9, 1}, + {EPtiKeyQwerty0, EPtiCaseLower, 10, 0}, {EPtiKeyQwertyPlus, EPtiCaseLower, 10, 1}, {EPtiKeyQwertyQ, EPtiCaseLower, 11, 1}, {EPtiKeyQwertyW, EPtiCaseLower, 12, 1}, - {EPtiKeyQwertyE, EPtiCaseLower, 13, 5}, - {EPtiKeyQwertyR, EPtiCaseLower, 18, 1}, - {EPtiKeyQwertyT, EPtiCaseLower, 19, 2}, - {EPtiKeyQwertyY, EPtiCaseLower, 21, 2}, - {EPtiKeyQwertyU, EPtiCaseLower, 23, 5}, - {EPtiKeyQwertyI, EPtiCaseLower, 28, 5}, - {EPtiKeyQwertyO, EPtiCaseLower, 33, 7}, - {EPtiKeyQwertyP, EPtiCaseLower, 40, 1}, - {EPtiKeyQwertyMinus, EPtiCaseLower, 41, 1}, - {EPtiKeyQwertyHash, EPtiCaseLower, 42, 1}, - {EPtiKeyQwertyA, EPtiCaseLower, 43, 8}, - {EPtiKeyQwertyS, EPtiCaseLower, 51, 2}, - {EPtiKeyQwertyD, EPtiCaseLower, 53, 2}, - {EPtiKeyQwertyF, EPtiCaseLower, 55, 1}, - {EPtiKeyQwertyG, EPtiCaseLower, 56, 1}, - {EPtiKeyQwertyH, EPtiCaseLower, 57, 1}, - {EPtiKeyQwertyJ, EPtiCaseLower, 58, 1}, - {EPtiKeyQwertyK, EPtiCaseLower, 59, 1}, - {EPtiKeyQwertyL, EPtiCaseLower, 60, 1}, - {EPtiKeyQwertySemicolon, EPtiCaseLower, 61, 1}, - {EPtiKeyQwertyApostrophe, EPtiCaseLower, 62, 1}, - {EPtiKeyQwertyZ, EPtiCaseLower, 63, 1}, - {EPtiKeyQwertyX, EPtiCaseLower, 64, 1}, - {EPtiKeyQwertyC, EPtiCaseLower, 65, 2}, - {EPtiKeyQwertyV, EPtiCaseLower, 67, 1}, - {EPtiKeyQwertyB, EPtiCaseLower, 68, 1}, - {EPtiKeyQwertyN, EPtiCaseLower, 69, 2}, - {EPtiKeyQwertyM, EPtiCaseLower, 71, 1}, - {EPtiKeyQwertyComma, EPtiCaseLower, 72, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseLower, 73, 1}, - {EPtiKeyQwertySlash, EPtiCaseLower, 74, 1}, - {EPtiKeyQwerty1, EPtiCaseUpper, 75, 1}, - {EPtiKeyQwerty2, EPtiCaseUpper, 76, 1}, - {EPtiKeyQwerty3, EPtiCaseUpper, 77, 1}, - {EPtiKeyQwerty4, EPtiCaseUpper, 78, 1}, - {EPtiKeyQwerty5, EPtiCaseUpper, 79, 1}, - {EPtiKeyQwerty6, EPtiCaseUpper, 80, 1}, - {EPtiKeyQwerty7, EPtiCaseUpper, 81, 1}, - {EPtiKeyQwerty8, EPtiCaseUpper, 82, 1}, - {EPtiKeyQwerty9, EPtiCaseUpper, 83, 1}, - {EPtiKeyQwerty0, EPtiCaseUpper, 84, 1}, - {EPtiKeyQwertyPlus, EPtiCaseUpper, 85, 1}, - {EPtiKeyQwertyQ, EPtiCaseUpper, 86, 1}, - {EPtiKeyQwertyW, EPtiCaseUpper, 87, 1}, - {EPtiKeyQwertyE, EPtiCaseUpper, 88, 5}, - {EPtiKeyQwertyR, EPtiCaseUpper, 93, 1}, - {EPtiKeyQwertyT, EPtiCaseUpper, 94, 2}, - {EPtiKeyQwertyY, EPtiCaseUpper, 96, 2}, - {EPtiKeyQwertyU, EPtiCaseUpper, 98, 5}, - {EPtiKeyQwertyI, EPtiCaseUpper, 103, 5}, - {EPtiKeyQwertyO, EPtiCaseUpper, 108, 7}, - {EPtiKeyQwertyP, EPtiCaseUpper, 115, 1}, - {EPtiKeyQwertyMinus, EPtiCaseUpper, 116, 1}, - {EPtiKeyQwertyHash, EPtiCaseUpper, 117, 1}, - {EPtiKeyQwertyA, EPtiCaseUpper, 118, 8}, - {EPtiKeyQwertyS, EPtiCaseUpper, 126, 1}, - {EPtiKeyQwertyD, EPtiCaseUpper, 127, 2}, - {EPtiKeyQwertyF, EPtiCaseUpper, 129, 1}, - {EPtiKeyQwertyG, EPtiCaseUpper, 130, 1}, - {EPtiKeyQwertyH, EPtiCaseUpper, 131, 1}, - {EPtiKeyQwertyJ, EPtiCaseUpper, 132, 1}, - {EPtiKeyQwertyK, EPtiCaseUpper, 133, 1}, - {EPtiKeyQwertyL, EPtiCaseUpper, 134, 1}, - {EPtiKeyQwertySemicolon, EPtiCaseUpper, 135, 1}, - {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 136, 1}, - {EPtiKeyQwertyZ, EPtiCaseUpper, 137, 1}, - {EPtiKeyQwertyX, EPtiCaseUpper, 138, 1}, - {EPtiKeyQwertyC, EPtiCaseUpper, 139, 2}, - {EPtiKeyQwertyV, EPtiCaseUpper, 141, 1}, - {EPtiKeyQwertyB, EPtiCaseUpper, 142, 1}, - {EPtiKeyQwertyN, EPtiCaseUpper, 143, 2}, - {EPtiKeyQwertyM, EPtiCaseUpper, 145, 1}, - {EPtiKeyQwertyComma, EPtiCaseUpper, 146, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseUpper, 147, 1}, - {EPtiKeyQwertySlash, EPtiCaseUpper, 148, 1}, + {EPtiKeyQwertyE, EPtiCaseLower, 13, 1}, + {EPtiKeyQwertyR, EPtiCaseLower, 14, 1}, + {EPtiKeyQwertyT, EPtiCaseLower, 15, 1}, + {EPtiKeyQwertyY, EPtiCaseLower, 16, 1}, + {EPtiKeyQwertyU, EPtiCaseLower, 17, 1}, + {EPtiKeyQwertyI, EPtiCaseLower, 18, 1}, + {EPtiKeyQwertyO, EPtiCaseLower, 19, 1}, + {EPtiKeyQwertyP, EPtiCaseLower, 20, 0}, + {EPtiKeyQwertyMinus, EPtiCaseLower, 20, 0}, + {EPtiKeyQwertyHash, EPtiCaseLower, 20, 1}, + {EPtiKeyQwertyA, EPtiCaseLower, 21, 1}, + {EPtiKeyQwertyS, EPtiCaseLower, 22, 1}, + {EPtiKeyQwertyD, EPtiCaseLower, 23, 1}, + {EPtiKeyQwertyF, EPtiCaseLower, 24, 1}, + {EPtiKeyQwertyG, EPtiCaseLower, 25, 1}, + {EPtiKeyQwertyH, EPtiCaseLower, 26, 1}, + {EPtiKeyQwertyJ, EPtiCaseLower, 27, 1}, + {EPtiKeyQwertyK, EPtiCaseLower, 28, 1}, + {EPtiKeyQwertyL, EPtiCaseLower, 29, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyApostrophe, EPtiCaseLower, 30, 0}, + {0x5b, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyZ, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyX, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyC, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyV, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyB, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyN, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyM, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyComma, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertySlash, EPtiCaseLower, 30, 0}, + {EPtiKeyQwertyAtCharacter, EPtiCaseUpper, 30, 1}, + {EPtiKeyQwerty1, EPtiCaseUpper, 31, 1}, + {EPtiKeyQwerty2, EPtiCaseUpper, 32, 1}, + {EPtiKeyQwerty3, EPtiCaseUpper, 33, 1}, + {EPtiKeyQwerty4, EPtiCaseUpper, 34, 1}, + {EPtiKeyQwerty5, EPtiCaseUpper, 35, 1}, + {EPtiKeyQwerty6, EPtiCaseUpper, 36, 1}, + {EPtiKeyQwerty7, EPtiCaseUpper, 37, 1}, + {EPtiKeyQwerty8, EPtiCaseUpper, 38, 1}, + {EPtiKeyQwerty9, EPtiCaseUpper, 39, 1}, + {EPtiKeyQwerty0, EPtiCaseUpper, 40, 0}, + {EPtiKeyQwertyPlus, EPtiCaseUpper, 40, 1}, + {EPtiKeyQwertyQ, EPtiCaseUpper, 41, 1}, + {EPtiKeyQwertyW, EPtiCaseUpper, 42, 1}, + {EPtiKeyQwertyE, EPtiCaseUpper, 43, 1}, + {EPtiKeyQwertyR, EPtiCaseUpper, 44, 1}, + {EPtiKeyQwertyT, EPtiCaseUpper, 45, 1}, + {EPtiKeyQwertyY, EPtiCaseUpper, 46, 1}, + {EPtiKeyQwertyU, EPtiCaseUpper, 47, 1}, + {EPtiKeyQwertyI, EPtiCaseUpper, 48, 1}, + {EPtiKeyQwertyO, EPtiCaseUpper, 49, 1}, + {EPtiKeyQwertyP, EPtiCaseUpper, 50, 0}, + {EPtiKeyQwertyMinus, EPtiCaseUpper, 50, 0}, + {EPtiKeyQwertyHash, EPtiCaseUpper, 50, 1}, + {EPtiKeyQwertyA, EPtiCaseUpper, 51, 1}, + {EPtiKeyQwertyS, EPtiCaseUpper, 52, 1}, + {EPtiKeyQwertyD, EPtiCaseUpper, 53, 1}, + {EPtiKeyQwertyF, EPtiCaseUpper, 54, 1}, + {EPtiKeyQwertyG, EPtiCaseUpper, 55, 1}, + {EPtiKeyQwertyH, EPtiCaseUpper, 56, 1}, + {EPtiKeyQwertyJ, EPtiCaseUpper, 57, 1}, + {EPtiKeyQwertyK, EPtiCaseUpper, 58, 1}, + {EPtiKeyQwertyL, EPtiCaseUpper, 59, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 60, 0}, + {0x5b, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyZ, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyX, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyC, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyV, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyB, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyN, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyM, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyComma, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseUpper, 60, 0}, + {EPtiKeyQwertySlash, EPtiCaseUpper, 60, 0}, }; -const TInt KMaxStandardQwertyIndex_English = 88; +const TInt KMaxStandardQwertyIndex_English = 92; // // MiniQwerty keymap data table @@ -853,7 +829,6 @@ 0x004A, 0x004B, 0x004C, - 0x0021 , 0x0022, 0x0023, 0x0024, @@ -875,7 +850,7 @@ 0x0077, }; -const TInt KCustomQwertyDataSize_English = 56; +const TInt KCustomQwertyDataSize_English = 55; const TPtiKeyBinding CustomQwertyKeyBindings_table_English[] = @@ -910,24 +885,24 @@ { EPtiKeyQwerty8, EPtiCaseUpper, 31, 1}, { EPtiKeyQwerty9, EPtiCaseUpper, 32, 1}, { EPtiKeyQwerty0, EPtiCaseUpper, 33, 1}, - { EPtiKeyQwertyA, EPtiCaseUpper, 36, 1}, - { EPtiKeyQwertyB, EPtiCaseUpper, 37, 1}, - { EPtiKeyQwertyC, EPtiCaseUpper, 38, 1}, - { EPtiKeyQwertyD, EPtiCaseUpper, 39, 1}, - { EPtiKeyQwertyE, EPtiCaseUpper, 40, 1}, - { EPtiKeyQwertyF, EPtiCaseUpper, 41, 1}, - { EPtiKeyQwertyG, EPtiCaseUpper, 42, 1}, - { EPtiKeyQwertyH, EPtiCaseUpper, 43, 1}, - { EPtiKeyQwertyI, EPtiCaseUpper, 44, 1}, - { EPtiKeyQwertyJ, EPtiCaseUpper, 45, 1}, - { EPtiKeyQwerty1, EPtiCaseFnLower, 48, 1}, - { EPtiKeyQwerty2, EPtiCaseFnLower, 49, 1}, - { EPtiKeyQwerty3, EPtiCaseFnLower, 50, 1}, - { EPtiKeyQwerty4, EPtiCaseFnLower, 51, 1}, - { EPtiKeyQwerty5, EPtiCaseFnLower, 52, 1}, - { EPtiKeyQwerty6, EPtiCaseFnLower, 53, 1}, - { EPtiKeyQwerty7, EPtiCaseFnLower, 54, 1}, - { EPtiKeyQwerty8, EPtiCaseFnLower, 55, 1}, + { EPtiKeyQwertyA, EPtiCaseUpper, 36, 0}, + { EPtiKeyQwertyB, EPtiCaseUpper, 36, 1}, + { EPtiKeyQwertyC, EPtiCaseUpper, 37, 1}, + { EPtiKeyQwertyD, EPtiCaseUpper, 38, 1}, + { EPtiKeyQwertyE, EPtiCaseUpper, 39, 1}, + { EPtiKeyQwertyF, EPtiCaseUpper, 40, 1}, + { EPtiKeyQwertyG, EPtiCaseUpper, 41, 1}, + { EPtiKeyQwertyH, EPtiCaseUpper, 42, 1}, + { EPtiKeyQwertyI, EPtiCaseUpper, 43, 1}, + { EPtiKeyQwertyJ, EPtiCaseUpper, 44, 1}, + { EPtiKeyQwerty1, EPtiCaseFnLower, 47, 1}, + { EPtiKeyQwerty2, EPtiCaseFnLower, 48, 1}, + { EPtiKeyQwerty3, EPtiCaseFnLower, 49, 1}, + { EPtiKeyQwerty4, EPtiCaseFnLower, 50, 1}, + { EPtiKeyQwerty5, EPtiCaseFnLower, 51, 1}, + { EPtiKeyQwerty6, EPtiCaseFnLower, 52, 1}, + { EPtiKeyQwerty7, EPtiCaseFnLower, 53, 1}, + { EPtiKeyQwerty8, EPtiCaseFnLower, 54, 1}, }; const TInt KMaxCustomQwertyIndex_English = 48;