diff options
author | Simos Xenitellis <simos@src.gnome.org> | 2008-10-01 10:53:51 +0000 |
---|---|---|
committer | Simos Xenitellis <simos@src.gnome.org> | 2008-10-01 10:53:51 +0000 |
commit | 7d7dfa73a4f9a64535dfb4daeccc7e3818c42196 (patch) | |
tree | 6cee58031c59921a567ac47d1a8aabe43a9d2bd3 /gtk/gtkimcontextsimple.c | |
parent | 669baea0fff2fddb62338144ec7bb7564b967159 (diff) | |
download | gtk+-7d7dfa73a4f9a64535dfb4daeccc7e3818c42196.tar.gz |
Fixed Bug 554506 – combining diacritics broken, became deadkeys
svn path=/trunk/; revision=21557
Diffstat (limited to 'gtk/gtkimcontextsimple.c')
-rw-r--r-- | gtk/gtkimcontextsimple.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 459bdd7ea7..a9eeb944ba 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -407,11 +407,19 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose) return FALSE; } -/* When updating the table of the compose sequences, also update here. +/* Checks if a keysym is a dead key. Dead key keysym values are defined in + * ../gdk/gdkkeysyms.h and the first is GDK_dead_grave. As X.Org is updated, + * more dead keys are added and we need to update the upper limit. + * Also checks if the keysym belongs to the non-spacing mark Unicode category, + * by invoking gdk_keyval_to_unicode(). For keysyms like 0x1000000 + 0x0301, + * it converts them to 0x301, which makes g_unichar_type() report them as + * non-spacing mark. Thus, we check that the value is less then 0x1000000. + * check_algorithmically() does not handle keysyms > 0x1000000. */ #define IS_DEAD_KEY(k) \ (((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1)) || \ - g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) + ((g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) && \ + ((k) < 0x1000000))) static gboolean check_algorithmically (GtkIMContextSimple *context_simple, |