X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyparse.c;h=b3c00f7e99f52870d6c8988b33c439c69b083b36;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=ba283dd81d0d03e6102a09700e9f4327c54f51d6;hpb=038e61197479865d15cb6ef686e80e47bf2fd843;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyparse.c b/plugins/keyboard/keyparse.c
index ba283dd8..b3c00f7e 100644
--- a/plugins/keyboard/keyparse.c
+++ b/plugins/keyboard/keyparse.c
@@ -1,4 +1,5 @@
 #include "kernel/parse.h"
+#include "kernel/prop.h"
 #include "keyboard.h"
 
 void keyparse(ParseToken *token)
@@ -44,9 +45,11 @@ void keyparse(ParseToken *token)
             action = action_from_string(token->data.identifier);
 
             /* no move/resize with the keyboard */
-            if (action &&
-                (action->func == action_move ||
-                 action->func == action_resize)) {
+            if (action && action->func == action_moveresize &&
+                action->data.moveresize.corner !=
+                prop_atoms.net_wm_moveresize_move_keyboard &&
+                action->data.moveresize.corner !=
+                prop_atoms.net_wm_moveresize_size_keyboard) {
                 action_free(action);
                 action = NULL;
             }
@@ -82,6 +85,8 @@ void keyparse(ParseToken *token)
         /* these use the argument */
         if (action->func == action_execute || action->func == action_restart)
             action->data.execute.path = g_strdup(arg_str);
+        else if (action->func == action_showmenu)
+            action->data.showmenu.name = g_strdup(arg_str);
         if ((action->func == action_desktop ||
              action->func == action_send_to_desktop) &&
             arg_int)