Update traditional chinese messages

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index c6bf6dfe1d55e40a89152373f63c49c0ee2266f3..c119573e3b975ff65e399764f16a07e603f88425 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -243,10 +243,6 @@ static void event_set_curtime(XEvent *e)
 
 static void event_hack_mods(XEvent *e)
 {
-#ifdef XKB
-    XkbStateRec xkb_state;
-#endif
-
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
@@ -257,12 +253,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 +1917,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");