GDK: Prefix key names with KEY_

[~andy/gtk] / gdk / x11 / gdkkeys-x11.c

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 784e0ff5c9fe6fe7bd83aa16ee43bf4ebb8a0fb7..e0a74143176845754469a37bc8467898dffd1d34 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -40,7 +40,6 @@
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 #include "gdkkeysyms.h"
-#include "gdkalias.h"
 
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
@@ -86,6 +85,7 @@ struct _GdkKeymapX11
   guint sun_keypad      : 1;
   guint have_direction  : 1;
   guint caps_lock_state : 1;
+  guint num_lock_state : 1;
   guint current_serial;
 
 #ifdef HAVE_XKB
@@ -163,7 +163,7 @@ gdk_keymap_x11_init (GdkKeymapX11 *keymap)
   keymap->num_lock_mask = 0;
   keymap->sun_keypad = FALSE;
   keymap->group_switch_mask = 0;
-  keymap->lock_keysym = GDK_Caps_Lock;
+  keymap->lock_keysym = GDK_KEY_Caps_Lock;
   keymap->have_direction = FALSE;
   keymap->current_serial = 0;
 
@@ -276,6 +276,9 @@ get_xkb (GdkKeymapX11 *keymap_x11)
 
   keymap_x11->current_serial = display_x11->keymap_serial;
 
+  if (keymap_x11->num_lock_mask == 0)
+    keymap_x11->num_lock_mask = XkbKeysymToModifiers (KEYMAP_XDISPLAY (GDK_KEYMAP (keymap_x11)), XK_Num_Lock);
+
   return keymap_x11->xkb_desc;
 }
 #endif /* HAVE_XKB */
@@ -393,8 +396,8 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
          /* Check both groups */
          for (i = 0 ; i < 2 ; i++)
            {
-             if (get_symbol (syms, keymap_x11, i, 0) == GDK_Tab)
-               set_symbol (syms, keymap_x11, i, 1, GDK_ISO_Left_Tab);
+             if (get_symbol (syms, keymap_x11, i, 0) == GDK_KEY_Tab)
+               set_symbol (syms, keymap_x11, i, 1, GDK_KEY_ISO_Left_Tab);
            }
 
           /*
@@ -420,7 +423,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
 
       keymap_x11->mod_keymap = XGetModifierMapping (xdisplay);
 
-      keymap_x11->lock_keysym = GDK_VoidSymbol;
+      keymap_x11->lock_keysym = GDK_KEY_VoidSymbol;
       keymap_x11->group_switch_mask = 0;
       keymap_x11->num_lock_mask = 0;
 
@@ -449,14 +452,14 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
          mask = 0;
          for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
            {
-             if (syms[j] == GDK_Meta_L ||
-                 syms[j] == GDK_Meta_R)
+             if (syms[j] == GDK_KEY_Meta_L ||
+                 syms[j] == GDK_KEY_Meta_R)
                mask |= GDK_META_MASK;
-             else if (syms[j] == GDK_Hyper_L ||
-                      syms[j] == GDK_Hyper_R)
+             else if (syms[j] == GDK_KEY_Hyper_L ||
+                      syms[j] == GDK_KEY_Hyper_R)
                mask |= GDK_HYPER_MASK;
-             else if (syms[j] == GDK_Super_L ||
-                      syms[j] == GDK_Super_R)
+             else if (syms[j] == GDK_KEY_Super_L ||
+                      syms[j] == GDK_KEY_Super_R)
                mask |= GDK_SUPER_MASK;
            }
 
@@ -478,11 +481,11 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
                */
              for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
                {
-                 if (syms[j] == GDK_Caps_Lock)
-                   keymap_x11->lock_keysym = GDK_Caps_Lock;
-                 else if (syms[j] == GDK_Shift_Lock &&
-                          keymap_x11->lock_keysym == GDK_VoidSymbol)
-                   keymap_x11->lock_keysym = GDK_Shift_Lock;
+                 if (syms[j] == GDK_KEY_Caps_Lock)
+                   keymap_x11->lock_keysym = GDK_KEY_Caps_Lock;
+                 else if (syms[j] == GDK_KEY_Shift_Lock &&
+                          keymap_x11->lock_keysym == GDK_KEY_VoidSymbol)
+                   keymap_x11->lock_keysym = GDK_KEY_Shift_Lock;
                }
               break;
 
