Commit a3fe4076 authored by Simos Xenitellis's avatar Simos Xenitellis
Browse files

Fixed Bug 555000, check_algorithmically() applies to deadkey keysyms only.

svn path=/trunk/; revision=21623
parent 7bd7a266
2008-10-10 Simos Xenitellis <simos@gnome.org>
Bug 555000 – Wrong treatment on non-spacing marks dead keys in
GtkIMContextSimple
* gtk/gtkimcontextsimple.c: Change IS_DEY() macro so that
it on checksf input is a deadkey keysym.
2008-10-09 Christian Dywan <christian@imendio.com> 2008-10-09 Christian Dywan <christian@imendio.com>
Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window
......
...@@ -410,16 +410,12 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose) ...@@ -410,16 +410,12 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
/* Checks if a keysym is a dead key. Dead key keysym values are defined in /* 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, * ../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. * 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, * Currently, the upper limit is GDK_dead_dasia+1. The +1 has to do with
* by invoking gdk_keyval_to_unicode(). For keysyms like 0x1000000 + 0x0301, * a temporary issue in the X.Org header files.
* it converts them to 0x301, which makes g_unichar_type() report them as * In future versions it will be just the keysym (no +1).
* 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) \ #define IS_DEAD_KEY(k) \
(((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1)) || \ ((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1))
((g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) && \
((k) < 0x1000000)))
static gboolean static gboolean
check_algorithmically (GtkIMContextSimple *context_simple, check_algorithmically (GtkIMContextSimple *context_simple,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment