diff options
| -rwxr-xr-x | third_party/gtk+/gtk/compose-parse.py | 2 | ||||
| -rw-r--r-- | third_party/gtk+/gtk/gtkimcontextsimpleseqs.h | 148 | ||||
| -rw-r--r-- | views/ime/character_composer.cc | 2 |
3 files changed, 76 insertions, 76 deletions
diff --git a/third_party/gtk+/gtk/compose-parse.py b/third_party/gtk+/gtk/compose-parse.py index 3fcc9cb..c9729e1 100755 --- a/third_party/gtk+/gtk/compose-parse.py +++ b/third_party/gtk+/gtk/compose-parse.py @@ -284,7 +284,7 @@ def process_gdkkeysymsh(): """ Patch up the keysymdb with some of our own stuff """ """ This is for a missing keysym from the currently upstream file """ - keysymdb['dead_stroke'] = 0x338 + #keysymdb['dead_stroke'] = 0x338 """ This is for a missing keysym from the currently upstream file """ ###keysymdb['dead_belowring'] = 0x323 diff --git a/third_party/gtk+/gtk/gtkimcontextsimpleseqs.h b/third_party/gtk+/gtk/gtkimcontextsimpleseqs.h index 61837ad..01a8e55 100644 --- a/third_party/gtk+/gtk/gtkimcontextsimpleseqs.h +++ b/third_party/gtk+/gtk/gtkimcontextsimpleseqs.h @@ -67,82 +67,32 @@ */ static const guint16 gtk_compose_seqs_compact[] = { -GDK_KEY_dead_stroke, 156, 250, 259, 259, 259, -GDK_KEY_Greek_accentdieresis, 259, 263, 263, 263, 263, -GDK_KEY_dead_grave, 263, 435, 576, 788, 788, -GDK_KEY_dead_acute, 788, 1024, 1210, 1486, 1486, -GDK_KEY_dead_circumflex, 1486, 1674, 1764, 1964, 1964, -GDK_KEY_dead_tilde, 1964, 2100, 2223, 2363, 2363, -GDK_KEY_dead_macron, 2363, 2477, 2555, 2627, 2627, -GDK_KEY_dead_breve, 2627, 2709, 2745, 2769, 2769, -GDK_KEY_dead_abovedot, 2769, 2883, 2916, 2948, 2948, -GDK_KEY_dead_diaeresis, 2948, 3088, 3145, 3169, 3169, -GDK_KEY_dead_abovering, 3169, 3191, 3197, 3197, 3197, -GDK_KEY_dead_doubleacute, 3197, 3215, 3215, 3215, 3215, -GDK_KEY_dead_caron, 3215, 3331, 3343, 3351, 3351, -GDK_KEY_dead_cedilla, 3351, 3411, 3423, 3423, 3423, -GDK_KEY_dead_ogonek, 3423, 3453, 3459, 3459, 3459, -GDK_KEY_dead_iota, 3459, 3589, 3760, 4192, 4852, -GDK_KEY_dead_voiced_sound, 4852, 4948, 4948, 4948, 4948, -GDK_KEY_dead_semivoiced_sound, 4948, 4968, 4968, 4968, 4968, -GDK_KEY_dead_belowdot, 4968, 5080, 5134, 5150, 5150, -GDK_KEY_dead_hook, 5150, 5270, 5306, 5362, 5362, -GDK_KEY_dead_horn, 5362, 5400, 5460, 5460, 5460, +GDK_KEY_Greek_accentdieresis, 156, 160, 160, 160, 160, +GDK_KEY_dead_grave, 160, 332, 473, 685, 685, +GDK_KEY_dead_acute, 685, 921, 1107, 1383, 1383, +GDK_KEY_dead_circumflex, 1383, 1571, 1661, 1861, 1861, +GDK_KEY_dead_tilde, 1861, 1997, 2120, 2260, 2260, +GDK_KEY_dead_macron, 2260, 2374, 2452, 2524, 2524, +GDK_KEY_dead_breve, 2524, 2606, 2642, 2666, 2666, +GDK_KEY_dead_abovedot, 2666, 2780, 2813, 2845, 2845, +GDK_KEY_dead_diaeresis, 2845, 2985, 3042, 3066, 3066, +GDK_KEY_dead_abovering, 3066, 3088, 3094, 3094, 3094, +GDK_KEY_dead_doubleacute, 3094, 3112, 3112, 3112, 3112, +GDK_KEY_dead_caron, 3112, 3228, 3240, 3248, 3248, +GDK_KEY_dead_cedilla, 3248, 3308, 3320, 3320, 3320, +GDK_KEY_dead_ogonek, 3320, 3350, 3356, 3356, 3356, +GDK_KEY_dead_iota, 3356, 3486, 3657, 4089, 4749, +GDK_KEY_dead_voiced_sound, 4749, 4845, 4845, 4845, 4845, +GDK_KEY_dead_semivoiced_sound, 4845, 4865, 4865, 4865, 4865, +GDK_KEY_dead_belowdot, 4865, 4977, 5031, 5047, 5047, +GDK_KEY_dead_hook, 5047, 5167, 5203, 5259, 5259, +GDK_KEY_dead_horn, 5259, 5297, 5357, 5357, 5357, +GDK_KEY_dead_stroke, 5357, 5451, 5460, 5460, 5460, GDK_KEY_dead_psili, 5460, 5488, 5488, 5488, 5488, GDK_KEY_dead_dasia, 5488, 5520, 5520, 5520, 5520, GDK_KEY_dead_doublegrave, 5520, 5548, 5548, 5548, 5548, GDK_KEY_dead_invertedbreve, 5548, 5572, 5572, 5572, 5572, GDK_KEY_Multi_key, 5572, 5572, 11512, 15220, 17085, -GDK_KEY_space, 0x002F, -GDK_KEY_2, 0x01BB, -GDK_KEY_less, 0x226E, -GDK_KEY_equal, 0x2260, -GDK_KEY_greater, 0x226F, -GDK_KEY_A, 0x023A, -GDK_KEY_B, 0x0243, -GDK_KEY_C, 0x023B, -GDK_KEY_D, 0x0110, -GDK_KEY_E, 0x0246, -GDK_KEY_G, 0x01E4, -GDK_KEY_H, 0x0126, -GDK_KEY_I, 0x0197, -GDK_KEY_J, 0x0248, -GDK_KEY_L, 0x0141, -GDK_KEY_O, 0x00D8, -GDK_KEY_P, 0x2C63, -GDK_KEY_R, 0x024C, -GDK_KEY_T, 0x0166, -GDK_KEY_U, 0x0244, -GDK_KEY_Y, 0x024E, -GDK_KEY_Z, 0x01B5, -GDK_KEY_a, 0x2C65, -GDK_KEY_b, 0x0180, -GDK_KEY_c, 0x023C, -GDK_KEY_d, 0x0111, -GDK_KEY_e, 0x0247, -GDK_KEY_g, 0x01E5, -GDK_KEY_h, 0x0127, -GDK_KEY_i, 0x0268, -GDK_KEY_j, 0x0249, -GDK_KEY_l, 0x0142, -GDK_KEY_o, 0x00F8, -GDK_KEY_p, 0x1D7D, -GDK_KEY_r, 0x024D, -GDK_KEY_t, 0x0167, -GDK_KEY_u, 0x0289, -GDK_KEY_y, 0x024F, -GDK_KEY_z, 0x01B6, -GDK_KEY_nobreakspace, 0x0338, -GDK_KEY_Oacute, 0x01FE, -GDK_KEY_oacute, 0x01FF, -0x0237, 0x025F, -0x0269, 0x1D7C, -GDK_KEY_dead_stroke, 0x002F, -GDK_KEY_lessthanequal, 0x2270, -GDK_KEY_greaterthanequal, 0x2271, -GDK_KEY_dead_acute, GDK_KEY_O, 0x01FE, -GDK_KEY_dead_acute, GDK_KEY_o, 0x01FF, -GDK_KEY_dead_abovedot, GDK_KEY_j, 0x025F, GDK_KEY_Greek_iota, 0x0390, GDK_KEY_Greek_upsilon, 0x03B0, GDK_KEY_space, 0x0060, @@ -449,8 +399,6 @@ GDK_KEY_Greek_omega, 0x03CE, 0x1F68, 0x1F6C, 0x1F69, 0x1F6D, GDK_KEY_dead_acute, 0x00B4, -GDK_KEY_dead_stroke, GDK_KEY_O, 0x01FE, -GDK_KEY_dead_stroke, GDK_KEY_o, 0x01FF, GDK_KEY_dead_circumflex, GDK_KEY_A, 0x1EA4, GDK_KEY_dead_circumflex, GDK_KEY_E, 0x1EBE, GDK_KEY_dead_circumflex, GDK_KEY_O, 0x1ED0, @@ -484,6 +432,8 @@ GDK_KEY_dead_horn, GDK_KEY_O, 0x1EDA, GDK_KEY_dead_horn, GDK_KEY_U, 0x1EE8, GDK_KEY_dead_horn, GDK_KEY_o, 0x1EDB, GDK_KEY_dead_horn, GDK_KEY_u, 0x1EE9, +GDK_KEY_dead_stroke, GDK_KEY_O, 0x01FE, +GDK_KEY_dead_stroke, GDK_KEY_o, 0x01FF, GDK_KEY_dead_psili, GDK_KEY_Greek_ALPHA, 0x1F0C, GDK_KEY_dead_psili, GDK_KEY_Greek_EPSILON, 0x1F1C, GDK_KEY_dead_psili, GDK_KEY_Greek_ETA, 0x1F2C, @@ -1115,7 +1065,6 @@ GDK_KEY_omacron, 0x0231, 0x1E62, 0x1E68, 0x1E63, 0x1E69, GDK_KEY_dead_abovedot, 0x02D9, -GDK_KEY_dead_stroke, GDK_KEY_j, 0x025F, GDK_KEY_dead_acute, GDK_KEY_S, 0x1E64, GDK_KEY_dead_acute, GDK_KEY_s, 0x1E65, GDK_KEY_dead_macron, GDK_KEY_A, 0x01E0, @@ -1126,6 +1075,7 @@ GDK_KEY_dead_caron, GDK_KEY_S, 0x1E66, GDK_KEY_dead_caron, GDK_KEY_s, 0x1E67, GDK_KEY_dead_belowdot, GDK_KEY_S, 0x1E68, GDK_KEY_dead_belowdot, GDK_KEY_s, 0x1E69, +GDK_KEY_dead_stroke, GDK_KEY_j, 0x025F, GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_S, 0x1E68, GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_s, 0x1E69, GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_S, 0x1E64, @@ -1989,6 +1939,56 @@ GDK_KEY_dead_hook, GDK_KEY_O, 0x1EDE, GDK_KEY_dead_hook, GDK_KEY_U, 0x1EEC, GDK_KEY_dead_hook, GDK_KEY_o, 0x1EDF, GDK_KEY_dead_hook, GDK_KEY_u, 0x1EED, +GDK_KEY_space, 0x002F, +GDK_KEY_2, 0x01BB, +GDK_KEY_less, 0x226E, +GDK_KEY_equal, 0x2260, +GDK_KEY_greater, 0x226F, +GDK_KEY_A, 0x023A, +GDK_KEY_B, 0x0243, +GDK_KEY_C, 0x023B, +GDK_KEY_D, 0x0110, +GDK_KEY_E, 0x0246, +GDK_KEY_G, 0x01E4, +GDK_KEY_H, 0x0126, +GDK_KEY_I, 0x0197, +GDK_KEY_J, 0x0248, +GDK_KEY_L, 0x0141, +GDK_KEY_O, 0x00D8, +GDK_KEY_P, 0x2C63, +GDK_KEY_R, 0x024C, +GDK_KEY_T, 0x0166, +GDK_KEY_U, 0x0244, +GDK_KEY_Y, 0x024E, +GDK_KEY_Z, 0x01B5, +GDK_KEY_a, 0x2C65, +GDK_KEY_b, 0x0180, +GDK_KEY_c, 0x023C, +GDK_KEY_d, 0x0111, +GDK_KEY_e, 0x0247, +GDK_KEY_g, 0x01E5, +GDK_KEY_h, 0x0127, +GDK_KEY_i, 0x0268, +GDK_KEY_j, 0x0249, +GDK_KEY_l, 0x0142, +GDK_KEY_o, 0x00F8, +GDK_KEY_p, 0x1D7D, +GDK_KEY_r, 0x024D, +GDK_KEY_t, 0x0167, +GDK_KEY_u, 0x0289, +GDK_KEY_y, 0x024F, +GDK_KEY_z, 0x01B6, +GDK_KEY_nobreakspace, 0x0338, +GDK_KEY_Oacute, 0x01FE, +GDK_KEY_oacute, 0x01FF, +0x0237, 0x025F, +0x0269, 0x1D7C, +GDK_KEY_lessthanequal, 0x2270, +GDK_KEY_greaterthanequal, 0x2271, +GDK_KEY_dead_stroke, 0x002F, +GDK_KEY_dead_acute, GDK_KEY_O, 0x01FE, +GDK_KEY_dead_acute, GDK_KEY_o, 0x01FF, +GDK_KEY_dead_abovedot, GDK_KEY_j, 0x025F, GDK_KEY_Greek_ALPHA, 0x1F08, GDK_KEY_Greek_EPSILON, 0x1F18, GDK_KEY_Greek_ETA, 0x1F28, diff --git a/views/ime/character_composer.cc b/views/ime/character_composer.cc index 685e0ba..3618477 100644 --- a/views/ime/character_composer.cc +++ b/views/ime/character_composer.cc @@ -242,7 +242,7 @@ bool CheckCharacterComposeTable(const std::vector<unsigned int>& sequence, // Check main compose table const ComposeCheckerWithCompactTable kMainComposeChecker( - gtk_compose_seqs_compact, 5, 24, 6); + gtk_compose_seqs_compact, 5, 26, 6); if (kMainComposeChecker.CheckSequence(sequence, composed_character)) return true; |