Merge branch 'backport' into work

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index d1c345abe4c3a3a449f3fcd1f8dc774e16e8e3f8..aca69cc36aab7380ea9dcee15611f6e63e8c12d3 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -33,6 +33,7 @@
 #include "menuframe.h"
 #include "keyboard.h"
 #include "mouse.h"
+#include "hooks.h"
 #include "focus.h"
 #include "focus_cycle.h"
 #include "moveresize.h"
@@ -656,8 +657,10 @@ static void event_process(const XEvent *ec, gpointer data)
         /* keyboard layout changes for modifier mapping changes. reload the
            modifier map, and rebind all the key bindings as appropriate */
         ob_debug("Kepboard map changed. Reloading keyboard bindings.");
+        ob_set_state(OB_STATE_RECONFIGURING);
         obt_keyboard_reload();
         keyboard_rebind();
+        ob_set_state(OB_STATE_RUNNING);
     }
     else if (e->type == ClientMessage) {
         /* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for
@@ -1122,7 +1125,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 move = TRUE;
             }
 
-
         if (e->xconfigurerequest.value_mask & CWStackMode) {
             ObClient *sibling = NULL;
             gulong ignore_start;