diff -r e6a39382bb9c -r c8fb4cf7b3ae textinput/ptienginev2/languages/PtiKeymappings_ITUT_16.cpp --- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_16.cpp Tue Apr 27 16:59:43 2010 +0300 +++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_16.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,206 +97,176 @@ // const TUint16 StandardQwertyData_table_Russian[] = { - 0x31, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x30, - 0x2d, - 0x439, - 0x446, - 0x443, - 0x43a, - 0x435, - 0x43d, - 0x433, - 0x448, - 0x449, - 0x437, - 0x445, - 0x2b, - 0x444, - 0x44b, - 0x432, - 0x430, - 0x43f, - 0x440, - 0x43e, - 0x43b, - 0x434, - 0x436, - 0x44d, - 0x44f, - 0x447, - 0x441, - 0x43c, - 0x438, - 0x442, - 0x44c, - 0x431, - 0x44e, - 0x2e, - 0x21, - 0x22, - 0x40, - 0x3b, - 0x3d, - 0x3a, - 0x3f, - 0x2a, - 0x28, - 0x29, - 0x2f, - 0x419, - 0x426, - 0x423, - 0x41a, - 0x415, - 0x41d, - 0x413, - 0x428, - 0x429, - 0x417, - 0x425, - 0x23, - 0x424, - 0x42b, - 0x412, - 0x410, - 0x41f, - 0x420, - 0x41e, - 0x41b, - 0x414, - 0x416, - 0x42d, - 0x42f, - 0x427, - 0x421, - 0x41c, - 0x418, - 0x422, - 0x42c, - 0x411, - 0x42e, - 0x2c, + 0x0439, + 0x0446, + 0x0443, + 0x043A, + 0x0435,0x0451, + 0x043D, + 0x0433, + 0x0448, + 0x0449, + 0x0437, + 0x0445, + 0x0444, + 0x044B, + 0x0432, + 0x0430, + 0x043F, + 0x0440, + 0x043E, + 0x043B, + 0x0434, + 0x0436, + 0x044D, + 0x044F, + 0x0447, + 0x0441, + 0x043C, + 0x0438, + 0x0442, + 0x044C, + 0x0431, + 0x044E, + 0x044A, + 0x002E, + 0x0419, + 0x0426, + 0x0423, + 0x041A, + 0x0415,0x0401, + 0x041D, + 0x0413, + 0x0428, + 0x0429, + 0x0417, + 0x0425, + 0x0424, + 0x042B, + 0x0412, + 0x0410, + 0x041F, + 0x0420, + 0x041E, + 0x041B, + 0x0414, + 0x0416, + 0x042D, + 0x042F, + 0x0427, + 0x0421, + 0x041C, + 0x0418, + 0x0422, + 0x042C, + 0x0411, + 0x042E, + 0x042A, + 0x002C, }; -const TInt KStandardQwertyDataSize_Russian = 88; +const TInt KStandardQwertyDataSize_Russian = 68; const TPtiKeyBinding StandardQwertyKeyBindings_table_Russian[] = { - {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, 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, 1}, - {EPtiKeyQwertyMinus, EPtiCaseLower, 21, 1}, - {EPtiKeyQwertyHash, EPtiCaseLower, 22, 1}, - {EPtiKeyQwertyA, EPtiCaseLower, 23, 1}, - {EPtiKeyQwertyS, EPtiCaseLower, 24, 1}, - {EPtiKeyQwertyD, EPtiCaseLower, 25, 1}, - {EPtiKeyQwertyF, EPtiCaseLower, 26, 1}, - {EPtiKeyQwertyG, EPtiCaseLower, 27, 1}, - {EPtiKeyQwertyH, EPtiCaseLower, 28, 1}, - {EPtiKeyQwertyJ, EPtiCaseLower, 29, 1}, - {EPtiKeyQwertyK, EPtiCaseLower, 30, 1}, - {EPtiKeyQwertyL, EPtiCaseLower, 31, 1}, - {EPtiKeyQwertySemicolon, EPtiCaseLower, 32, 1}, - {EPtiKeyQwertyApostrophe, EPtiCaseLower, 33, 1}, - {EPtiKeyQwertyZ, EPtiCaseLower, 34, 1}, - {EPtiKeyQwertyX, EPtiCaseLower, 35, 1}, - {EPtiKeyQwertyC, EPtiCaseLower, 36, 1}, - {EPtiKeyQwertyV, EPtiCaseLower, 37, 1}, - {EPtiKeyQwertyB, EPtiCaseLower, 38, 1}, - {EPtiKeyQwertyN, EPtiCaseLower, 39, 1}, - {EPtiKeyQwertyM, EPtiCaseLower, 40, 1}, - {EPtiKeyQwertyComma, EPtiCaseLower, 41, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseLower, 42, 1}, - {EPtiKeyQwertySlash, EPtiCaseLower, 43, 1}, - {EPtiKeyQwerty1, EPtiCaseUpper, 44, 1}, - {EPtiKeyQwerty2, EPtiCaseUpper, 45, 1}, - {EPtiKeyQwerty3, EPtiCaseUpper, 46, 1}, - {EPtiKeyQwerty4, EPtiCaseUpper, 47, 1}, - {EPtiKeyQwerty5, EPtiCaseUpper, 48, 1}, - {EPtiKeyQwerty6, EPtiCaseUpper, 49, 1}, - {EPtiKeyQwerty7, EPtiCaseUpper, 50, 1}, - {EPtiKeyQwerty8, EPtiCaseUpper, 51, 1}, - {EPtiKeyQwerty9, EPtiCaseUpper, 52, 1}, - {EPtiKeyQwerty0, EPtiCaseUpper, 53, 1}, - {EPtiKeyQwertyPlus, EPtiCaseUpper, 54, 1}, - {EPtiKeyQwertyQ, EPtiCaseUpper, 55, 1}, - {EPtiKeyQwertyW, EPtiCaseUpper, 56, 1}, - {EPtiKeyQwertyE, EPtiCaseUpper, 57, 1}, - {EPtiKeyQwertyR, EPtiCaseUpper, 58, 1}, - {EPtiKeyQwertyT, EPtiCaseUpper, 59, 1}, - {EPtiKeyQwertyY, EPtiCaseUpper, 60, 1}, - {EPtiKeyQwertyU, EPtiCaseUpper, 61, 1}, - {EPtiKeyQwertyI, EPtiCaseUpper, 62, 1}, - {EPtiKeyQwertyO, EPtiCaseUpper, 63, 1}, - {EPtiKeyQwertyP, EPtiCaseUpper, 64, 1}, - {EPtiKeyQwertyMinus, EPtiCaseUpper, 65, 1}, - {EPtiKeyQwertyHash, EPtiCaseUpper, 66, 1}, - {EPtiKeyQwertyA, EPtiCaseUpper, 67, 1}, - {EPtiKeyQwertyS, EPtiCaseUpper, 68, 1}, - {EPtiKeyQwertyD, EPtiCaseUpper, 69, 1}, - {EPtiKeyQwertyF, EPtiCaseUpper, 70, 1}, - {EPtiKeyQwertyG, EPtiCaseUpper, 71, 1}, - {EPtiKeyQwertyH, EPtiCaseUpper, 72, 1}, - {EPtiKeyQwertyJ, EPtiCaseUpper, 73, 1}, - {EPtiKeyQwertyK, EPtiCaseUpper, 74, 1}, - {EPtiKeyQwertyL, EPtiCaseUpper, 75, 1}, - {EPtiKeyQwertySemicolon, EPtiCaseUpper, 76, 1}, - {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 77, 1}, - {EPtiKeyQwertyZ, EPtiCaseUpper, 78, 1}, - {EPtiKeyQwertyX, EPtiCaseUpper, 79, 1}, - {EPtiKeyQwertyC, EPtiCaseUpper, 80, 1}, - {EPtiKeyQwertyV, EPtiCaseUpper, 81, 1}, - {EPtiKeyQwertyB, EPtiCaseUpper, 82, 1}, - {EPtiKeyQwertyN, EPtiCaseUpper, 83, 1}, - {EPtiKeyQwertyM, EPtiCaseUpper, 84, 1}, - {EPtiKeyQwertyComma, EPtiCaseUpper, 85, 1}, - {EPtiKeyQwertyFullstop, EPtiCaseUpper, 86, 1}, - {EPtiKeyQwertySlash, EPtiCaseUpper, 87, 1}, + {EPtiKeyQwertyAtCharacter, EPtiCaseLower, 0, 1}, + {EPtiKeyQwerty1, EPtiCaseLower, 1, 1}, + {EPtiKeyQwerty2, EPtiCaseLower, 2, 1}, + {EPtiKeyQwerty3, EPtiCaseLower, 3, 1}, + {EPtiKeyQwerty4, EPtiCaseLower, 4, 2}, + {EPtiKeyQwerty5, EPtiCaseLower, 6, 1}, + {EPtiKeyQwerty6, EPtiCaseLower, 7, 1}, + {EPtiKeyQwerty7, EPtiCaseLower, 8, 1}, + {EPtiKeyQwerty8, EPtiCaseLower, 9, 1}, + {EPtiKeyQwerty9, EPtiCaseLower, 10, 1}, + {EPtiKeyQwerty0, EPtiCaseLower, 11, 1}, + {EPtiKeyQwertyPlus, EPtiCaseLower, 12, 1}, + {EPtiKeyQwertyQ, EPtiCaseLower, 13, 1}, + {EPtiKeyQwertyW, EPtiCaseLower, 14, 1}, + {EPtiKeyQwertyE, EPtiCaseLower, 15, 1}, + {EPtiKeyQwertyR, EPtiCaseLower, 16, 1}, + {EPtiKeyQwertyT, EPtiCaseLower, 17, 1}, + {EPtiKeyQwertyY, EPtiCaseLower, 18, 1}, + {EPtiKeyQwertyU, EPtiCaseLower, 19, 1}, + {EPtiKeyQwertyI, EPtiCaseLower, 20, 1}, + {EPtiKeyQwertyO, EPtiCaseLower, 21, 1}, + {EPtiKeyQwertyP, EPtiCaseLower, 22, 1}, + {EPtiKeyQwertyMinus, EPtiCaseLower, 23, 0}, + {EPtiKeyQwertyHash, EPtiCaseLower, 23, 1}, + {EPtiKeyQwertyA, EPtiCaseLower, 24, 1}, + {EPtiKeyQwertyS, EPtiCaseLower, 25, 1}, + {EPtiKeyQwertyD, EPtiCaseLower, 26, 1}, + {EPtiKeyQwertyF, EPtiCaseLower, 27, 1}, + {EPtiKeyQwertyG, EPtiCaseLower, 28, 1}, + {EPtiKeyQwertyH, EPtiCaseLower, 29, 1}, + {EPtiKeyQwertyJ, EPtiCaseLower, 30, 1}, + {EPtiKeyQwertyK, EPtiCaseLower, 31, 1}, + {EPtiKeyQwertyL, EPtiCaseLower, 32, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseLower, 33, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseLower, 34, 0}, + {0x5b, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyZ, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyX, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyC, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyV, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyB, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyN, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyM, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyComma, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertySlash, EPtiCaseLower, 34, 0}, + {EPtiKeyQwertyAtCharacter, EPtiCaseUpper, 34, 1}, + {EPtiKeyQwerty1, EPtiCaseUpper, 35, 1}, + {EPtiKeyQwerty2, EPtiCaseUpper, 36, 1}, + {EPtiKeyQwerty3, EPtiCaseUpper, 37, 1}, + {EPtiKeyQwerty4, EPtiCaseUpper, 38, 2}, + {EPtiKeyQwerty5, EPtiCaseUpper, 40, 1}, + {EPtiKeyQwerty6, EPtiCaseUpper, 41, 1}, + {EPtiKeyQwerty7, EPtiCaseUpper, 42, 1}, + {EPtiKeyQwerty8, EPtiCaseUpper, 43, 1}, + {EPtiKeyQwerty9, EPtiCaseUpper, 44, 1}, + {EPtiKeyQwerty0, EPtiCaseUpper, 45, 1}, + {EPtiKeyQwertyPlus, EPtiCaseUpper, 46, 1}, + {EPtiKeyQwertyQ, EPtiCaseUpper, 47, 1}, + {EPtiKeyQwertyW, EPtiCaseUpper, 48, 1}, + {EPtiKeyQwertyE, EPtiCaseUpper, 49, 1}, + {EPtiKeyQwertyR, EPtiCaseUpper, 50, 1}, + {EPtiKeyQwertyT, EPtiCaseUpper, 51, 1}, + {EPtiKeyQwertyY, EPtiCaseUpper, 52, 1}, + {EPtiKeyQwertyU, EPtiCaseUpper, 53, 1}, + {EPtiKeyQwertyI, EPtiCaseUpper, 54, 1}, + {EPtiKeyQwertyO, EPtiCaseUpper, 55, 1}, + {EPtiKeyQwertyP, EPtiCaseUpper, 56, 1}, + {EPtiKeyQwertyMinus, EPtiCaseUpper, 57, 0}, + {EPtiKeyQwertyHash, EPtiCaseUpper, 57, 1}, + {EPtiKeyQwertyA, EPtiCaseUpper, 58, 1}, + {EPtiKeyQwertyS, EPtiCaseUpper, 59, 1}, + {EPtiKeyQwertyD, EPtiCaseUpper, 60, 1}, + {EPtiKeyQwertyF, EPtiCaseUpper, 61, 1}, + {EPtiKeyQwertyG, EPtiCaseUpper, 62, 1}, + {EPtiKeyQwertyH, EPtiCaseUpper, 63, 1}, + {EPtiKeyQwertyJ, EPtiCaseUpper, 64, 1}, + {EPtiKeyQwertyK, EPtiCaseUpper, 65, 1}, + {EPtiKeyQwertyL, EPtiCaseUpper, 66, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseUpper, 67, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 68, 0}, + {0x5b, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyZ, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyX, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyC, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyV, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyB, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyN, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyM, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyComma, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseUpper, 68, 0}, + {EPtiKeyQwertySlash, EPtiCaseUpper, 68, 0}, }; -const TInt KMaxStandardQwertyIndex_Russian = 88; - +const TInt KMaxStandardQwertyIndex_Russian = 92; // -// Numeric key data table for StandardQwerty -// -const TPtiNumericKeyBinding StandardQwertyNumericKeysData_table_Russian[] = - { - {'p',EPtiKeyQwertyP,EPtiCaseLower}, - {'w',EPtiKeyQwertyW,EPtiCaseLower}, - {'E',EPtiKeyQwertyE,EPtiCaseUpper}, - }; - -const TInt KNumStandardQwertyNumericKeysEntries_Russian = 3; -// // MiniQwerty keymap data table // const TUint16 MiniQwertyData_table_Russian[] = @@ -573,12 +543,6 @@ const TPtiNumericKeyBinding* CPtiLangDataImplRussian::NumericModeKeysTable(TPtiKeyboardType aKeyboardType, TInt& aNumEntries) const { - if (aKeyboardType == EPtiKeyboardQwerty4x12) - { - aNumEntries = KNumStandardQwertyNumericKeysEntries_Russian; - return StandardQwertyNumericKeysData_table_Russian; - } - if (aKeyboardType == EPtiKeyboardQwerty4x10) { aNumEntries = KNumMiniQwertyNumericKeysEntries_Russian; @@ -590,10 +554,3 @@ } - -TBool CPtiLangDataImplRussian::SuitableForLatinOnlyMode() const - { - return EFalse; - } - -