]> Pileus Git - ~andy/gtk/commitdiff
quartz: don't filter away directly encoded 24-bit UCS characters
authorMichael Natterer <mitch@lanedo.com>
Wed, 28 Sep 2011 11:48:52 +0000 (13:48 +0200)
committerMichael Natterer <mitch@gimp.org>
Wed, 28 Sep 2011 11:48:52 +0000 (13:48 +0200)
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.

gdk/quartz/gdkkeys-quartz.c

index 2b9307f86834ff0f57a824ff733d0a70ca15658e..bb877361c3a573ed6971da64751d8e2d1a93a744 100644 (file)
@@ -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])