add a reconfigure action, also reconfigure on SIGUSR2.

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index b517014a795df3334fdf470c5b101c7fb6934359..f8109456894def5c092f472a4388c7230bb6ae75 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -73,6 +73,7 @@ void keyboard_reset_chains()
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
 
     if (curpos) {
+        grab_keys(FALSE);
         curpos = NULL;
         grab_keys(TRUE);
     }
@@ -82,6 +83,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
+    gboolean mods = TRUE;
 
     g_assert(keylist != NULL);
     g_assert(action != NULL);
@@ -95,7 +97,6 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
         tree = NULL;
     } else
         t = tree;
-    while (t->first_child) t = t->first_child;
 
     if (conflict) {
         g_warning("conflict with binding");
@@ -103,6 +104,21 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
         return FALSE;
     }
 
+    /* find if every key in this chain has modifiers, and also find the
+       bottom node of the tree */
+    while (t->first_child) {
+        if (!t->state)
+            mods = FALSE;
+        t = t->first_child;
+    }
+
+    /* when there are no modifiers in the binding, then the action cannot
+       be interactive */
+    if (!mods && action->data.any.interactive) {
+        action->data.any.interactive = FALSE;
+        action->data.inter.final = TRUE;
+    }
+
     /* set the action */
     t->actions = g_slist_append(t->actions, action);
     /* assimilate this built tree into the main tree. assimilation
@@ -208,6 +224,7 @@ void keyboard_event(ObClient *client, const XEvent *e)
                 /* 5 second timeout for chains */
                 ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC,
                                          chain_timeout, NULL, NULL);
+                grab_keys(FALSE);
                 curpos = p;
                 grab_keys(TRUE);
             } else {
@@ -247,15 +264,25 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
 }
 
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
 {
+    GSList *it;
+
     tree_destroy(keyboard_firstnode);
     keyboard_firstnode = NULL;
+
+    for (it = interactive_states; it; it = g_slist_next(it))
+        g_free(it->data);
+    g_slist_free(interactive_states);
+    interactive_states = NULL;
+
+    ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
     grab_keys(FALSE);
+    curpos = NULL;
 }