one more file

3 files changed, 41 insertions, 41 deletions

diff --git a/libxklavier/xklavier_private_xmm.h b/libxklavier/xklavier_private_xmm.h
index ea929bb..e3408cf 100644
--- a/libxklavier/xklavier_private_xmm.h
+++ b/libxklavier/xklavier_private_xmm.h
@@ -3,7 +3,7 @@
 
 typedef struct _XmmShortcut 
 {
-  gint keysym;
+  guint keysym;
   guint modifiers;
 } XmmShortcut;
 
diff --git a/libxklavier/xklavier_xmm.c b/libxklavier/xklavier_xmm.c
index 650a684..79215ff 100755
--- a/libxklavier/xklavier_xmm.c
+++ b/libxklavier/xklavier_xmm.c
@@ -36,7 +36,7 @@ void xkl_xmm_shortcuts_grab( void )
     return;
   
   shortcut = option->shortcuts;
-  while (shortcut->keysym != -1)
+  while (shortcut->keysym != XK_VoidSymbol)
   {
     int keycode = XKeysymToKeycode( xkl_display, shortcut->keysym );
     xkl_xmm_grab_ignoring_indicators( keycode, 
@@ -54,7 +54,7 @@ void xkl_xmm_ungrab_shortcuts( void )
     return;
   
   shortcut = option->shortcuts;
-  while (shortcut->keysym != -1)
+  while (shortcut->keysym != XK_VoidSymbol)
   {
     int keycode = XKeysymToKeycode( xkl_display, shortcut->keysym );
     xkl_xmm_ungrab_ignoring_indicators( keycode, 
@@ -102,7 +102,7 @@ const XmmSwitchOption *xkl_xmm_switch_option_find( gint keycode,
   if( rv != NULL )
   {
     XmmShortcut *sc = rv->shortcuts;
-    while (sc->keysym != -1)
+    while (sc->keysym != XK_VoidSymbol)
     {
       if( ( XKeysymToKeycode( xkl_display, sc->keysym ) == keycode ) &&
           ( ( state & sc->modifiers ) == sc->modifiers ) )
diff --git a/libxklavier/xklavier_xmm_opts.c b/libxklavier/xklavier_xmm_opts.c
index d082482..e96a757 100644
--- a/libxklavier/xklavier_xmm_opts.c
+++ b/libxklavier/xklavier_xmm_opts.c
@@ -15,90 +15,90 @@
 
 #define SHORTCUT_OPTION_PREFIX "grp:"
 
-XmmSwitchOption allSwitchOptions[] = 
+XmmSwitchOption all_switch_options[] = 
 {
   {
-    "ralt_toggle", 1,
-    { { XK_Alt_R, 0 } }, { 1 }
+    "ralt_toggle",
+    { { XK_Alt_R, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "lalt_toggle", 1,
-    { { XK_Alt_L, 0 } }, { 1 }
+    "lalt_toggle",
+    { { XK_Alt_L, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "caps_toggle", 1,
-    { { XK_Caps_Lock, 0 } }, { 1 }
+    "caps_toggle",
+    { { XK_Caps_Lock, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "shift_caps_toggle", 1,
-    { { XK_Caps_Lock, ShiftMask } }, { 1 }
+    "shift_caps_toggle",
+    { { XK_Caps_Lock, ShiftMask }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "shifts_toggle", 2,
+    "shifts_toggle",
     { { XK_Shift_R, ShiftMask },
-      { XK_Shift_L, ShiftMask } }, { 1, -1 }
+      { XK_Shift_L, ShiftMask }, { XK_VoidSymbol } }, { 1, -1 }
   },
   {
-    "alts_toggle", 2, 
+    "alts_toggle",
     { { XK_Alt_R, Mod1Mask },
-      { XK_Alt_L, Mod1Mask } }, { 1, -1 }
+      { XK_Alt_L, Mod1Mask }, { XK_VoidSymbol } }, { 1, -1 }
   },
   {
-    "ctrls_toggle", 2, 
+    "ctrls_toggle",
     { { XK_Control_R, ControlMask },
-      { XK_Control_L, ControlMask } }, { 1, -1 }
+      { XK_Control_L, ControlMask }, { XK_VoidSymbol } }, { 1, -1 }
   },
   {
-    "ctrl_shift_toggle", 4, 
+    "ctrl_shift_toggle",
     { { XK_Control_R, ShiftMask },
       { XK_Control_L, ShiftMask },
       { XK_Shift_R, ControlMask },
-      { XK_Shift_L, ControlMask } }, { 1, -1, 1, -1 }
+      { XK_Shift_L, ControlMask }, { XK_VoidSymbol } }, { 1, -1, 1, -1 }
   },
   {
-    "ctrl_alt_toggle", 4, 
+    "ctrl_alt_toggle",
     { { XK_Control_R, Mod1Mask }, 
       { XK_Control_L, Mod1Mask },
       { XK_Alt_R, ControlMask },
-      { XK_Alt_L, ControlMask } }, { 1, -1, 1, -1 }
+      { XK_Alt_L, ControlMask }, { XK_VoidSymbol } }, { 1, -1, 1, -1 }
   },
   {
-    "alt_shift_toggle", 4, 
+    "alt_shift_toggle",
     { { XK_Shift_R, Mod1Mask }, 
       { XK_Shift_L, Mod1Mask },
       { XK_Alt_R, ShiftMask },
-      { XK_Alt_L, ShiftMask } }, { 1, -1, 1, -1 }
+      { XK_Alt_L, ShiftMask }, { XK_VoidSymbol } }, { 1, -1, 1, -1 }
   },
   {
-    "menu_toggle", 1, 
-    { { XK_Menu, 0 } }, { 1 }
+    "menu_toggle",
+    { { XK_Menu, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "lwin_toggle", 1, 
-    { { XK_Super_L, 0 } }, { 1 }
+    "lwin_toggle",
+    { { XK_Super_L, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "rwin_toggle", 1, 
-    { { XK_Super_R, 0 } }, { 1 }
+    "rwin_toggle",
+    { { XK_Super_R, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "lshift_toggle", 1, 
-    { { XK_Shift_L, 0 } }, { 1 }
+    "lshift_toggle",
+    { { XK_Shift_L, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "rshift_toggle", 1, 
-    { { XK_Shift_R, 0 } }, { 1 }
+    "rshift_toggle",
+    { { XK_Shift_R, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "lctrl_toggle", 1, 
-    { { XK_Control_L, 0 } }, { 1 }
+    "lctrl_toggle",
+    { { XK_Control_L, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    "rctrl_toggle", 1, 
-    { { XK_Control_R, 0 } }, { 1 }
+    "rctrl_toggle",
+    { { XK_Control_R, 0 }, { XK_VoidSymbol } }, { 1 }
   },
   {
-    NULL, 1,
-    { { 0, 0 } }, { 1 }
+    NULL,
+    { { 0, 0 }, { XK_VoidSymbol } }, { 1 }
   }
 };