X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=blobdiff_plain;f=openbox%2Factions%2Fdesktop.c;h=70d807dbc6699172994abb8a1c4b7707b78febf2;hp=a3a1f6b9c121b00f6158a5ef42d14a1fb6681d7f;hb=ad5b92588fbe36100cdc4ae7064883cd16e13a1e;hpb=58f666a2a5111a16cbb1b416852e90c4c79f6671

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index a3a1f6b..70d807d 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -319,8 +319,9 @@ static gboolean i_input_func(guint initial_state,
                              gpointer options,
                              gboolean *used)
 {
-    guint mods;
+    guint mods, initial_mods;
 
+    initial_mods = obt_keyboard_only_modmasks(initial_state);
     mods = obt_keyboard_only_modmasks(e->xkey.state);
     if (e->type == KeyRelease) {
         /* remove from the state the mask of the modifier key being
@@ -336,11 +337,11 @@ static gboolean i_input_func(guint initial_state,
             return FALSE;
 
         /* There were no modifiers and they pressed enter */
-        else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_state)
+        else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_mods)
             return FALSE;
     }
     /* They released the modifiers */
-    else if (e->type == KeyRelease && initial_state && !(mods & initial_state))
+    else if (e->type == KeyRelease && initial_mods && !(mods & initial_mods))
     {
         return FALSE;
     }
@@ -350,7 +351,8 @@ static gboolean i_input_func(guint initial_state,
 
 static gboolean i_pre_func(guint initial_state, gpointer options)
 {
-    if (!initial_state) {
+    guint initial_mods = obt_keyboard_only_modmasks(initial_state);
+    if (!inital_mods) {
         Options *o = options;
         o->interactive = FALSE;
         return FALSE;