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

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

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index ef36717294e97ca58d6d3244ad70176faa182cdc..bf670c49f89ba41807925a6c1d992d39032afc7e 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -116,6 +116,8 @@ static void event(ObEvent *e, void *foo)
     if (e->type == Event_X_KeyRelease)
         return;
 
+    g_assert(e->type == Event_X_KeyPress);
+
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
         reset_chains();
@@ -141,17 +143,12 @@ static void event(ObEvent *e, void *foo)
                     if (p->action->func != NULL) {
                         p->action->data.any.c = focus_client;
 
-                        g_assert(!(p->action->func == action_move ||
-                                   p->action->func == action_resize));
-
                         if (p->action->func == action_cycle_windows) {
                             p->action->data.cycle.final = FALSE;
                             p->action->data.cycle.cancel = FALSE;
                         }
 
-                        if (!grabbed_key ||
-                            p->action->func == action_cycle_windows)
-                            p->action->func(&p->action->data);
+                        p->action->func(&p->action->data);
 
                         if (p->action->func == action_cycle_windows &&
                             !grabbed_key) {