kill moveresize cleanly if focus is moving (it uses a keyboard grab)

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index e7bc6b750f6bd9f5c116d19b33430a678fee16ac..746be2c4f7aa4e7016cc6a228fea8304bfc2764d 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -257,12 +257,6 @@ static void event_hack_mods(XEvent *e)
         break;
     case KeyRelease:
         e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
-#ifdef XKB
-        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success) {
-            e->xkey.state = xkb_state.compat_state;
-            break;
-        }
-#endif
         /* remove from the state the mask of the modifier key being released,
            if it is a modifier key being released that is */
         e->xkey.state &= ~modkeys_keycode_to_mask(e->xkey.keycode);
@@ -1629,30 +1623,31 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
     if (frame == NULL)
         g_assert_not_reached(); /* there is no active menu */
 
-    else if (ev->type == KeyPress) {
-        if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) {
+    /* Allow control while going thru the menu */
+    else if (ev->type == KeyPress && (state & ~ControlMask) == 0) {
+        if (keycode == ob_keycode(OB_KEY_ESCAPE)) {
             menu_frame_hide_all();
             ret = TRUE;
         }
 
-        else if (keycode == ob_keycode(OB_KEY_LEFT) && ev->xkey.state == 0) {
+        else if (keycode == ob_keycode(OB_KEY_LEFT)) {
             /* Left goes to the parent menu */
             menu_frame_select(frame, NULL, TRUE);
             ret = TRUE;
         }
 
-        else if (keycode == ob_keycode(OB_KEY_RIGHT) && ev->xkey.state == 0) {
+        else if (keycode == ob_keycode(OB_KEY_RIGHT)) {
             /* Right goes to the selected submenu */
             if (frame->child) menu_frame_select_next(frame->child);
             ret = TRUE;
         }
 
-        else if (keycode == ob_keycode(OB_KEY_UP) && state == 0) {
+        else if (keycode == ob_keycode(OB_KEY_UP)) {
             menu_frame_select_previous(frame);
             ret = TRUE;
         }
 
-        else if (keycode == ob_keycode(OB_KEY_DOWN) && state == 0) {
+        else if (keycode == ob_keycode(OB_KEY_DOWN)) {
             menu_frame_select_next(frame);
             ret = TRUE;
         }
@@ -1662,7 +1657,9 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
        get sent to the focused application.
 
        Allow ControlMask only, and don't bother if the menu is empty */
-    else if ((ev->xkey.state & ~ControlMask) == 0 && frame->entries) {
+    else if (ev->type == KeyRelease && (state & ~ControlMask) == 0 &&
+             frame->entries)
+    {
         if (keycode == ob_keycode(OB_KEY_RETURN)) {
             /* Enter runs the active item or goes into the submenu.
                Control-Enter runs it without closing the menu. */
@@ -1924,6 +1921,10 @@ void event_cancel_all_key_grabs()
         menu_frame_hide_all();
         ob_debug("KILLED open menus\n");
     }
+    else if (moveresize_in_progress) {
+        moveresize_end(TRUE);
+        ob_debug("KILLED interactive moveresize\n");
+    }
     else if (grab_on_keyboard()) {
         ungrab_keyboard();
         ob_debug("KILLED active grab on keyboard\n");