move the move/resize functionality into moveresize.c, for use with the netwm atoms...

[chaz/openbox] / plugins / keyboard / keyparse.c

diff --git a/plugins/keyboard/keyparse.c b/plugins/keyboard/keyparse.c
index 61c7cd9d62aff97a15958c3f82057bfec7de7b02..b3c00f7e99f52870d6c8988b33c439c69b083b36 100644 (file)
--- 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;
             }