@@ -499,12 +502,12 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
               /* Find the Mode_Switch and Num_Lock modifiers. */
               for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
                 {
-                  if (syms[j] == GDK_Mode_switch)
+                  if (syms[j] == GDK_KEY_Mode_switch)
                     {
                       /* This modifier swaps groups */
                       keymap_x11->group_switch_mask |= mask;
                     }
-                  else if (syms[j] == GDK_Num_Lock)
+                  else if (syms[j] == GDK_KEY_Num_Lock)
                     {
                       /* This modifier is used for Num_Lock */
                       keymap_x11->num_lock_mask |= mask;
@@ -687,12 +690,16 @@ update_lock_state (GdkKeymapX11 *keymap_x11,
                    gint          locked_mods)
 {
   gboolean caps_lock_state;
-  
+  gboolean num_lock_state;
+
   caps_lock_state = keymap_x11->caps_lock_state;
+  num_lock_state = keymap_x11->num_lock_state;
 
   keymap_x11->caps_lock_state = (locked_mods & GDK_LOCK_MASK) != 0;
-  
-  return caps_lock_state != keymap_x11->caps_lock_state;
+  keymap_x11->num_lock_state = (locked_mods & keymap_x11->num_lock_mask) != 0;
+
+  return (caps_lock_state != keymap_x11->caps_lock_state)
+    || (num_lock_state != keymap_x11->num_lock_state);
 }
 
 /* keep this in sync with the XkbSelectEventDetails() call 
@@ -713,7 +720,7 @@ _gdk_keymap_state_changed (GdkDisplay *display,
        g_signal_emit_by_name (keymap_x11, "direction-changed");      
 
       if (update_lock_state (keymap_x11, xkb_event->state.locked_mods))
-       g_signal_emit_by_name (keymap_x11, "state-changed");      
+        g_signal_emit_by_name (keymap_x11, "state-changed");
     }
 }
 
@@ -831,6 +838,27 @@ gdk_keymap_get_caps_lock_state (GdkKeymap *keymap)
   return keymap_x11->caps_lock_state;
 }
 
+/**
+ * gdk_keymap_get_num_lock_state:
+ * @keymap: a #GdkKeymap
+ *
+ * Returns whether the Num Lock modifer is locked.
+ *
+ * Returns: %TRUE if Num Lock is on
+ *
+ * Since: 3.0
+ */
+gboolean
+gdk_keymap_get_num_lock_state (GdkKeymap *keymap)
+{
+  GdkKeymapX11 *keymap_x11;
+
+  keymap = GET_EFFECTIVE_KEYMAP (keymap);
+
+  keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+  return keymap_x11->num_lock_state;
+}
 
 /**
  * gdk_keymap_get_entries_for_keyval:
@@ -1338,7 +1366,7 @@ translate_keysym (GdkKeymapX11   *keymap_x11,
   gint num_lock_index;
 
   shift_modifiers = GDK_SHIFT_MASK;
-  if (keymap_x11->lock_keysym == GDK_Shift_Lock)
+  if (keymap_x11->lock_keysym == GDK_KEY_Shift_Lock)
     shift_modifiers |= GDK_LOCK_MASK;
 
   /* Fall back to the first group if the passed in group is empty
@@ -1388,7 +1416,7 @@ translate_keysym (GdkKeymapX11   *keymap_x11,
   
       tmp_keyval = SYM (keymap_x11, group, shift_level);
       
-      if (keymap_x11->lock_keysym == GDK_Caps_Lock && (state & GDK_LOCK_MASK) != 0)
+      if (keymap_x11->lock_keysym == GDK_KEY_Caps_Lock && (state & GDK_LOCK_MASK) != 0)
        {
          guint upper = gdk_keyval_to_upper (tmp_keyval);
          if (upper != tmp_keyval)
@@ -1586,13 +1614,13 @@ gdk_keyval_name (guint        keyval)
 {
   switch (keyval)
     {
-    case GDK_Page_Up:
+    case GDK_KEY_Page_Up:
       return "Page_Up";
-    case GDK_Page_Down:
+    case GDK_KEY_Page_Down:
       return "Page_Down";
-    case GDK_KP_Page_Up:
+    case GDK_KEY_KP_Page_Up:
       return "KP_Page_Up";
-    case GDK_KP_Page_Down:
+    case GDK_KEY_KP_Page_Down:
       return "KP_Page_Down";
     }
   
@@ -1795,6 +1823,9 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
   keymap = GET_EFFECTIVE_KEYMAP (keymap);
   keymap_x11 = GDK_KEYMAP_X11 (keymap);
 
+  if (KEYMAP_USE_XKB (keymap))
+    get_xkb (keymap_x11);
+
   retval = TRUE;
 
   for (j = 0; j < 3; j++)
@@ -1816,7 +1847,3 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
 
   return retval;
 }
-
-
-#define __GDK_KEYS_X11_C__
-#include "gdkaliasdef.c"