diff options
| author | Michael Natterer <mitch@lanedo.com> | 2011-09-28 13:48:52 +0200 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2011-09-28 13:48:52 +0200 |
| commit | 0a13deae8890bfbfc2caaaab911ef640f589cf6a (patch) | |
| tree | 437c588c2d58a969d1e0c044d7eed70e680b187c /gdk/quartz/gdkkeys-quartz.c | |
| parent | 32bb9eebaacf90a63d6d66d798e4ebed3bdd7053 (diff) | |
| download | gtk+-0a13deae8890bfbfc2caaaab911ef640f589cf6a.tar.gz | |
quartz: don't filter away directly encoded 24-bit UCS characters
gdk_unicode_to_keyval(uc) returning (uc | 0x01000000) is not an
error return value but simply the way to encode 24-bit unicode
characters directly as keyvals.
Diffstat (limited to 'gdk/quartz/gdkkeys-quartz.c')
| -rw-r--r-- | gdk/quartz/gdkkeys-quartz.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c index 2b9307f868..bb877361c3 100644 --- a/gdk/quartz/gdkkeys-quartz.c +++ b/gdk/quartz/gdkkeys-quartz.c @@ -359,18 +359,10 @@ maybe_update_keymap (void) p[j] = GDK_KEY_ISO_Left_Tab; if (!found) - { - guint tmp; - - tmp = gdk_unicode_to_keyval (uc); - if (tmp != (uc | 0x01000000)) - p[j] = tmp; - else - p[j] = 0; - } + p[j] = gdk_unicode_to_keyval (uc); } } - + if (p[3] == p[2]) p[3] = 0; if (p[2] == p[1]) @@ -453,20 +445,12 @@ maybe_update_keymap (void) */ if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey) p[j] = GDK_KEY_ISO_Left_Tab; - + if (!found) - { - guint tmp; - - tmp = gdk_unicode_to_keyval (uc); - if (tmp != (uc | 0x01000000)) - p[j] = tmp; - else - p[j] = 0; - } + p[j] = gdk_unicode_to_keyval (uc); } } - + if (p[3] == p[2]) p[3] = 0; if (p[2] == p[1]) |