X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=746be2c4f7aa4e7016cc6a228fea8304bfc2764d;hb=098ae047f89f23d888f26425f7c5f77b75437d91;hp=c6bf6dfe1d55e40a89152373f63c49c0ee2266f3;hpb=0545563b190291d2c24231ab379098b668ee8d63;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index c6bf6dfe..746be2c4 100644
--- 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);
@@ -1927,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");