diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-08 13:35:51 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-08 18:51:44 -0400 |
| commit | 913cdf3be750a1e74c09b20edf55a57f9a919fcc (patch) | |
| tree | 0d2129a167579c0d896bb9213503619b2ef44d1f /modules/input | |
| parent | 03c19e37af1f7aa9af8a48bcc9dc023397f8693f (diff) | |
| download | gtk+-913cdf3be750a1e74c09b20edf55a57f9a919fcc.tar.gz | |
GDK: Prefix key names with KEY_
The keysyms create a lot of potential namespace conflicts for
C, and are especially problematic for introspection, where we take
constants into the namespace, so GDK_Display conflicts with GdkDisplay.
For C application compatiblity, add gdkkeysyms-compat.h which uses
the old names.
Just one user in GTK+ continues to use gdkkeysyms-compat.h, which is
the gtkimcontextsimple.c, since porting that requires porting more
custom Perl code.
Diffstat (limited to 'modules/input')
| -rw-r--r-- | modules/input/gtkimcontextmultipress.c | 2 | ||||
| -rw-r--r-- | modules/input/gtkimcontextthai.c | 36 | ||||
| -rw-r--r-- | modules/input/imam-et.c | 8 | ||||
| -rw-r--r-- | modules/input/imcedilla.c | 12 | ||||
| -rw-r--r-- | modules/input/imcyrillic-translit.c | 268 | ||||
| -rw-r--r-- | modules/input/iminuktitut.c | 4 | ||||
| -rw-r--r-- | modules/input/imipa.c | 122 | ||||
| -rw-r--r-- | modules/input/imti-er.c | 8 | ||||
| -rw-r--r-- | modules/input/imti-et.c | 8 | ||||
| -rw-r--r-- | modules/input/imviqr.c | 322 |
10 files changed, 395 insertions, 395 deletions
diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c index 7c2a2282e7..23578e0f3c 100644 --- a/modules/input/gtkimcontextmultipress.c +++ b/modules/input/gtkimcontextmultipress.c @@ -410,7 +410,7 @@ load_config (GtkImContextMultipress *self) keyval = gdk_keyval_from_name (keys[i]); - if (keyval == GDK_VoidSymbol) + if (keyval == GDK_KEY_VoidSymbol) { g_warning ("Error while trying to read the %s configuration file: " "invalid key name \"%s\"", diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c index 5592a1ebf0..60ea1636ac 100644 --- a/modules/input/gtkimcontextthai.c +++ b/modules/input/gtkimcontextthai.c @@ -111,31 +111,31 @@ static gboolean is_context_lost_key(guint keyval) { return ((keyval & 0xFF00) == 0xFF00) && - (keyval == GDK_BackSpace || - keyval == GDK_Tab || - keyval == GDK_Linefeed || - keyval == GDK_Clear || - keyval == GDK_Return || - keyval == GDK_Pause || - keyval == GDK_Scroll_Lock || - keyval == GDK_Sys_Req || - keyval == GDK_Escape || - keyval == GDK_Delete || - (GDK_Home <= keyval && keyval <= GDK_Begin) || /* IsCursorkey */ - (GDK_KP_Space <= keyval && keyval <= GDK_KP_Delete) || /* IsKeypadKey, non-chars only */ - (GDK_Select <= keyval && keyval <= GDK_Break) || /* IsMiscFunctionKey */ - (GDK_F1 <= keyval && keyval <= GDK_F35)); /* IsFunctionKey */ + (keyval == GDK_KEY_BackSpace || + keyval == GDK_KEY_Tab || + keyval == GDK_KEY_Linefeed || + keyval == GDK_KEY_Clear || + keyval == GDK_KEY_Return || + keyval == GDK_KEY_Pause || + keyval == GDK_KEY_Scroll_Lock || + keyval == GDK_KEY_Sys_Req || + keyval == GDK_KEY_Escape || + keyval == GDK_KEY_Delete || + (GDK_KEY_Home <= keyval && keyval <= GDK_KEY_Begin) || /* IsCursorkey */ + (GDK_KEY_KP_Space <= keyval && keyval <= GDK_KEY_KP_Delete) || /* IsKeypadKey, non-chars only */ + (GDK_KEY_Select <= keyval && keyval <= GDK_KEY_Break) || /* IsMiscFunctionKey */ + (GDK_KEY_F1 <= keyval && keyval <= GDK_KEY_F35)); /* IsFunctionKey */ } static gboolean is_context_intact_key(guint keyval) { return (((keyval & 0xFF00) == 0xFF00) && - ((GDK_Shift_L <= keyval && keyval <= GDK_Hyper_R) || /* IsModifierKey */ - (keyval == GDK_Mode_switch) || - (keyval == GDK_Num_Lock))) || + ((GDK_KEY_Shift_L <= keyval && keyval <= GDK_KEY_Hyper_R) || /* IsModifierKey */ + (keyval == GDK_KEY_Mode_switch) || + (keyval == GDK_KEY_Num_Lock))) || (((keyval & 0xFE00) == 0xFE00) && - (GDK_ISO_Lock <= keyval && keyval <= GDK_ISO_Last_Group_Lock)); + (GDK_KEY_ISO_Lock <= keyval && keyval <= GDK_KEY_ISO_Last_Group_Lock)); } static gboolean diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c index f989ca4c46..d8fb3d6709 100644 --- a/modules/input/imam-et.c +++ b/modules/input/imam-et.c @@ -140,8 +140,8 @@ am_et_register_type (GTypeModule *module) static guint16 am_et_compose_seqs[] = { /* do punctuation and numerals here */ - '\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */ - '\'', '\'', 0, 0, 0, 0, GDK_apostrophe, + '\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */ + '\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe, '\'', '1', 0, 0, 0, 0, 0x1369, '\'', '1', '0', 0, 0, 0, 0x1372, '\'', '1', '0', '0', 0, 0, 0x137b, @@ -431,8 +431,8 @@ static guint16 am_et_compose_seqs[] = { SYLW('x', 0x1238) SYL('y', 0x12e8) SYLW('z', 0x12d8) - GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361, - GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361, }; static void diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c index 59c4498d57..71563dee4d 100644 --- a/modules/input/imcedilla.c +++ b/modules/input/imcedilla.c @@ -65,12 +65,12 @@ cedilla_register_type (GTypeModule *module) * used extensively. */ static guint16 cedilla_compose_seqs[] = { - GDK_dead_acute, GDK_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ - GDK_dead_acute, GDK_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */ - GDK_Multi_key, GDK_apostrophe, GDK_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ - GDK_Multi_key, GDK_apostrophe, GDK_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */ - GDK_Multi_key, GDK_C, GDK_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ - GDK_Multi_key, GDK_c, GDK_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */ + GDK_KEY_dead_acute, GDK_KEY_C, 0, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ + GDK_KEY_dead_acute, GDK_KEY_c, 0, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */ + GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_C, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ + GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_c, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */ + GDK_KEY_Multi_key, GDK_KEY_C, GDK_KEY_apostrophe, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ + GDK_KEY_Multi_key, GDK_KEY_c, GDK_KEY_apostrophe, 0, 0, 0x00E7, /* LATIN_SMALL_LETTER_C_WITH_CEDILLA */ }; static void diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c index ef4c7decbe..ce624acacd 100644 --- a/modules/input/imcyrillic-translit.c +++ b/modules/input/imcyrillic-translit.c @@ -62,140 +62,140 @@ cyrillic_translit_register_type (GTypeModule *module) * in iso-8859-5 */ static guint16 cyrillic_compose_seqs[] = { - GDK_apostrophe, 0, 0, 0, 0, 0x44C, /* CYRILLIC SMALL LETTER SOFT SIGN */ - GDK_apostrophe, GDK_apostrophe, 0, 0, 0, 0x42C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */ - GDK_slash, GDK_C, GDK_H, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */ - GDK_slash, GDK_C, GDK_h, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */ - GDK_slash, GDK_D, 0, 0, 0, 0x0402, /* CYRILLIC CAPITAL LETTER DJE */ - GDK_slash, GDK_E, 0, 0, 0, 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ - GDK_slash, GDK_G, 0, 0, 0, 0x0403, /* CYRILLIC CAPITAL LETTER GJE */ - GDK_slash, GDK_I, 0, 0, 0, 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ - GDK_slash, GDK_J, 0, 0, 0, 0x0408, /* CYRILLIC CAPITAL LETTER JE */ - GDK_slash, GDK_K, 0, 0, 0, 0x040C, /* CYRILLIC CAPITAL LETTER KJE */ - GDK_slash, GDK_L, 0, 0, 0, 0x0409, /* CYRILLIC CAPITAL LETTER LJE */ - GDK_slash, GDK_N, 0, 0, 0, 0x040A, /* CYRILLIC CAPITAL LETTER NJE */ - GDK_slash, GDK_S, 0, 0, 0, 0x0405, /* CYRILLIC CAPITAL LETTER DZE */ - GDK_slash, GDK_S, GDK_H, GDK_T, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ - GDK_slash, GDK_S, GDK_H, GDK_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ - GDK_slash, GDK_S, GDK_h, GDK_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ - GDK_slash, GDK_T, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ - GDK_slash, GDK_Z, 0, 0, 0, 0x040F, /* CYRILLIC CAPITAL LETTER DZHE */ - GDK_slash, GDK_c, GDK_h, 0, 0, 0x045B, /* CYRILLIC SMALL LETTER TSHE */ - GDK_slash, GDK_d, 0, 0, 0, 0x0452, /* CYRILLIC SMALL LETTER DJE */ - GDK_slash, GDK_e, 0, 0, 0, 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */ - GDK_slash, GDK_g, 0, 0, 0, 0x0453, /* CYRILLIC SMALL LETTER GJE */ - GDK_slash, GDK_i, 0, 0, 0, 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ - GDK_slash, GDK_j, 0, 0, 0, 0x0458, /* CYRILLIC SMALL LETTER JE */ - GDK_slash, GDK_k, 0, 0, 0, 0x045C, /* CYRILLIC SMALL LETTER KJE */ - GDK_slash, GDK_l, 0, 0, 0, 0x0459, /* CYRILLIC SMALL LETTER LJE */ - GDK_slash, GDK_n, 0, 0, 0, 0x045A, /* CYRILLIC SMALL LETTER NJE */ - GDK_slash, GDK_s, 0, 0, 0, 0x0455, /* CYRILLIC SMALL LETTER DZE */ - GDK_slash, GDK_s, GDK_h, GDK_t, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */ - GDK_slash, GDK_t, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */ - GDK_slash, GDK_z, 0, 0, 0, 0x045F, /* CYRILLIC SMALL LETTER DZHE */ - GDK_A, 0, 0, 0, 0, 0x0410, /* CYRILLIC CAPITAL LETTER A */ - GDK_B, 0, 0, 0, 0, 0x0411, /* CYRILLIC CAPITAL LETTER BE */ - GDK_C, 0, 0, 0, 0, 0x0426, /* CYRILLIC CAPITAL LETTER TSE */ - GDK_C, GDK_H, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */ - GDK_C, GDK_h, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */ - GDK_D, 0, 0, 0, 0, 0x0414, /* CYRILLIC CAPITAL LETTER DE */ - GDK_E, 0, 0, 0, 0, 0x0415, /* CYRILLIC CAPITAL LETTER IE */ - GDK_E, GDK_apostrophe, 0, 0, 0, 0x042D, /* CYRILLIC CAPITAL LETTER E */ - GDK_F, 0, 0, 0, 0, 0x0424, /* CYRILLIC CAPITAL LETTER EF */ - GDK_G, 0, 0, 0, 0, 0x0413, /* CYRILLIC CAPITAL LETTER GE */ - GDK_H, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */ - GDK_I, 0, 0, 0, 0, 0x0418, /* CYRILLIC CAPITAL LETTER I */ - GDK_J, 0, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */ - GDK_J, GDK_apostrophe, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */ - GDK_J, GDK_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ - GDK_J, GDK_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ - GDK_J, GDK_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ - GDK_J, GDK_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */ - GDK_J, GDK_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ - GDK_J, GDK_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ - GDK_J, GDK_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ - GDK_J, GDK_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */ - GDK_K, 0, 0, 0, 0, 0x041A, /* CYRILLIC CAPITAL LETTER KA */ - GDK_K, GDK_H, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */ - GDK_L, 0, 0, 0, 0, 0x041B, /* CYRILLIC CAPITAL LETTER EL */ - GDK_M, 0, 0, 0, 0, 0x041C, /* CYRILLIC CAPITAL LETTER EM */ - GDK_N, 0, 0, 0, 0, 0x041D, /* CYRILLIC CAPITAL LETTER EN */ - GDK_O, 0, 0, 0, 0, 0x041E, /* CYRILLIC CAPITAL LETTER O */ - GDK_P, 0, 0, 0, 0, 0x041F, /* CYRILLIC CAPITAL LETTER PE */ - GDK_Q, 0, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ - GDK_R, 0, 0, 0, 0, 0x0420, /* CYRILLIC CAPITAL LETTER ER */ - GDK_S, 0, 0, 0, 0, 0x0421, /* CYRILLIC CAPITAL LETTER ES */ - GDK_S, GDK_H, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */ - GDK_S, GDK_H, GDK_C, GDK_H, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ - GDK_S, GDK_H, GDK_C, GDK_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ - GDK_S, GDK_H, GDK_c, GDK_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ - GDK_S, GDK_H, GDK_c, GDK_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ - GDK_S, GDK_J, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ - GDK_S, GDK_h, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */ - GDK_S, GDK_j, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ - GDK_T, 0, 0, 0, 0, 0x0422, /* CYRILLIC CAPITAL LETTER TE */ - GDK_U, 0, 0, 0, 0, 0x0423, /* CYRILLIC CAPITAL LETTER U */ - GDK_U, GDK_apostrophe, 0, 0, 0, 0x040E, /* CYRILLIC CAPITAL LETTER SHORT */ - GDK_V, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */ - GDK_W, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */ - GDK_X, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */ - GDK_Y, 0, 0, 0, 0, 0x042B, /* CYRILLIC CAPITAL LETTER YERU */ - GDK_Y, GDK_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ - GDK_Y, GDK_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ - GDK_Y, GDK_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ - GDK_Y, GDK_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */ - GDK_Y, GDK_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ - GDK_Y, GDK_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ - GDK_Y, GDK_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ - GDK_Y, GDK_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */ - GDK_Z, 0, 0, 0, 0, 0x0417, /* CYRILLIC CAPITAL LETTER ZE */ - GDK_Z, GDK_H, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */ - GDK_Z, GDK_h, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */ - GDK_a, 0, 0, 0, 0, 0x0430, /* CYRILLIC SMALL LETTER A */ - GDK_b, 0, 0, 0, 0, 0x0431, /* CYRILLIC SMALL LETTER BE */ - GDK_c, 0, 0, 0, 0, 0x0446, /* CYRILLIC SMALL LETTER TSE */ - GDK_c, GDK_h, 0, 0, 0, 0x0447, /* CYRILLIC SMALL LETTER CHE */ - GDK_d, 0, 0, 0, 0, 0x0434, /* CYRILLIC SMALL LETTER DE */ - GDK_e, 0, 0, 0, 0, 0x0435, /* CYRILLIC SMALL LETTER IE */ - GDK_e, GDK_apostrophe, 0, 0, 0, 0x044D, /* CYRILLIC SMALL LETTER E */ - GDK_f, 0, 0, 0, 0, 0x0444, /* CYRILLIC SMALL LETTER EF */ - GDK_g, 0, 0, 0, 0, 0x0433, /* CYRILLIC SMALL LETTER GE */ - GDK_h, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */ - GDK_i, 0, 0, 0, 0, 0x0438, /* CYRILLIC SMALL LETTER I */ - GDK_j, 0, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */ - GDK_j, GDK_apostrophe, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */ - GDK_j, GDK_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */ - GDK_j, GDK_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */ - GDK_j, GDK_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */ - GDK_j, GDK_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */ - GDK_k, 0, 0, 0, 0, 0x043A, /* CYRILLIC SMALL LETTER KA */ - GDK_k, GDK_h, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */ - GDK_l, 0, 0, 0, 0, 0x043B, /* CYRILLIC SMALL LETTER EL */ - GDK_m, 0, 0, 0, 0, 0x043C, /* CYRILLIC SMALL LETTER EM */ - GDK_n, 0, 0, 0, 0, 0x043D, /* CYRILLIC SMALL LETTER EN */ - GDK_o, 0, 0, 0, 0, 0x043E, /* CYRILLIC SMALL LETTER O */ - GDK_p, 0, 0, 0, 0, 0x043F, /* CYRILLIC SMALL LETTER PE */ - GDK_q, 0, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YA */ - GDK_r, 0, 0, 0, 0, 0x0440, /* CYRILLIC SMALL LETTER ER */ - GDK_s, 0, 0, 0, 0, 0x0441, /* CYRILLIC SMALL LETTER ES */ - GDK_s, GDK_h, 0, 0, 0, 0x0448, /* CYRILLIC SMALL LETTER SHA */ - GDK_s, GDK_h, GDK_c, GDK_h, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */ - GDK_s, GDK_j, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */ - GDK_t, 0, 0, 0, 0, 0x0442, /* CYRILLIC SMALL LETTER TE */ - GDK_u, 0, 0, 0, 0, 0x0443, /* CYRILLIC SMALL LETTER U */ - GDK_u, GDK_apostrophe, 0, 0, 0, 0x045E, /* CYRILLIC SMALL LETTER SHORT */ - GDK_v, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */ - GDK_w, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */ - GDK_x, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */ - GDK_y, 0, 0, 0, 0, 0x044B, /* CYRILLIC SMALL LETTER YERU */ - GDK_y, GDK_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */ - GDK_y, GDK_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */ - GDK_y, GDK_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */ - GDK_y, GDK_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */ - GDK_z, 0, 0, 0, 0, 0x0437, /* CYRILLIC SMALL LETTER ZE */ - GDK_z, GDK_h, 0, 0, 0, 0x0436, /* CYRILLIC SMALL LETTER ZHE */ - GDK_asciitilde, 0, 0, 0, 0, 0x44A, /* CYRILLIC SMALL LETTER HARD SIGN */ - GDK_asciitilde, GDK_asciitilde, 0, 0, 0, 0x42A, /* CYRILLIC CAPITAL LETTER HARD SIGN */ + GDK_KEY_apostrophe, 0, 0, 0, 0, 0x44C, /* CYRILLIC SMALL LETTER SOFT SIGN */ + GDK_KEY_apostrophe, GDK_KEY_apostrophe, 0, 0, 0, 0x42C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */ + GDK_KEY_slash, GDK_KEY_C, GDK_KEY_H, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */ + GDK_KEY_slash, GDK_KEY_C, GDK_KEY_h, 0, 0, 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */ + GDK_KEY_slash, GDK_KEY_D, 0, 0, 0, 0x0402, /* CYRILLIC CAPITAL LETTER DJE */ + GDK_KEY_slash, GDK_KEY_E, 0, 0, 0, 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ + GDK_KEY_slash, GDK_KEY_G, 0, 0, 0, 0x0403, /* CYRILLIC CAPITAL LETTER GJE */ + GDK_KEY_slash, GDK_KEY_I, 0, 0, 0, 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ + GDK_KEY_slash, GDK_KEY_J, 0, 0, 0, 0x0408, /* CYRILLIC CAPITAL LETTER JE */ + GDK_KEY_slash, GDK_KEY_K, 0, 0, 0, 0x040C, /* CYRILLIC CAPITAL LETTER KJE */ + GDK_KEY_slash, GDK_KEY_L, 0, 0, 0, 0x0409, /* CYRILLIC CAPITAL LETTER LJE */ + GDK_KEY_slash, GDK_KEY_N, 0, 0, 0, 0x040A, /* CYRILLIC CAPITAL LETTER NJE */ + GDK_KEY_slash, GDK_KEY_S, 0, 0, 0, 0x0405, /* CYRILLIC CAPITAL LETTER DZE */ + GDK_KEY_slash, GDK_KEY_S, GDK_KEY_H, GDK_KEY_T, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ + GDK_KEY_slash, GDK_KEY_S, GDK_KEY_H, GDK_KEY_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ + GDK_KEY_slash, GDK_KEY_S, GDK_KEY_h, GDK_KEY_t, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ + GDK_KEY_slash, GDK_KEY_T, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCH */ + GDK_KEY_slash, GDK_KEY_Z, 0, 0, 0, 0x040F, /* CYRILLIC CAPITAL LETTER DZHE */ + GDK_KEY_slash, GDK_KEY_c, GDK_KEY_h, 0, 0, 0x045B, /* CYRILLIC SMALL LETTER TSHE */ + GDK_KEY_slash, GDK_KEY_d, 0, 0, 0, 0x0452, /* CYRILLIC SMALL LETTER DJE */ + GDK_KEY_slash, GDK_KEY_e, 0, 0, 0, 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */ + GDK_KEY_slash, GDK_KEY_g, 0, 0, 0, 0x0453, /* CYRILLIC SMALL LETTER GJE */ + GDK_KEY_slash, GDK_KEY_i, 0, 0, 0, 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ + GDK_KEY_slash, GDK_KEY_j, 0, 0, 0, 0x0458, /* CYRILLIC SMALL LETTER JE */ + GDK_KEY_slash, GDK_KEY_k, 0, 0, 0, 0x045C, /* CYRILLIC SMALL LETTER KJE */ + GDK_KEY_slash, GDK_KEY_l, 0, 0, 0, 0x0459, /* CYRILLIC SMALL LETTER LJE */ + GDK_KEY_slash, GDK_KEY_n, 0, 0, 0, 0x045A, /* CYRILLIC SMALL LETTER NJE */ + GDK_KEY_slash, GDK_KEY_s, 0, 0, 0, 0x0455, /* CYRILLIC SMALL LETTER DZE */ + GDK_KEY_slash, GDK_KEY_s, GDK_KEY_h, GDK_KEY_t, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */ + GDK_KEY_slash, GDK_KEY_t, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCH */ + GDK_KEY_slash, GDK_KEY_z, 0, 0, 0, 0x045F, /* CYRILLIC SMALL LETTER DZHE */ + GDK_KEY_A, 0, 0, 0, 0, 0x0410, /* CYRILLIC CAPITAL LETTER A */ + GDK_KEY_B, 0, 0, 0, 0, 0x0411, /* CYRILLIC CAPITAL LETTER BE */ + GDK_KEY_C, 0, 0, 0, 0, 0x0426, /* CYRILLIC CAPITAL LETTER TSE */ + GDK_KEY_C, GDK_KEY_H, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */ + GDK_KEY_C, GDK_KEY_h, 0, 0, 0, 0x0427, /* CYRILLIC CAPITAL LETTER CHE */ + GDK_KEY_D, 0, 0, 0, 0, 0x0414, /* CYRILLIC CAPITAL LETTER DE */ + GDK_KEY_E, 0, 0, 0, 0, 0x0415, /* CYRILLIC CAPITAL LETTER IE */ + GDK_KEY_E, GDK_KEY_apostrophe, 0, 0, 0, 0x042D, /* CYRILLIC CAPITAL LETTER E */ + GDK_KEY_F, 0, 0, 0, 0, 0x0424, /* CYRILLIC CAPITAL LETTER EF */ + GDK_KEY_G, 0, 0, 0, 0, 0x0413, /* CYRILLIC CAPITAL LETTER GE */ + GDK_KEY_H, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */ + GDK_KEY_I, 0, 0, 0, 0, 0x0418, /* CYRILLIC CAPITAL LETTER I */ + GDK_KEY_J, 0, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */ + GDK_KEY_J, GDK_KEY_apostrophe, 0, 0, 0, 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */ + GDK_KEY_J, GDK_KEY_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_J, GDK_KEY_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ + GDK_KEY_J, GDK_KEY_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ + GDK_KEY_J, GDK_KEY_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_J, GDK_KEY_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_J, GDK_KEY_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ + GDK_KEY_J, GDK_KEY_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ + GDK_KEY_J, GDK_KEY_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_K, 0, 0, 0, 0, 0x041A, /* CYRILLIC CAPITAL LETTER KA */ + GDK_KEY_K, GDK_KEY_H, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */ + GDK_KEY_L, 0, 0, 0, 0, 0x041B, /* CYRILLIC CAPITAL LETTER EL */ + GDK_KEY_M, 0, 0, 0, 0, 0x041C, /* CYRILLIC CAPITAL LETTER EM */ + GDK_KEY_N, 0, 0, 0, 0, 0x041D, /* CYRILLIC CAPITAL LETTER EN */ + GDK_KEY_O, 0, 0, 0, 0, 0x041E, /* CYRILLIC CAPITAL LETTER O */ + GDK_KEY_P, 0, 0, 0, 0, 0x041F, /* CYRILLIC CAPITAL LETTER PE */ + GDK_KEY_Q, 0, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_R, 0, 0, 0, 0, 0x0420, /* CYRILLIC CAPITAL LETTER ER */ + GDK_KEY_S, 0, 0, 0, 0, 0x0421, /* CYRILLIC CAPITAL LETTER ES */ + GDK_KEY_S, GDK_KEY_H, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */ + GDK_KEY_S, GDK_KEY_H, GDK_KEY_C, GDK_KEY_H, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ + GDK_KEY_S, GDK_KEY_H, GDK_KEY_C, GDK_KEY_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ + GDK_KEY_S, GDK_KEY_H, GDK_KEY_c, GDK_KEY_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ + GDK_KEY_S, GDK_KEY_H, GDK_KEY_c, GDK_KEY_h, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ + GDK_KEY_S, GDK_KEY_J, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ + GDK_KEY_S, GDK_KEY_h, 0, 0, 0, 0x0428, /* CYRILLIC CAPITAL LETTER SHA */ + GDK_KEY_S, GDK_KEY_j, 0, 0, 0, 0x0429, /* CYRILLIC CAPITAL LETTER SHCA */ + GDK_KEY_T, 0, 0, 0, 0, 0x0422, /* CYRILLIC CAPITAL LETTER TE */ + GDK_KEY_U, 0, 0, 0, 0, 0x0423, /* CYRILLIC CAPITAL LETTER U */ + GDK_KEY_U, GDK_KEY_apostrophe, 0, 0, 0, 0x040E, /* CYRILLIC CAPITAL LETTER SHORT */ + GDK_KEY_V, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */ + GDK_KEY_W, 0, 0, 0, 0, 0x0412, /* CYRILLIC CAPITAL LETTER VE */ + GDK_KEY_X, 0, 0, 0, 0, 0x0425, /* CYRILLIC CAPITAL LETTER HA */ + GDK_KEY_Y, 0, 0, 0, 0, 0x042B, /* CYRILLIC CAPITAL LETTER YERU */ + GDK_KEY_Y, GDK_KEY_A, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_Y, GDK_KEY_I, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ + GDK_KEY_Y, GDK_KEY_O, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ + GDK_KEY_Y, GDK_KEY_U, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */ + GDK_KEY_Y, GDK_KEY_a, 0, 0, 0, 0x042F, /* CYRILLIC CAPITAL LETTER YA */ + GDK_KEY_Y, GDK_KEY_i, 0, 0, 0, 0x0407, /* CYRILLIC CAPITAL LETTER YI */ + GDK_KEY_Y, GDK_KEY_o, 0, 0, 0, 0x0401, /* CYRILLIC CAPITAL LETTER YO */ + GDK_KEY_Y, GDK_KEY_u, 0, 0, 0, 0x042E, /* CYRILLIC CAPITAL LETTER YU */ + GDK_KEY_Z, 0, 0, 0, 0, 0x0417, /* CYRILLIC CAPITAL LETTER ZE */ + GDK_KEY_Z, GDK_KEY_H, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */ + GDK_KEY_Z, GDK_KEY_h, 0, 0, 0, 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */ + GDK_KEY_a, 0, 0, 0, 0, 0x0430, /* CYRILLIC SMALL LETTER A */ + GDK_KEY_b, 0, 0, 0, 0, 0x0431, /* CYRILLIC SMALL LETTER BE */ + GDK_KEY_c, 0, 0, 0, 0, 0x0446, /* CYRILLIC SMALL LETTER TSE */ + GDK_KEY_c, GDK_KEY_h, 0, 0, 0, 0x0447, /* CYRILLIC SMALL LETTER CHE */ + GDK_KEY_d, 0, 0, 0, 0, 0x0434, /* CYRILLIC SMALL LETTER DE */ + GDK_KEY_e, 0, 0, 0, 0, 0x0435, /* CYRILLIC SMALL LETTER IE */ + GDK_KEY_e, GDK_KEY_apostrophe, 0, 0, 0, 0x044D, /* CYRILLIC SMALL LETTER E */ + GDK_KEY_f, 0, 0, 0, 0, 0x0444, /* CYRILLIC SMALL LETTER EF */ + GDK_KEY_g, 0, 0, 0, 0, 0x0433, /* CYRILLIC SMALL LETTER GE */ + GDK_KEY_h, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */ + GDK_KEY_i, 0, 0, 0, 0, 0x0438, /* CYRILLIC SMALL LETTER I */ + GDK_KEY_j, 0, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */ + GDK_KEY_j, GDK_KEY_apostrophe, 0, 0, 0, 0x0439, /* CYRILLIC SMALL LETTER SHORT I */ + GDK_KEY_j, GDK_KEY_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */ + GDK_KEY_j, GDK_KEY_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */ + GDK_KEY_j, GDK_KEY_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */ + GDK_KEY_j, GDK_KEY_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */ + GDK_KEY_k, 0, 0, 0, 0, 0x043A, /* CYRILLIC SMALL LETTER KA */ + GDK_KEY_k, GDK_KEY_h, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */ + GDK_KEY_l, 0, 0, 0, 0, 0x043B, /* CYRILLIC SMALL LETTER EL */ + GDK_KEY_m, 0, 0, 0, 0, 0x043C, /* CYRILLIC SMALL LETTER EM */ + GDK_KEY_n, 0, 0, 0, 0, 0x043D, /* CYRILLIC SMALL LETTER EN */ + GDK_KEY_o, 0, 0, 0, 0, 0x043E, /* CYRILLIC SMALL LETTER O */ + GDK_KEY_p, 0, 0, 0, 0, 0x043F, /* CYRILLIC SMALL LETTER PE */ + GDK_KEY_q, 0, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YA */ + GDK_KEY_r, 0, 0, 0, 0, 0x0440, /* CYRILLIC SMALL LETTER ER */ + GDK_KEY_s, 0, 0, 0, 0, 0x0441, /* CYRILLIC SMALL LETTER ES */ + GDK_KEY_s, GDK_KEY_h, 0, 0, 0, 0x0448, /* CYRILLIC SMALL LETTER SHA */ + GDK_KEY_s, GDK_KEY_h, GDK_KEY_c, GDK_KEY_h, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */ + GDK_KEY_s, GDK_KEY_j, 0, 0, 0, 0x0449, /* CYRILLIC SMALL LETTER SHCA */ + GDK_KEY_t, 0, 0, 0, 0, 0x0442, /* CYRILLIC SMALL LETTER TE */ + GDK_KEY_u, 0, 0, 0, 0, 0x0443, /* CYRILLIC SMALL LETTER U */ + GDK_KEY_u, GDK_KEY_apostrophe, 0, 0, 0, 0x045E, /* CYRILLIC SMALL LETTER SHORT */ + GDK_KEY_v, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */ + GDK_KEY_w, 0, 0, 0, 0, 0x0432, /* CYRILLIC SMALL LETTER VE */ + GDK_KEY_x, 0, 0, 0, 0, 0x0445, /* CYRILLIC SMALL LETTER HA */ + GDK_KEY_y, 0, 0, 0, 0, 0x044B, /* CYRILLIC SMALL LETTER YERU */ + GDK_KEY_y, GDK_KEY_a, 0, 0, 0, 0x044F, /* CYRILLIC SMALL LETTER YU */ + GDK_KEY_y, GDK_KEY_i, 0, 0, 0, 0x0457, /* CYRILLIC SMALL LETTER YI */ + GDK_KEY_y, GDK_KEY_o, 0, 0, 0, 0x0451, /* CYRILLIC SMALL LETTER YO */ + GDK_KEY_y, GDK_KEY_u, 0, 0, 0, 0x044E, /* CYRILLIC SMALL LETTER YA */ + GDK_KEY_z, 0, 0, 0, 0, 0x0437, /* CYRILLIC SMALL LETTER ZE */ + GDK_KEY_z, GDK_KEY_h, 0, 0, 0, 0x0436, /* CYRILLIC SMALL LETTER ZHE */ + GDK_KEY_asciitilde, 0, 0, 0, 0, 0x44A, /* CYRILLIC SMALL LETTER HARD SIGN */ + GDK_KEY_asciitilde, GDK_KEY_asciitilde, 0, 0, 0, 0x42A, /* CYRILLIC CAPITAL LETTER HARD SIGN */ }; static void diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c index d727da743e..2e0bd9664a 100644 --- a/modules/input/iminuktitut.c +++ b/modules/input/iminuktitut.c @@ -104,8 +104,8 @@ static guint16 inuktitut_compose_seqs[] = { SYL('v', 0x1555, 0x155d, 2) /* as f */ SYL('y', 0x1528, 0x153e, 2) /* As j */ - SYL(GDK_lstroke, 0x15a0, 0x15a6, 3) /* l- */ - SYL(GDK_eng, 0x158f, 0x1595, 3) /* ng */ + SYL(GDK_KEY_lstroke, 0x15a0, 0x15a6, 3) /* l- */ + SYL(GDK_KEY_eng, 0x158f, 0x1595, 3) /* ng */ }; static void diff --git a/modules/input/imipa.c b/modules/input/imipa.c index b526d8f402..2593ca3dbb 100644 --- a/modules/input/imipa.c +++ b/modules/input/imipa.c @@ -62,67 +62,67 @@ ipa_register_type (GTypeModule *module) * in iso-8859-5 */ static guint16 ipa_compose_seqs[] = { - GDK_ampersand, 0, 0, 0, 0, 0x263, /* LATIN SMALL LETTER GAMMA */ - GDK_apostrophe, 0, 0, 0, 0, 0x2C8, /* MODIFIER LETTER VERTICAL LINE */ - GDK_slash, GDK_apostrophe, 0, 0, 0, 0x2CA, /* MODIFIER LETTER ACUTE ACCENT */ - GDK_slash, GDK_slash, 0, 0, 0, 0x02F, /* SOLIDUS */ - GDK_slash, GDK_3, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */ - GDK_slash, GDK_A, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */ - GDK_slash, GDK_R, 0, 0, 0, 0x281, /* LATIN LETTER SMALL CAPITAL INVERTED R */ - GDK_slash, GDK_a, 0, 0, 0, 0x250, /* LATIN SMALL LETTER TURNED A */ - GDK_slash, GDK_c, 0, 0, 0, 0x254, /* LATIN SMALL LETTER OPEN O */ - GDK_slash, GDK_e, 0, 0, 0, 0x259, /* LATIN SMALL LETTER SCHWA */ - GDK_slash, GDK_h, 0, 0, 0, 0x265, /* LATIN SMALL LETTER TURNED H */ - GDK_slash, GDK_m, 0, 0, 0, 0x26F, /* LATIN SMALL LETTER TURNED M */ - GDK_slash, GDK_r, 0, 0, 0, 0x279, /* LATIN SMALL LETTER TURNED R */ - GDK_slash, GDK_v, 0, 0, 0, 0x28C, /* LATIN SMALL LETTER TURNED V */ - GDK_slash, GDK_w, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */ - GDK_slash, GDK_y, 0, 0, 0, 0x28E, /* LATIN SMALL LETTER TRUEND Y*/ - GDK_3, 0, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */ - GDK_colon, 0, 0, 0, 0, 0x2D0, /* MODIFIER LETTER TRIANGULAR COLON */ - GDK_A, 0, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */ - GDK_E, 0, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */ - GDK_I, 0, 0, 0, 0, 0x26A, /* LATIN LETTER SMALL CAPITAL I */ - GDK_L, 0, 0, 0, 0, 0x29F, /* LATIN LETTER SMALL CAPITAL L */ - GDK_M, 0, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */ - GDK_O, 0, 0, 0, 0, 0x04F, /* LATIN LETTER SMALL CAPITAL OE */ - GDK_O, GDK_E, 0, 0, 0, 0x276, /* LATIN LETTER SMALL CAPITAL OE */ - GDK_R, 0, 0, 0, 0, 0x280, /* LATIN LETTER SMALL CAPITAL R */ - GDK_U, 0, 0, 0, 0, 0x28A, /* LATIN SMALL LETTER UPSILON */ - GDK_Y, 0, 0, 0, 0, 0x28F, /* LATIN LETTER SMALL CAPITAL Y */ - GDK_grave, 0, 0, 0, 0, 0x2CC, /* MODIFIER LETTER LOW VERTICAL LINE */ - GDK_a, 0, 0, 0, 0, 0x061, /* LATIN SMALL LETTER A */ - GDK_a, GDK_e, 0, 0, 0, 0x0E6, /* LATIN SMALL LETTER AE */ - GDK_c, 0, 0, 0, 0, 0x063, /* LATIN SMALL LETTER C */ - GDK_c, GDK_comma, 0, 0, 0, 0x0E7, /* LATIN SMALL LETTER C WITH CEDILLA */ - GDK_d, 0, 0, 0, 0, 0x064, /* LATIN SMALL LETTER E */ - GDK_d, GDK_apostrophe, 0, 0, 0, 0x064, /* LATIN SMALL LETTER D */ - GDK_d, GDK_h, 0, 0, 0, 0x0F0, /* LATIN SMALL LETTER ETH */ - GDK_e, 0, 0, 0, 0, 0x065, /* LATIN SMALL LETTER E */ - GDK_e, GDK_minus, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */ - GDK_e, GDK_bar, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */ - GDK_g, 0, 0, 0, 0, 0x067, /* LATIN SMALL LETTER G */ - GDK_g, GDK_n, 0, 0, 0, 0x272, /* LATIN SMALL LETTER N WITH LEFT HOOK */ - GDK_i, 0, 0, 0, 0, 0x069, /* LATIN SMALL LETTER I */ - GDK_i, GDK_minus, 0, 0, 0, 0x268, /* LATIN SMALL LETTER I WITH STROKE */ - GDK_n, 0, 0, 0, 0, 0x06e, /* LATIN SMALL LETTER N */ - GDK_n, GDK_g, 0, 0, 0, 0x14B, /* LATIN SMALL LETTER ENG */ - GDK_o, 0, 0, 0, 0, 0x06f, /* LATIN SMALL LETTER O */ - GDK_o, GDK_minus, 0, 0, 0, 0x275, /* LATIN LETTER BARRED O */ - GDK_o, GDK_slash, 0, 0, 0, 0x0F8, /* LATIN SMALL LETTER O WITH STROKE */ - GDK_o, GDK_e, 0, 0, 0, 0x153, /* LATIN SMALL LIGATURE OE */ - GDK_o, GDK_bar, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */ - GDK_s, 0, 0, 0, 0, 0x073, /* LATIN SMALL LETTER_ESH */ - GDK_s, GDK_h, 0, 0, 0, 0x283, /* LATIN SMALL LETTER_ESH */ - GDK_t, 0, 0, 0, 0, 0x074, /* LATIN SMALL LETTER T */ - GDK_t, GDK_h, 0, 0, 0, 0x3B8, /* GREEK SMALL LETTER THETA */ - GDK_u, 0, 0, 0, 0, 0x075, /* LATIN SMALL LETTER U */ - GDK_u, GDK_minus, 0, 0, 0, 0x289, /* LATIN LETTER U BAR */ - GDK_z, 0, 0, 0, 0, 0x07A, /* LATIN SMALL LETTER Z */ - GDK_z, GDK_h, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */ - GDK_bar, GDK_o, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */ - - GDK_asciitilde, 0, 0, 0, 0, 0x303, /* COMBINING TILDE */ + GDK_KEY_ampersand, 0, 0, 0, 0, 0x263, /* LATIN SMALL LETTER GAMMA */ + GDK_KEY_apostrophe, 0, 0, 0, 0, 0x2C8, /* MODIFIER LETTER VERTICAL LINE */ + GDK_KEY_slash, GDK_KEY_apostrophe, 0, 0, 0, 0x2CA, /* MODIFIER LETTER ACUTE ACCENT */ + GDK_KEY_slash, GDK_KEY_slash, 0, 0, 0, 0x02F, /* SOLIDUS */ + GDK_KEY_slash, GDK_KEY_3, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */ + GDK_KEY_slash, GDK_KEY_A, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */ + GDK_KEY_slash, GDK_KEY_R, 0, 0, 0, 0x281, /* LATIN LETTER SMALL CAPITAL INVERTED R */ + GDK_KEY_slash, GDK_KEY_a, 0, 0, 0, 0x250, /* LATIN SMALL LETTER TURNED A */ + GDK_KEY_slash, GDK_KEY_c, 0, 0, 0, 0x254, /* LATIN SMALL LETTER OPEN O */ + GDK_KEY_slash, GDK_KEY_e, 0, 0, 0, 0x259, /* LATIN SMALL LETTER SCHWA */ + GDK_KEY_slash, GDK_KEY_h, 0, 0, 0, 0x265, /* LATIN SMALL LETTER TURNED H */ + GDK_KEY_slash, GDK_KEY_m, 0, 0, 0, 0x26F, /* LATIN SMALL LETTER TURNED M */ + GDK_KEY_slash, GDK_KEY_r, 0, 0, 0, 0x279, /* LATIN SMALL LETTER TURNED R */ + GDK_KEY_slash, GDK_KEY_v, 0, 0, 0, 0x28C, /* LATIN SMALL LETTER TURNED V */ + GDK_KEY_slash, GDK_KEY_w, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */ + GDK_KEY_slash, GDK_KEY_y, 0, 0, 0, 0x28E, /* LATIN SMALL LETTER TRUEND Y*/ + GDK_KEY_3, 0, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */ + GDK_KEY_colon, 0, 0, 0, 0, 0x2D0, /* MODIFIER LETTER TRIANGULAR COLON */ + GDK_KEY_A, 0, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */ + GDK_KEY_E, 0, 0, 0, 0, 0x25B, /* LATIN SMALL LETTER OPEN E */ + GDK_KEY_I, 0, 0, 0, 0, 0x26A, /* LATIN LETTER SMALL CAPITAL I */ + GDK_KEY_L, 0, 0, 0, 0, 0x29F, /* LATIN LETTER SMALL CAPITAL L */ + GDK_KEY_M, 0, 0, 0, 0, 0x28D, /* LATIN SMALL LETTER TURNED W */ + GDK_KEY_O, 0, 0, 0, 0, 0x04F, /* LATIN LETTER SMALL CAPITAL OE */ + GDK_KEY_O, GDK_KEY_E, 0, 0, 0, 0x276, /* LATIN LETTER SMALL CAPITAL OE */ + GDK_KEY_R, 0, 0, 0, 0, 0x280, /* LATIN LETTER SMALL CAPITAL R */ + GDK_KEY_U, 0, 0, 0, 0, 0x28A, /* LATIN SMALL LETTER UPSILON */ + GDK_KEY_Y, 0, 0, 0, 0, 0x28F, /* LATIN LETTER SMALL CAPITAL Y */ + GDK_KEY_grave, 0, 0, 0, 0, 0x2CC, /* MODIFIER LETTER LOW VERTICAL LINE */ + GDK_KEY_a, 0, 0, 0, 0, 0x061, /* LATIN SMALL LETTER A */ + GDK_KEY_a, GDK_KEY_e, 0, 0, 0, 0x0E6, /* LATIN SMALL LETTER AE */ + GDK_KEY_c, 0, 0, 0, 0, 0x063, /* LATIN SMALL LETTER C */ + GDK_KEY_c, GDK_KEY_comma, 0, 0, 0, 0x0E7, /* LATIN SMALL LETTER C WITH CEDILLA */ + GDK_KEY_d, 0, 0, 0, 0, 0x064, /* LATIN SMALL LETTER E */ + GDK_KEY_d, GDK_KEY_apostrophe, 0, 0, 0, 0x064, /* LATIN SMALL LETTER D */ + GDK_KEY_d, GDK_KEY_h, 0, 0, 0, 0x0F0, /* LATIN SMALL LETTER ETH */ + GDK_KEY_e, 0, 0, 0, 0, 0x065, /* LATIN SMALL LETTER E */ + GDK_KEY_e, GDK_KEY_minus, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */ + GDK_KEY_e, GDK_KEY_bar, 0, 0, 0, 0x25A, /* LATIN SMALL LETTER SCHWA WITH HOOK */ + GDK_KEY_g, 0, 0, 0, 0, 0x067, /* LATIN SMALL LETTER G */ + GDK_KEY_g, GDK_KEY_n, 0, 0, 0, 0x272, /* LATIN SMALL LETTER N WITH LEFT HOOK */ + GDK_KEY_i, 0, 0, 0, 0, 0x069, /* LATIN SMALL LETTER I */ + GDK_KEY_i, GDK_KEY_minus, 0, 0, 0, 0x268, /* LATIN SMALL LETTER I WITH STROKE */ + GDK_KEY_n, 0, 0, 0, 0, 0x06e, /* LATIN SMALL LETTER N */ + GDK_KEY_n, GDK_KEY_g, 0, 0, 0, 0x14B, /* LATIN SMALL LETTER ENG */ + GDK_KEY_o, 0, 0, 0, 0, 0x06f, /* LATIN SMALL LETTER O */ + GDK_KEY_o, GDK_KEY_minus, 0, 0, 0, 0x275, /* LATIN LETTER BARRED O */ + GDK_KEY_o, GDK_KEY_slash, 0, 0, 0, 0x0F8, /* LATIN SMALL LETTER O WITH STROKE */ + GDK_KEY_o, GDK_KEY_e, 0, 0, 0, 0x153, /* LATIN SMALL LIGATURE OE */ + GDK_KEY_o, GDK_KEY_bar, 0, 0, 0, 0x251, /* LATIN SMALL LETTER ALPHA */ + GDK_KEY_s, 0, 0, 0, 0, 0x073, /* LATIN SMALL LETTER_ESH */ + GDK_KEY_s, GDK_KEY_h, 0, 0, 0, 0x283, /* LATIN SMALL LETTER_ESH */ + GDK_KEY_t, 0, 0, 0, 0, 0x074, /* LATIN SMALL LETTER T */ + GDK_KEY_t, GDK_KEY_h, 0, 0, 0, 0x3B8, /* GREEK SMALL LETTER THETA */ + GDK_KEY_u, 0, 0, 0, 0, 0x075, /* LATIN SMALL LETTER U */ + GDK_KEY_u, GDK_KEY_minus, 0, 0, 0, 0x289, /* LATIN LETTER U BAR */ + GDK_KEY_z, 0, 0, 0, 0, 0x07A, /* LATIN SMALL LETTER Z */ + GDK_KEY_z, GDK_KEY_h, 0, 0, 0, 0x292, /* LATIN SMALL LETTER EZH */ + GDK_KEY_bar, GDK_KEY_o, 0, 0, 0, 0x252, /* LATIN LETTER TURNED ALPHA */ + + GDK_KEY_asciitilde, 0, 0, 0, 0, 0x303, /* COMBINING TILDE */ }; diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c index ad623448c7..614755bdb6 100644 --- a/modules/input/imti-er.c +++ b/modules/input/imti-er.c @@ -140,8 +140,8 @@ ti_er_register_type (GTypeModule *module) static guint16 ti_er_compose_seqs[] = { /* do punctuation and numerals here */ - '\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */ - '\'', '\'', 0, 0, 0, 0, GDK_apostrophe, + '\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */ + '\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe, '\'', '1', 0, 0, 0, 0, 0x1369, '\'', '1', '0', 0, 0, 0, 0x1372, '\'', '1', '0', '0', 0, 0, 0x137b, @@ -430,8 +430,8 @@ static guint16 ti_er_compose_seqs[] = { SYLW('x', 0x1238) SYL('y', 0x12e8) SYLW('z', 0x12d8) - GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361, - GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361, }; static void diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c index 663c7e2a82..edfdf53435 100644 --- a/modules/input/imti-et.c +++ b/modules/input/imti-et.c @@ -140,8 +140,8 @@ ti_et_register_type (GTypeModule *module) static guint16 ti_et_compose_seqs[] = { /* do punctuation and numerals here */ - '\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */ - '\'', '\'', 0, 0, 0, 0, GDK_apostrophe, + '\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */ + '\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe, '\'', '1', 0, 0, 0, 0, 0x1369, '\'', '1', '0', 0, 0, 0, 0x1372, '\'', '1', '0', '0', 0, 0, 0x137b, @@ -430,8 +430,8 @@ static guint16 ti_et_compose_seqs[] = { SYLW('x', 0x1238) SYL('y', 0x12e8) SYLW('z', 0x12d8) - GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361, - GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361, }; static void diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c index 5994894486..3b4763d6e1 100644 --- a/modules/input/imviqr.c +++ b/modules/input/imviqr.c @@ -61,168 +61,168 @@ viqr_register_type (GTypeModule *module) } static guint16 viqr_compose_seqs[] = { - GDK_A, 0, 0, 0, 0, 'A', - GDK_A, GDK_apostrophe, 0, 0, 0, 0xc1, - GDK_A, GDK_parenleft, 0, 0, 0, 0x102, - GDK_A, GDK_parenleft, GDK_apostrophe, 0, 0, 0x1eae, - GDK_A, GDK_parenleft, GDK_period, 0, 0, 0x1eb6, - GDK_A, GDK_parenleft, GDK_question, 0, 0, 0x1eb2, - GDK_A, GDK_parenleft, GDK_grave, 0, 0, 0x1eb0, - GDK_A, GDK_parenleft, GDK_asciitilde, 0, 0, 0x1eb4, - GDK_A, GDK_period, 0, 0, 0, 0x1ea0, - GDK_A, GDK_question, 0, 0, 0, 0x1ea2, - GDK_A, GDK_asciicircum, 0, 0, 0, 0xc2, - GDK_A, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ea4, - GDK_A, GDK_asciicircum, GDK_period, 0, 0, 0x1eac, - GDK_A, GDK_asciicircum, GDK_question, 0, 0, 0x1ea8, - GDK_A, GDK_asciicircum, GDK_grave, 0, 0, 0x1ea6, - GDK_A, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1eaa, - GDK_A, GDK_grave, 0, 0, 0, 0xc0, - GDK_A, GDK_asciitilde, 0, 0, 0, 0xc3, - GDK_D, 0, 0, 0, 0, 'D', - GDK_D, GDK_D, 0, 0, 0, 0x110, - GDK_D, GDK_d, 0, 0, 0, 0x110, - GDK_E, 0, 0, 0, 0, 'E', - GDK_E, GDK_apostrophe, 0, 0, 0, 0xc9, - GDK_E, GDK_period, 0, 0, 0, 0x1eb8, - GDK_E, GDK_question, 0, 0, 0, 0x1eba, - GDK_E, GDK_asciicircum, 0, 0, 0, 0xca, - GDK_E, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ebe, - GDK_E, GDK_asciicircum, GDK_period, 0, 0, 0x1ec6, - GDK_E, GDK_asciicircum, GDK_question, 0, 0, 0x1ec2, - GDK_E, GDK_asciicircum, GDK_grave, 0, 0, 0x1ec0, - GDK_E, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ec4, - GDK_E, GDK_grave, 0, 0, 0, 0xc8, - GDK_E, GDK_asciitilde, 0, 0, 0, 0x1ebc, - GDK_I, 0, 0, 0, 0, 'I', - GDK_I, GDK_apostrophe, 0, 0, 0, 0xcd, - GDK_I, GDK_period, 0, 0, 0, 0x1eca, - GDK_I, GDK_question, 0, 0, 0, 0x1ec8, - GDK_I, GDK_grave, 0, 0, 0, 0xcc, - GDK_I, GDK_asciitilde, 0, 0, 0, 0x128, - GDK_O, 0, 0, 0, 0, 'O', - GDK_O, GDK_apostrophe, 0, 0, 0, 0xD3, - GDK_O, GDK_plus, 0, 0, 0, 0x1a0, - GDK_O, GDK_plus, GDK_apostrophe, 0, 0, 0x1eda, - GDK_O, GDK_plus, GDK_period, 0, 0, 0x1ee2, - GDK_O, GDK_plus, GDK_question, 0, 0, 0x1ede, - GDK_O, GDK_plus, GDK_grave, 0, 0, 0x1edc, - GDK_O, GDK_plus, GDK_asciitilde, 0, 0, 0x1ee0, - GDK_O, GDK_period, 0, 0, 0, 0x1ecc, - GDK_O, GDK_question, 0, 0, 0, 0x1ece, - GDK_O, GDK_asciicircum, 0, 0, 0, 0xd4, - GDK_O, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ed0, - GDK_O, GDK_asciicircum, GDK_period, 0, 0, 0x1ed8, - GDK_O, GDK_asciicircum, GDK_question, 0, 0, 0x1ed4, - GDK_O, GDK_asciicircum, GDK_grave, 0, 0, 0x1ed2, - GDK_O, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ed6, - GDK_O, GDK_grave, 0, 0, 0, 0xD2, - GDK_O, GDK_asciitilde, 0, 0, 0, 0xD5, - GDK_U, 0, 0, 0, 0, 'U', - GDK_U, GDK_apostrophe, 0, 0, 0, 0xDA, - GDK_U, GDK_plus, 0, 0, 0, 0x1af, - GDK_U, GDK_plus, GDK_apostrophe, 0, 0, 0x1ee8, - GDK_U, GDK_plus, GDK_period, 0, 0, 0x1ef0, - GDK_U, GDK_plus, GDK_question, 0, 0, 0x1eec, - GDK_U, GDK_plus, GDK_grave, 0, 0, 0x1eea, - GDK_U, GDK_plus, GDK_asciitilde, 0, 0, 0x1eee, - GDK_U, GDK_period, 0, 0, 0, 0x1ee4, - GDK_U, GDK_question, 0, 0, 0, 0x1ee6, - GDK_U, GDK_grave, 0, 0, 0, 0xd9, - GDK_U, GDK_asciitilde, 0, 0, 0, 0x168, - GDK_Y, 0, 0, 0, 0, 'Y', - GDK_Y, GDK_apostrophe, 0, 0, 0, 0xdd, - GDK_Y, GDK_period, 0, 0, 0, 0x1ef4, - GDK_Y, GDK_question, 0, 0, 0, 0x1ef6, - GDK_Y, GDK_grave, 0, 0, 0, 0x1ef2, - GDK_Y, GDK_asciitilde, 0, 0, 0, 0x1ef8, + GDK_KEY_A, 0, 0, 0, 0, 'A', + GDK_KEY_A, GDK_KEY_apostrophe, 0, 0, 0, 0xc1, + GDK_KEY_A, GDK_KEY_parenleft, 0, 0, 0, 0x102, + GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_apostrophe, 0, 0, 0x1eae, + GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_period, 0, 0, 0x1eb6, + GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_question, 0, 0, 0x1eb2, + GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_grave, 0, 0, 0x1eb0, + GDK_KEY_A, GDK_KEY_parenleft, GDK_KEY_asciitilde, 0, 0, 0x1eb4, + GDK_KEY_A, GDK_KEY_period, 0, 0, 0, 0x1ea0, + GDK_KEY_A, GDK_KEY_question, 0, 0, 0, 0x1ea2, + GDK_KEY_A, GDK_KEY_asciicircum, 0, 0, 0, 0xc2, + GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ea4, + GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1eac, + GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ea8, + GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ea6, + GDK_KEY_A, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1eaa, + GDK_KEY_A, GDK_KEY_grave, 0, 0, 0, 0xc0, + GDK_KEY_A, GDK_KEY_asciitilde, 0, 0, 0, 0xc3, + GDK_KEY_D, 0, 0, 0, 0, 'D', + GDK_KEY_D, GDK_KEY_D, 0, 0, 0, 0x110, + GDK_KEY_D, GDK_KEY_d, 0, 0, 0, 0x110, + GDK_KEY_E, 0, 0, 0, 0, 'E', + GDK_KEY_E, GDK_KEY_apostrophe, 0, 0, 0, 0xc9, + GDK_KEY_E, GDK_KEY_period, 0, 0, 0, 0x1eb8, + GDK_KEY_E, GDK_KEY_question, 0, 0, 0, 0x1eba, + GDK_KEY_E, GDK_KEY_asciicircum, 0, 0, 0, 0xca, + GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ebe, + GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ec6, + GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ec2, + GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ec0, + GDK_KEY_E, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ec4, + GDK_KEY_E, GDK_KEY_grave, 0, 0, 0, 0xc8, + GDK_KEY_E, GDK_KEY_asciitilde, 0, 0, 0, 0x1ebc, + GDK_KEY_I, 0, 0, 0, 0, 'I', + GDK_KEY_I, GDK_KEY_apostrophe, 0, 0, 0, 0xcd, + GDK_KEY_I, GDK_KEY_period, 0, 0, 0, 0x1eca, + GDK_KEY_I, GDK_KEY_question, 0, 0, 0, 0x1ec8, + GDK_KEY_I, GDK_KEY_grave, 0, 0, 0, 0xcc, + GDK_KEY_I, GDK_KEY_asciitilde, 0, 0, 0, 0x128, + GDK_KEY_O, 0, 0, 0, 0, 'O', + GDK_KEY_O, GDK_KEY_apostrophe, 0, 0, 0, 0xD3, + GDK_KEY_O, GDK_KEY_plus, 0, 0, 0, 0x1a0, + GDK_KEY_O, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1eda, + GDK_KEY_O, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ee2, + GDK_KEY_O, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1ede, + GDK_KEY_O, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1edc, + GDK_KEY_O, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1ee0, + GDK_KEY_O, GDK_KEY_period, 0, 0, 0, 0x1ecc, + GDK_KEY_O, GDK_KEY_question, 0, 0, 0, 0x1ece, + GDK_KEY_O, GDK_KEY_asciicircum, 0, 0, 0, 0xd4, + GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ed0, + GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ed8, + GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ed4, + GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ed2, + GDK_KEY_O, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ed6, + GDK_KEY_O, GDK_KEY_grave, 0, 0, 0, 0xD2, + GDK_KEY_O, GDK_KEY_asciitilde, 0, 0, 0, 0xD5, + GDK_KEY_U, 0, 0, 0, 0, 'U', + GDK_KEY_U, GDK_KEY_apostrophe, 0, 0, 0, 0xDA, + GDK_KEY_U, GDK_KEY_plus, 0, 0, 0, 0x1af, + GDK_KEY_U, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1ee8, + GDK_KEY_U, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ef0, + GDK_KEY_U, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1eec, + GDK_KEY_U, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1eea, + GDK_KEY_U, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1eee, + GDK_KEY_U, GDK_KEY_period, 0, 0, 0, 0x1ee4, + GDK_KEY_U, GDK_KEY_question, 0, 0, 0, 0x1ee6, + GDK_KEY_U, GDK_KEY_grave, 0, 0, 0, 0xd9, + GDK_KEY_U, GDK_KEY_asciitilde, 0, 0, 0, 0x168, + GDK_KEY_Y, 0, 0, 0, 0, 'Y', + GDK_KEY_Y, GDK_KEY_apostrophe, 0, 0, 0, 0xdd, + GDK_KEY_Y, GDK_KEY_period, 0, 0, 0, 0x1ef4, + GDK_KEY_Y, GDK_KEY_question, 0, 0, 0, 0x1ef6, + GDK_KEY_Y, GDK_KEY_grave, 0, 0, 0, 0x1ef2, + GDK_KEY_Y, GDK_KEY_asciitilde, 0, 0, 0, 0x1ef8, /* Do we need anything else here? */ - GDK_backslash, 0, 0, 0, 0, 0, - GDK_backslash, GDK_apostrophe, 0, 0, 0, '\'', - GDK_backslash, GDK_parenleft, 0, 0, 0, '(', - GDK_backslash, GDK_plus, 0, 0, 0, '+', - GDK_backslash, GDK_period, 0, 0, 0, '.', - GDK_backslash, GDK_question, 0, 0, 0, '?', - GDK_backslash, GDK_D, 0, 0, 0, 'D', - GDK_backslash, GDK_backslash, 0, 0, 0, '\\', - GDK_backslash, GDK_asciicircum, 0, 0, 0, '^', - GDK_backslash, GDK_grave, 0, 0, 0, '`', - GDK_backslash, GDK_d, 0, 0, 0, 'd', - GDK_backslash, GDK_asciitilde, 0, 0, 0, '~', - GDK_a, 0, 0, 0, 0, 'a', - GDK_a, GDK_apostrophe, 0, 0, 0, 0xe1, - GDK_a, GDK_parenleft, 0, 0, 0, 0x103, - GDK_a, GDK_parenleft, GDK_apostrophe, 0, 0, 0x1eaf, - GDK_a, GDK_parenleft, GDK_period, 0, 0, 0x1eb7, - GDK_a, GDK_parenleft, GDK_question, 0, 0, 0x1eb3, - GDK_a, GDK_parenleft, GDK_grave, 0, 0, 0x1eb1, - GDK_a, GDK_parenleft, GDK_asciitilde, 0, 0, 0x1eb5, - GDK_a, GDK_period, 0, 0, 0, 0x1ea1, - GDK_a, GDK_question, 0, 0, 0, 0x1ea3, - GDK_a, GDK_asciicircum, 0, 0, 0, 0xe2, - GDK_a, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ea5, - GDK_a, GDK_asciicircum, GDK_period, 0, 0, 0x1ead, - GDK_a, GDK_asciicircum, GDK_question, 0, 0, 0x1ea9, - GDK_a, GDK_asciicircum, GDK_grave, 0, 0, 0x1ea7, - GDK_a, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1eab, - GDK_a, GDK_grave, 0, 0, 0, 0xe0, - GDK_a, GDK_asciitilde, 0, 0, 0, 0xe3, - GDK_d, 0, 0, 0, 0, 'd', - GDK_d, GDK_d, 0, 0, 0, 0x111, - GDK_e, 0, 0, 0, 0, 'e', - GDK_e, GDK_apostrophe, 0, 0, 0, 0xe9, - GDK_e, GDK_period, 0, 0, 0, 0x1eb9, - GDK_e, GDK_question, 0, 0, 0, 0x1ebb, - GDK_e, GDK_asciicircum, 0, 0, 0, 0xea, - GDK_e, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ebf, - GDK_e, GDK_asciicircum, GDK_period, 0, 0, 0x1ec7, - GDK_e, GDK_asciicircum, GDK_question, 0, 0, 0x1ec3, - GDK_e, GDK_asciicircum, GDK_grave, 0, 0, 0x1ec1, - GDK_e, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ec5, - GDK_e, GDK_grave, 0, 0, 0, 0xe8, - GDK_e, GDK_asciitilde, 0, 0, 0, 0x1ebd, - GDK_i, 0, 0, 0, 0, 'i', - GDK_i, GDK_apostrophe, 0, 0, 0, 0xed, - GDK_i, GDK_period, 0, 0, 0, 0x1ecb, - GDK_i, GDK_question, 0, 0, 0, 0x1ec9, - GDK_i, GDK_grave, 0, 0, 0, 0xec, - GDK_i, GDK_asciitilde, 0, 0, 0, 0x129, - GDK_o, 0, 0, 0, 0, 'o', - GDK_o, GDK_apostrophe, 0, 0, 0, 0xF3, - GDK_o, GDK_plus, 0, 0, 0, 0x1a1, - GDK_o, GDK_plus, GDK_apostrophe, 0, 0, 0x1edb, - GDK_o, GDK_plus, GDK_period, 0, 0, 0x1ee3, - GDK_o, GDK_plus, GDK_question, 0, 0, 0x1edf, - GDK_o, GDK_plus, GDK_grave, 0, 0, 0x1edd, - GDK_o, GDK_plus, GDK_asciitilde, 0, 0, 0x1ee1, - GDK_o, GDK_period, 0, 0, 0, 0x1ecd, - GDK_o, GDK_question, 0, 0, 0, 0x1ecf, - GDK_o, GDK_asciicircum, 0, 0, 0, 0xf4, - GDK_o, GDK_asciicircum, GDK_apostrophe, 0, 0, 0x1ed1, - GDK_o, GDK_asciicircum, GDK_period, 0, 0, 0x1ed9, - GDK_o, GDK_asciicircum, GDK_question, 0, 0, 0x1ed5, - GDK_o, GDK_asciicircum, GDK_grave, 0, 0, 0x1ed3, - GDK_o, GDK_asciicircum, GDK_asciitilde, 0, 0, 0x1ed7, - GDK_o, GDK_grave, 0, 0, 0, 0xF2, - GDK_o, GDK_asciitilde, 0, 0, 0, 0xF5, - GDK_u, 0, 0, 0, 0, 'u', - GDK_u, GDK_apostrophe, 0, 0, 0, 0xFA, - GDK_u, GDK_plus, 0, 0, 0, 0x1b0, - GDK_u, GDK_plus, GDK_apostrophe, 0, 0, 0x1ee9, - GDK_u, GDK_plus, GDK_period, 0, 0, 0x1ef1, - GDK_u, GDK_plus, GDK_question, 0, 0, 0x1eed, - GDK_u, GDK_plus, GDK_grave, 0, 0, 0x1eeb, - GDK_u, GDK_plus, GDK_asciitilde, 0, 0, 0x1eef, - GDK_u, GDK_period, 0, 0, 0, 0x1ee5, - GDK_u, GDK_question, 0, 0, 0, 0x1ee7, - GDK_u, GDK_grave, 0, 0, 0, 0xf9, - GDK_u, GDK_asciitilde, 0, 0, 0, 0x169, - GDK_y, 0, 0, 0, 0, 'y', - GDK_y, GDK_apostrophe, 0, 0, 0, 0xfd, - GDK_y, GDK_period, 0, 0, 0, 0x1ef5, - GDK_y, GDK_question, 0, 0, 0, 0x1ef7, - GDK_y, GDK_grave, 0, 0, 0, 0x1ef3, - GDK_y, GDK_asciitilde, 0, 0, 0, 0x1ef9, + GDK_KEY_backslash, 0, 0, 0, 0, 0, + GDK_KEY_backslash, GDK_KEY_apostrophe, 0, 0, 0, '\'', + GDK_KEY_backslash, GDK_KEY_parenleft, 0, 0, 0, '(', + GDK_KEY_backslash, GDK_KEY_plus, 0, 0, 0, '+', + GDK_KEY_backslash, GDK_KEY_period, 0, 0, 0, '.', + GDK_KEY_backslash, GDK_KEY_question, 0, 0, 0, '?', + GDK_KEY_backslash, GDK_KEY_D, 0, 0, 0, 'D', + GDK_KEY_backslash, GDK_KEY_backslash, 0, 0, 0, '\\', + GDK_KEY_backslash, GDK_KEY_asciicircum, 0, 0, 0, '^', + GDK_KEY_backslash, GDK_KEY_grave, 0, 0, 0, '`', + GDK_KEY_backslash, GDK_KEY_d, 0, 0, 0, 'd', + GDK_KEY_backslash, GDK_KEY_asciitilde, 0, 0, 0, '~', + GDK_KEY_a, 0, 0, 0, 0, 'a', + GDK_KEY_a, GDK_KEY_apostrophe, 0, 0, 0, 0xe1, + GDK_KEY_a, GDK_KEY_parenleft, 0, 0, 0, 0x103, + GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_apostrophe, 0, 0, 0x1eaf, + GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_period, 0, 0, 0x1eb7, + GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_question, 0, 0, 0x1eb3, + GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_grave, 0, 0, 0x1eb1, + GDK_KEY_a, GDK_KEY_parenleft, GDK_KEY_asciitilde, 0, 0, 0x1eb5, + GDK_KEY_a, GDK_KEY_period, 0, 0, 0, 0x1ea1, + GDK_KEY_a, GDK_KEY_question, 0, 0, 0, 0x1ea3, + GDK_KEY_a, GDK_KEY_asciicircum, 0, 0, 0, 0xe2, + GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ea5, + GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ead, + GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ea9, + GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ea7, + GDK_KEY_a, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1eab, + GDK_KEY_a, GDK_KEY_grave, 0, 0, 0, 0xe0, + GDK_KEY_a, GDK_KEY_asciitilde, 0, 0, 0, 0xe3, + GDK_KEY_d, 0, 0, 0, 0, 'd', + GDK_KEY_d, GDK_KEY_d, 0, 0, 0, 0x111, + GDK_KEY_e, 0, 0, 0, 0, 'e', + GDK_KEY_e, GDK_KEY_apostrophe, 0, 0, 0, 0xe9, + GDK_KEY_e, GDK_KEY_period, 0, 0, 0, 0x1eb9, + GDK_KEY_e, GDK_KEY_question, 0, 0, 0, 0x1ebb, + GDK_KEY_e, GDK_KEY_asciicircum, 0, 0, 0, 0xea, + GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ebf, + GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ec7, + GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ec3, + GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ec1, + GDK_KEY_e, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ec5, + GDK_KEY_e, GDK_KEY_grave, 0, 0, 0, 0xe8, + GDK_KEY_e, GDK_KEY_asciitilde, 0, 0, 0, 0x1ebd, + GDK_KEY_i, 0, 0, 0, 0, 'i', + GDK_KEY_i, GDK_KEY_apostrophe, 0, 0, 0, 0xed, + GDK_KEY_i, GDK_KEY_period, 0, 0, 0, 0x1ecb, + GDK_KEY_i, GDK_KEY_question, 0, 0, 0, 0x1ec9, + GDK_KEY_i, GDK_KEY_grave, 0, 0, 0, 0xec, + GDK_KEY_i, GDK_KEY_asciitilde, 0, 0, 0, 0x129, + GDK_KEY_o, 0, 0, 0, 0, 'o', + GDK_KEY_o, GDK_KEY_apostrophe, 0, 0, 0, 0xF3, + GDK_KEY_o, GDK_KEY_plus, 0, 0, 0, 0x1a1, + GDK_KEY_o, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1edb, + GDK_KEY_o, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ee3, + GDK_KEY_o, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1edf, + GDK_KEY_o, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1edd, + GDK_KEY_o, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1ee1, + GDK_KEY_o, GDK_KEY_period, 0, 0, 0, 0x1ecd, + GDK_KEY_o, GDK_KEY_question, 0, 0, 0, 0x1ecf, + GDK_KEY_o, GDK_KEY_asciicircum, 0, 0, 0, 0xf4, + GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_apostrophe, 0, 0, 0x1ed1, + GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_period, 0, 0, 0x1ed9, + GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_question, 0, 0, 0x1ed5, + GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_grave, 0, 0, 0x1ed3, + GDK_KEY_o, GDK_KEY_asciicircum, GDK_KEY_asciitilde, 0, 0, 0x1ed7, + GDK_KEY_o, GDK_KEY_grave, 0, 0, 0, 0xF2, + GDK_KEY_o, GDK_KEY_asciitilde, 0, 0, 0, 0xF5, + GDK_KEY_u, 0, 0, 0, 0, 'u', + GDK_KEY_u, GDK_KEY_apostrophe, 0, 0, 0, 0xFA, + GDK_KEY_u, GDK_KEY_plus, 0, 0, 0, 0x1b0, + GDK_KEY_u, GDK_KEY_plus, GDK_KEY_apostrophe, 0, 0, 0x1ee9, + GDK_KEY_u, GDK_KEY_plus, GDK_KEY_period, 0, 0, 0x1ef1, + GDK_KEY_u, GDK_KEY_plus, GDK_KEY_question, 0, 0, 0x1eed, + GDK_KEY_u, GDK_KEY_plus, GDK_KEY_grave, 0, 0, 0x1eeb, + GDK_KEY_u, GDK_KEY_plus, GDK_KEY_asciitilde, 0, 0, 0x1eef, + GDK_KEY_u, GDK_KEY_period, 0, 0, 0, 0x1ee5, + GDK_KEY_u, GDK_KEY_question, 0, 0, 0, 0x1ee7, + GDK_KEY_u, GDK_KEY_grave, 0, 0, 0, 0xf9, + GDK_KEY_u, GDK_KEY_asciitilde, 0, 0, 0, 0x169, + GDK_KEY_y, 0, 0, 0, 0, 'y', + GDK_KEY_y, GDK_KEY_apostrophe, 0, 0, 0, 0xfd, + GDK_KEY_y, GDK_KEY_period, 0, 0, 0, 0x1ef5, + GDK_KEY_y, GDK_KEY_question, 0, 0, 0, 0x1ef7, + GDK_KEY_y, GDK_KEY_grave, 0, 0, 0, 0x1ef3, + GDK_KEY_y, GDK_KEY_asciitilde, 0, 0, 0, 0x1ef9, }; static void |