X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=fe13c97b4c9869ac7a756324fb7e5e5c64d42cb4;hb=8fe0cb8989c1fe12b30b9030b446345f25340d35;hp=65d2f2e072f22a1891965a907b599ff2cb4445be;hpb=0f544808b8372a6c8a2cbfae214f2803dd3c6170;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 65d2f2e0..fe13c97b 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>
 
@@ -129,12 +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;
@@ -149,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)
 {
     GSList *it, *next;
     gboolean handled = FALSE;
@@ -168,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;