diff -r e6a39382bb9c -r c8fb4cf7b3ae textinput/ptienginev2/languages/PtiKeymappings_ITUT_50.cpp --- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_50.cpp Tue Apr 27 16:59:43 2010 +0300 +++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_50.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,123 +97,102 @@ // const TUint16 StandardQwertyData_table_Farsi[] = { - 0x6f1, - 0x6f2, - 0x6f3, - 0x6f4, - 0x6f5, - 0x6f6, - 0x6f7, - 0x6f8, - 0x6f9, - 0x6f0, - 0x636, - 0x635, - 0x62b, - 0x642, - 0x641, - 0x63a, - 0x639, - 0x647, - 0x62e, - 0x62d, - 0x62c, - 0x686, - 0x634, - 0x633, - 0x6cc, - 0x628, - 0x644, - 0x627, - 0x62a, - 0x646, - 0x645, - 0x6a9, - 0x6af, - 0x40, - 0x638, - 0x637, - 0x632, - 0x631, - 0x630, - 0x62f, - 0x67e, - 0x648, - 0x2e, - 0x2f, - 0x66c, - 0x66b, - 0xfdfc, - 0x66a, - 0x3d, - 0x21, - 0x2a, - 0x2d, - 0x2b, - 0x640, - 0x636, - 0x635, - 0x62b, - 0x642, - 0x641, - 0x63a, - 0x28, - 0x28, - 0x7d, - 0x7b, - 0x5c, - 0x7c, - 0x624, - 0x626, - 0x64a, - 0x625, - 0x623, - 0x622, - 0x629, - 0xbb, - 0xab, - 0x3a, - 0x61b, - 0x60c, - 0x643, - 0x637, - 0x698, - 0x631, - 0x200c, - 0x200d, - 0x621, - 0x3e, - 0x3c, - 0x61f, + 0x0636, + 0x0635, + 0x062B, + 0x0642, + 0x0641, + 0x063A, + 0x0639, + 0x0647, + 0x062E, + 0x062D, + 0x062C, + 0x0634, + 0x0633, + 0x06CC, + 0x0628, + 0x0644, + 0x0627, + 0x062A, + 0x0646, + 0x0645, + 0x06A9, + 0x0686, + 0x0638, + 0x0637, + 0x0698, + 0x0632, + 0x0631, + 0x0630, + 0x062F, + 0x0648, + 0x002E, + 0x067E, + 0x06AF, + 0x066C, + 0x066B, + 0xFDFC, + 0x066A, + 0x003D, + 0x0021, + 0x002A, + 0x002D, + 0x002B, + 0x0640, + 0x060C, + 0x0624, + 0x0626, + 0x064A, + 0x0625, + 0x0623, + 0x0622, + 0x0629, + 0x003E, + 0x003C, + 0x003A, + 0x061B, + 0x0643, + 0x0621, + 0x201D, + 0x201E, + 0x200C, + 0x200D, + 0x0022, + 0x0027, + 0x061F, + 0x0029, + 0x0028, }; -const TInt KStandardQwertyDataSize_Farsi = 88; +const TInt KStandardQwertyDataSize_Farsi = 66; const TPtiKeyBinding StandardQwertyKeyBindings_table_Farsi[] = { - {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}, + {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, 1}, + {EPtiKeyQwertyPlus, EPtiCaseLower, 11, 1}, + {EPtiKeyQwertyQ, EPtiCaseLower, 12, 1}, + {EPtiKeyQwertyW, EPtiCaseLower, 13, 1}, + {EPtiKeyQwertyE, EPtiCaseLower, 14, 1}, + {EPtiKeyQwertyR, EPtiCaseLower, 15, 1}, + {EPtiKeyQwertyT, EPtiCaseLower, 16, 1}, + {EPtiKeyQwertyY, EPtiCaseLower, 17, 1}, + {EPtiKeyQwertyU, EPtiCaseLower, 18, 1}, + {EPtiKeyQwertyI, EPtiCaseLower, 19, 1}, + {EPtiKeyQwertyO, EPtiCaseLower, 20, 1}, + {EPtiKeyQwertyP, EPtiCaseLower, 21, 1}, + {EPtiKeyQwertyMinus, EPtiCaseLower, 22, 0}, {EPtiKeyQwertyHash, EPtiCaseLower, 22, 1}, {EPtiKeyQwertyA, EPtiCaseLower, 23, 1}, {EPtiKeyQwertyS, EPtiCaseLower, 24, 1}, @@ -225,89 +204,69 @@ {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}, + {EPtiKeyQwertyApostrophe, EPtiCaseLower, 33, 0}, + {0x5b, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyZ, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyX, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyC, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyV, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyB, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyN, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyM, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyComma, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertySlash, EPtiCaseLower, 33, 0}, + {EPtiKeyQwertyAtCharacter, EPtiCaseUpper, 33, 1}, + {EPtiKeyQwerty1, EPtiCaseUpper, 34, 1}, + {EPtiKeyQwerty2, EPtiCaseUpper, 35, 1}, + {EPtiKeyQwerty3, EPtiCaseUpper, 36, 1}, + {EPtiKeyQwerty4, EPtiCaseUpper, 37, 1}, + {EPtiKeyQwerty5, EPtiCaseUpper, 38, 1}, + {EPtiKeyQwerty6, EPtiCaseUpper, 39, 1}, + {EPtiKeyQwerty7, EPtiCaseUpper, 40, 1}, + {EPtiKeyQwerty8, EPtiCaseUpper, 41, 1}, + {EPtiKeyQwerty9, EPtiCaseUpper, 42, 1}, + {EPtiKeyQwerty0, EPtiCaseUpper, 43, 1}, + {EPtiKeyQwertyPlus, EPtiCaseUpper, 44, 1}, + {EPtiKeyQwertyQ, EPtiCaseUpper, 45, 1}, + {EPtiKeyQwertyW, EPtiCaseUpper, 46, 1}, + {EPtiKeyQwertyE, EPtiCaseUpper, 47, 1}, + {EPtiKeyQwertyR, EPtiCaseUpper, 48, 1}, + {EPtiKeyQwertyT, EPtiCaseUpper, 49, 1}, + {EPtiKeyQwertyY, EPtiCaseUpper, 50, 1}, + {EPtiKeyQwertyU, EPtiCaseUpper, 51, 1}, + {EPtiKeyQwertyI, EPtiCaseUpper, 52, 1}, + {EPtiKeyQwertyO, EPtiCaseUpper, 53, 1}, + {EPtiKeyQwertyP, EPtiCaseUpper, 54, 1}, + {EPtiKeyQwertyMinus, EPtiCaseUpper, 55, 0}, + {EPtiKeyQwertyHash, EPtiCaseUpper, 55, 1}, + {EPtiKeyQwertyA, EPtiCaseUpper, 56, 1}, + {EPtiKeyQwertyS, EPtiCaseUpper, 57, 1}, + {EPtiKeyQwertyD, EPtiCaseUpper, 58, 1}, + {EPtiKeyQwertyF, EPtiCaseUpper, 59, 1}, + {EPtiKeyQwertyG, EPtiCaseUpper, 60, 1}, + {EPtiKeyQwertyH, EPtiCaseUpper, 61, 1}, + {EPtiKeyQwertyJ, EPtiCaseUpper, 62, 1}, + {EPtiKeyQwertyK, EPtiCaseUpper, 63, 1}, + {EPtiKeyQwertyL, EPtiCaseUpper, 64, 1}, + {EPtiKeyQwertySemicolon, EPtiCaseUpper, 65, 1}, + {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 66, 0}, + {0x5b, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyZ, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyX, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyC, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyV, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyB, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyN, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyM, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyComma, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertyFullstop, EPtiCaseUpper, 66, 0}, + {EPtiKeyQwertySlash, EPtiCaseUpper, 66, 0}, }; -const TInt KMaxStandardQwertyIndex_Farsi = 88; - +const TInt KMaxStandardQwertyIndex_Farsi = 92; // -// Numeric key data table for StandardQwerty -// -const TPtiNumericKeyBinding StandardQwertyNumericKeysData_table_Farsi[] = - { - {'#',EPtiKeyQwertyHash,EPtiCaseLower}, - {'p',EPtiKeyQwertyP,EPtiCaseLower}, - {'w',EPtiKeyQwertyW,EPtiCaseLower}, - {'1',EPtiKeyQwerty1,EPtiCaseLower}, - {'2',EPtiKeyQwerty2,EPtiCaseLower}, - {'3',EPtiKeyQwerty3,EPtiCaseLower}, - {'4',EPtiKeyQwerty4,EPtiCaseLower}, - {'5',EPtiKeyQwerty5,EPtiCaseLower}, - {'6',EPtiKeyQwerty6,EPtiCaseLower}, - {'7',EPtiKeyQwerty7,EPtiCaseLower}, - {'8',EPtiKeyQwerty8,EPtiCaseLower}, - {'9',EPtiKeyQwerty9,EPtiCaseLower}, - {'0',EPtiKeyQwerty0,EPtiCaseLower}, - {'E',EPtiKeyQwertyE,EPtiCaseUpper}, - }; - -const TInt KNumStandardQwertyNumericKeysEntries_Farsi = 14; -// // MiniQwerty keymap data table // const TUint16 MiniQwertyData_table_Farsi[] = @@ -578,12 +537,6 @@ const TPtiNumericKeyBinding* CPtiLangDataImplFarsi::NumericModeKeysTable(TPtiKeyboardType aKeyboardType, TInt& aNumEntries) const { - if (aKeyboardType == EPtiKeyboardQwerty4x12) - { - aNumEntries = KNumStandardQwertyNumericKeysEntries_Farsi; - return StandardQwertyNumericKeysData_table_Farsi; - } - if (aKeyboardType == EPtiKeyboardQwerty4x10) { aNumEntries = KNumMiniQwertyNumericKeysEntries_Farsi; @@ -595,10 +548,3 @@ } - -TBool CPtiLangDataImplFarsi::SuitableForLatinOnlyMode() const - { - return EFalse; - } - -