diff -r ac7e4d1d9209 -r ebd48d2de13c textinput/ptienginev2/languages/PtiKeymappings_ITUT_78.cpp --- a/textinput/ptienginev2/languages/PtiKeymappings_ITUT_78.cpp Thu Aug 19 10:15:25 2010 +0300 +++ b/textinput/ptienginev2/languages/PtiKeymappings_ITUT_78.cpp Tue Aug 31 15:31:50 2010 +0300 @@ -1,8 +1,8 @@ /* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0"" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -97,174 +97,206 @@ // const TUint16 StandardQwertyData_table_Romanian[] = { - 0x0071, - 0x0077, - 0x0065, - 0x0072, - 0x0074, - 0x0079, - 0x0075, - 0x0069, - 0x006F, - 0x0070, - 0x0103, - 0x0061, - 0x0073, - 0x0064, - 0x0066, - 0x0067, - 0x0068, - 0x006A, - 0x006B, - 0x006C, - 0x015F, - 0x0163, - 0x007A, - 0x0078, - 0x0063, - 0x0076, - 0x0062, - 0x006E, - 0x006D, - 0x002E, - 0x003F, - 0x00E2, - 0x00EE, - 0x0051, - 0x0057, - 0x0045, - 0x0052, - 0x0054, - 0x0059, - 0x0055, - 0x0049, - 0x004F, - 0x0050, - 0x0102, - 0x0041, - 0x0053, - 0x0044, - 0x0046, - 0x0047, - 0x0048, - 0x004A, - 0x004B, - 0x004C, - 0x015E, - 0x0162, - 0x005A, - 0x0058, - 0x0043, - 0x0056, - 0x0042, - 0x004E, - 0x004D, - 0x002C, - 0x0021, - 0x00C2, - 0x00CE, + 0x31, + 0x32, + 0x33, + 0x34, + 0x35, + 0x36, + 0x37, + 0x38, + 0x39, + 0x30, + 0x2b, + 0x71, + 0x77, + 0x65,0xe9,0x11b,0x119, + 0x72,0x155,0x159, + 0x74,0x163,0x165, + 0x79,0xfd, + 0x75,0xfa,0xfc,0x171,0xf9,0xfb,0x16f, + 0x69,0xed,0xee, + 0x6f,0xf3,0xf6,0xf4,0x151, + 0x70, + 0x103, + 0x2d, + 0x61,0xe1,0xe4,0x105,0x103,0xe2, + 0x73,0x15f,0x15b,0x161,0xdf, + 0x64,0x10f,0x111, + 0x66, + 0x67, + 0x68, + 0x6a, + 0x6b, + 0x6c,0x13a,0x13e,0x142, + 0xf001,0xb8, + 0xe2, + 0x7a,0x17a,0x17e,0x17c, + 0x78, + 0x63,0x107,0x10d, + 0x76, + 0x62, + 0x6e,0x144,0x148, + 0x6d, + 0x2c, + 0x2e, + 0xee, + 0x21, + 0x22, + 0x23, + 0x40, + 0x25, + 0x26, + 0x2f, + 0x28, + 0x29, + 0x3f, + 0x2a, + 0x51, + 0x57, + 0x45,0xc9,0x11a,0x118, + 0x52,0x154,0x158, + 0x54,0x162,0x164, + 0x59,0xdd, + 0x55,0xda,0xdc,0x170,0xd9,0xdb,0x16e, + 0x49,0xcd,0xce, + 0x4f,0xd3,0xd6,0xd4,0x150, + 0x50, + 0x102, + 0x3d, + 0x41,0xc1,0xc4,0x104,0x102,0xc2, + 0x53,0x15e,0x15a,0x160, + 0x44,0x10e,0x110, + 0x46, + 0x47, + 0x48, + 0x4a, + 0x4b, + 0x4c,0x139,0x13d,0x141, + 0xf001,0xb8, + 0xc2, + 0x5a,0x179,0x17d,0x17b, + 0x58, + 0x43,0x106,0x10c, + 0x56, + 0x42, + 0x4e,0x143,0x147, + 0x4d, + 0x3b, + 0x3a, + 0xce, }; -const TInt KStandardQwertyDataSize_Romanian = 66; +const TInt KStandardQwertyDataSize_Romanian = 171; const TPtiKeyBinding StandardQwertyKeyBindings_table_Romanian[] = { - {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}, - {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, 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}, + {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, 7}, + {EPtiKeyQwertyI, EPtiCaseLower, 32, 3}, + {EPtiKeyQwertyO, EPtiCaseLower, 35, 5}, + {EPtiKeyQwertyP, EPtiCaseLower, 40, 1}, + {EPtiKeyQwertyMinus, EPtiCaseLower, 41, 1}, + {EPtiKeyQwertyHash, EPtiCaseLower, 42, 1}, + {EPtiKeyQwertyA, EPtiCaseLower, 43, 6}, + {EPtiKeyQwertyS, EPtiCaseLower, 49, 5}, + {EPtiKeyQwertyD, EPtiCaseLower, 54, 3}, + {EPtiKeyQwertyF, EPtiCaseLower, 57, 1}, + {EPtiKeyQwertyG, EPtiCaseLower, 58, 1}, + {EPtiKeyQwertyH, EPtiCaseLower, 59, 1}, + {EPtiKeyQwertyJ, EPtiCaseLower, 60, 1}, + {EPtiKeyQwertyK, EPtiCaseLower, 61, 1}, + {EPtiKeyQwertyL, EPtiCaseLower, 62, 4}, + {EPtiKeyQwertySemicolon, EPtiCaseLower, 66, 2}, + {EPtiKeyQwertyApostrophe, EPtiCaseLower, 68, 1}, + {EPtiKeyQwertyZ, EPtiCaseLower, 69, 4}, + {EPtiKeyQwertyX, EPtiCaseLower, 73, 1}, + {EPtiKeyQwertyC, EPtiCaseLower, 74, 3}, + {EPtiKeyQwertyV, EPtiCaseLower, 77, 1}, + {EPtiKeyQwertyB, EPtiCaseLower, 78, 1}, + {EPtiKeyQwertyN, EPtiCaseLower, 79, 3}, + {EPtiKeyQwertyM, EPtiCaseLower, 82, 1}, + {EPtiKeyQwertyComma, EPtiCaseLower, 83, 1}, + {EPtiKeyQwertyFullstop, EPtiCaseLower, 84, 1}, + {EPtiKeyQwertySlash, EPtiCaseLower, 85, 1}, + {EPtiKeyQwerty1, EPtiCaseUpper, 86, 1}, + {EPtiKeyQwerty2, EPtiCaseUpper, 87, 1}, + {EPtiKeyQwerty3, EPtiCaseUpper, 88, 1}, + {EPtiKeyQwerty4, EPtiCaseUpper, 89, 1}, + {EPtiKeyQwerty5, EPtiCaseUpper, 90, 1}, + {EPtiKeyQwerty6, EPtiCaseUpper, 91, 1}, + {EPtiKeyQwerty7, EPtiCaseUpper, 92, 1}, + {EPtiKeyQwerty8, EPtiCaseUpper, 93, 1}, + {EPtiKeyQwerty9, EPtiCaseUpper, 94, 1}, + {EPtiKeyQwerty0, EPtiCaseUpper, 95, 1}, + {EPtiKeyQwertyPlus, EPtiCaseUpper, 96, 1}, + {EPtiKeyQwertyQ, EPtiCaseUpper, 97, 1}, + {EPtiKeyQwertyW, EPtiCaseUpper, 98, 1}, + {EPtiKeyQwertyE, EPtiCaseUpper, 99, 4}, + {EPtiKeyQwertyR, EPtiCaseUpper, 103, 3}, + {EPtiKeyQwertyT, EPtiCaseUpper, 106, 3}, + {EPtiKeyQwertyY, EPtiCaseUpper, 109, 2}, + {EPtiKeyQwertyU, EPtiCaseUpper, 111, 7}, + {EPtiKeyQwertyI, EPtiCaseUpper, 118, 3}, + {EPtiKeyQwertyO, EPtiCaseUpper, 121, 5}, + {EPtiKeyQwertyP, EPtiCaseUpper, 126, 1}, + {EPtiKeyQwertyMinus, EPtiCaseUpper, 127, 1}, + {EPtiKeyQwertyHash, EPtiCaseUpper, 128, 1}, + {EPtiKeyQwertyA, EPtiCaseUpper, 129, 6}, + {EPtiKeyQwertyS, EPtiCaseUpper, 135, 4}, + {EPtiKeyQwertyD, EPtiCaseUpper, 139, 3}, + {EPtiKeyQwertyF, EPtiCaseUpper, 142, 1}, + {EPtiKeyQwertyG, EPtiCaseUpper, 143, 1}, + {EPtiKeyQwertyH, EPtiCaseUpper, 144, 1}, + {EPtiKeyQwertyJ, EPtiCaseUpper, 145, 1}, + {EPtiKeyQwertyK, EPtiCaseUpper, 146, 1}, + {EPtiKeyQwertyL, EPtiCaseUpper, 147, 4}, + {EPtiKeyQwertySemicolon, EPtiCaseUpper, 151, 2}, + {EPtiKeyQwertyApostrophe, EPtiCaseUpper, 153, 1}, + {EPtiKeyQwertyZ, EPtiCaseUpper, 154, 4}, + {EPtiKeyQwertyX, EPtiCaseUpper, 158, 1}, + {EPtiKeyQwertyC, EPtiCaseUpper, 159, 3}, + {EPtiKeyQwertyV, EPtiCaseUpper, 162, 1}, + {EPtiKeyQwertyB, EPtiCaseUpper, 163, 1}, + {EPtiKeyQwertyN, EPtiCaseUpper, 164, 3}, + {EPtiKeyQwertyM, EPtiCaseUpper, 167, 1}, + {EPtiKeyQwertyComma, EPtiCaseUpper, 168, 1}, + {EPtiKeyQwertyFullstop, EPtiCaseUpper, 169, 1}, + {EPtiKeyQwertySlash, EPtiCaseUpper, 170, 1}, }; -const TInt KMaxStandardQwertyIndex_Romanian = 92; +const TInt KMaxStandardQwertyIndex_Romanian = 88; + + +// +// Dead key data table for StandardQwerty +// +const TUint16 StandardQwertyDeadKeyData_table_Romanian[] = + { + 15, 0x0163,0xf000,0xf000,0xf000,0xf000, + 24, 0x015F,0xf000,0xf000,0xf000,0xf000, + 59, 0x0162,0xf000,0xf000,0xf000,0xf000, + 68, 0x015E,0xf000,0xf000,0xf000,0xf000, + }; + +const TInt KStandardQwertyDeadKeyTableRows_Romanian = 4; // // MiniQwerty keymap data table @@ -521,3 +553,16 @@ } +const TUint16* CPtiLangDataImplRomanian::DeadKeyDataArray(TPtiKeyboardType aKeyboardType, TInt& aNumRowsInArray) const + { + if (aKeyboardType == EPtiKeyboardQwerty4x12) + { + aNumRowsInArray = KStandardQwertyDeadKeyTableRows_Romanian; + return StandardQwertyDeadKeyData_table_Romanian; + } + + aNumRowsInArray = 0; + return NULL; + } + +