X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=d044ba5c10b9866e9a60297aa20c65b6317d2c99;hb=3541c60fcbee11fe4fe7ba806219c3c16bb5a574;hp=37bff2711a5471167220b9904fd8518831e0e314;hpb=9d35b8c19865cb12c6bfb14c9879d3dfb52c3ac5;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 37bff271..d044ba5c 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -12,6 +12,7 @@
 #include "keytree.h"
 #include "keyboard.h"
 #include "translate.h"
+#include "moveresize.h"
 
 #include <glib.h>
 
@@ -58,7 +59,7 @@ static void grab_keys(gboolean grab)
 
     grab_for_window(screen_support_win, grab);
     for (it = client_list; it; it = g_list_next(it))
-        grab_for_window(((ObClient*)it->data)->frame->window, grab);
+        grab_for_window(((ObClient*)it->data)->window, grab);
 }
 
 static gboolean chain_timeout(gpointer data)
@@ -129,10 +130,15 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
 }
 
 void keyboard_interactive_grab(guint state, ObClient *client,
-                               ObFrameContext context, ObAction *action)
+                               ObAction *action)
 {
     ObInteractiveState *s;
 
+    g_assert(action->data.any.interactive);
+
+    if (moveresize_in_progress)
+        moveresize_end(FALSE);
+
     if (!interactive_states) {
         if (!grab_keyboard(TRUE))
             return;
@@ -147,14 +153,11 @@ void keyboard_interactive_grab(guint state, ObClient *client,
     s->state = state;
     s->client = client;
     s->action = action;
-    s->context = context;
 
     interactive_states = g_slist_append(interactive_states, s);
 }
 
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           ObClient **client,
-                                           ObFrameContext *context)
+gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
 {
     GSList *it, *next;
     gboolean handled = FALSE;
@@ -166,9 +169,6 @@ gboolean keyboard_process_interactive_grab(const XEvent *e,
 
         next = g_slist_next(it);
         
-        *client = s->client;
-        *context = s->context;
-
         if ((e->type == KeyRelease && 
              !(s->state & e->xkey.state)))
             done = TRUE;
@@ -179,21 +179,21 @@ gboolean keyboard_process_interactive_grab(const XEvent *e,
                 cancel = done = TRUE;
         }
         if (done) {
-            g_assert(s->action->data.any.interactive);
-
-            s->action->data.inter.cancel = cancel;
-            s->action->data.inter.final = TRUE;
-
-            s->action->func(&s->action->data);
-
-            grab_keyboard(FALSE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
-            keyboard_reset_chains();
+            action_run_interactive(s->action, s->client,
+                                   e->xkey.state, cancel, TRUE);
 
             g_free(s);
+
             interactive_states = g_slist_delete_link(interactive_states, it);
+            if (!interactive_states) {
+                grab_keyboard(FALSE);
+                grab_pointer(FALSE, OB_CURSOR_NONE);
+                keyboard_reset_chains();
+            }
+
             handled = TRUE;
-        }
+        } else
+            *client = s->client;
     }
 
     return handled;
@@ -218,7 +218,8 @@ void keyboard_event(ObClient *client, const XEvent *e)
         p = curpos->first_child;
     while (p) {
         if (p->key == e->xkey.keycode &&
-            p->state == e->xkey.state) {
+            p->state == e->xkey.state)
+        {
             if (p->first_child != NULL) { /* part of a chain */
                 ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
                 /* 5 second timeout for chains */
@@ -229,32 +230,10 @@ void keyboard_event(ObClient *client, const XEvent *e)
                 grab_keys(TRUE);
             } else {
                 GSList *it;
-                for (it = p->actions; it; it = it->next) {
-                    ObAction *act = it->data;
-                    if (act->func != NULL) {
-                        act->data.any.c = client;
-
-                        if (act->func == action_moveresize) {
-                            screen_pointer_pos(&act->data.moveresize.x,
-                                               &act->data.moveresize.y);
-                        }
-
-                        if (act->data.any.interactive) {
-                            act->data.inter.cancel = FALSE;
-                            act->data.inter.final = FALSE;
-                            keyboard_interactive_grab(e->xkey.state, client,
-                                                      0, act);
-                        }
-
-                        if (act->func == action_showmenu) {
-                            act->data.showmenu.x = e->xkey.x_root;
-                            act->data.showmenu.y = e->xkey.y_root;
-                        }
-
-                        act->data.any.c = client;
-                        act->func(&act->data);
-                    }
-                }
+
+                for (it = p->actions; it; it = it->next)
+                    action_run_key(it->data, client, e->xkey.state,
+                                   e->xkey.x_root, e->xkey.y_root);
 
                 keyboard_reset_chains();
             }