woa.. let you do mouse actions while in an interactive keyboard action, and let you...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index ff9ea5745b85c314390a1c4e6ddc0932cc5d6228..efef0faa3e1f7c97c5f45f65f436aab9474d0932 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -546,14 +546,16 @@ static void event_process(const XEvent *ec, gpointer data)
         }
 
         if (useevent) {
-            if (!keyboard_process_interactive_grab(e, &client)) {
-                if (moveresize_in_progress) {
-                    moveresize_event(e);
-
+            /* if the keyboard interactive action uses the event then dont
+               use it for bindings. likewise is moveresize uses the event. */
+            if (!keyboard_process_interactive_grab(e, &client) &&
+                !(moveresize_in_progress && moveresize_event(e)))
+            {
+                if (moveresize_in_progress)
                     /* make further actions work on the client being
                        moved/resized */
                     client = moveresize_client;
-                }
+
 
                 menu_can_hide = FALSE;
                 ob_main_loop_timeout_add(ob_main_loop,