Add grab option to <keybind> to not grab the keycombo.

This is for example to let you bind stuff to the Alt key while alt-tabbing,
but you don't want those keys to be grabbed in normal usage.

diff --git a/openbox/config.c b/openbox/config.c
index 83c2bf8..92c4fe0 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -450,11 +450,13 @@ static void parse_key(xmlNodePtr node, GList *keylist)
     gchar *keystring, **keys, **key;
     xmlNodePtr n;
     gboolean is_chroot = FALSE;
     gchar *keystring, **keys, **key;
     xmlNodePtr n;
     gboolean is_chroot = FALSE;

+    gboolean grab = TRUE;

 
     if (!obt_xml_attr_string(node, "key", &keystring))
         return;
 
     obt_xml_attr_bool(node, "chroot", &is_chroot);
 
     if (!obt_xml_attr_string(node, "key", &keystring))
         return;
 
     obt_xml_attr_bool(node, "chroot", &is_chroot);

+    obt_xml_attr_bool(node, "grab", &grab);

 
     keys = g_strsplit(keystring, " ", 0);
     for (key = keys; *key; ++key) {
 
     keys = g_strsplit(keystring, " ", 0);
     for (key = keys; *key; ++key) {


@@ -472,7 +474,7 @@ static void parse_key(xmlNodePtr node, GList *keylist)
 
                 action = actions_parse(n);
                 if (action)
 
                 action = actions_parse(n);
                 if (action)

-                    keyboard_bind(keylist, action);
+                    keyboard_bind(keylist, action, grab);

                 n = obt_xml_find_node(n->next, "action");
             }
         }
                 n = obt_xml_find_node(n->next, "action");
             }
         }


@@ -1006,7 +1008,7 @@ static void bind_default_keyboard(void)
     };
     for (it = binds; it->key; ++it) {
         GList *l = g_list_append(NULL, g_strdup(it->key));
     };
     for (it = binds; it->key; ++it) {
         GList *l = g_list_append(NULL, g_strdup(it->key));

-        keyboard_bind(l, actions_parse_string(it->actname));
+        keyboard_bind(l, actions_parse_string(it->actname), TRUE);

     }
 }
 
     }
 }
 

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 29abca8..2ce664a 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -51,7 +51,7 @@ static void grab_keys(gboolean grab)
     if (grab) {
         p = curpos ? curpos->first_child : keyboard_firstnode;
         while (p) {
     if (grab) {
         p = curpos ? curpos->first_child : keyboard_firstnode;
         while (p) {

-            if (p->key)
+            if (p->key && p->grab)

                 grab_key(p->key, p->state, obt_root(ob_screen),
                          GrabModeAsync);
             p = p->next_sibling;
                 grab_key(p->key, p->state, obt_root(ob_screen),
                          GrabModeAsync);
             p = p->next_sibling;


@@ -132,14 +132,14 @@ void keyboard_chroot(GList *keylist)
        chroot binding. so add it to the tree then. */
     if (!tree_chroot(keyboard_firstnode, keylist)) {
         KeyBindingTree *tree;
        chroot binding. so add it to the tree then. */
     if (!tree_chroot(keyboard_firstnode, keylist)) {
         KeyBindingTree *tree;

-        if (!(tree = tree_build(keylist)))
+        if (!(tree = tree_build(keylist, TRUE)))

             return;
         tree_chroot(tree, keylist);
         tree_assimilate(tree);
     }
 }
 
             return;
         tree_chroot(tree, keylist);
         tree_assimilate(tree);
     }
 }
 

-gboolean keyboard_bind(GList *keylist, ObActionsAct *action)
+gboolean keyboard_bind(GList *keylist, ObActionsAct *action, gboolean grab)

 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;


@@ -147,7 +147,7 @@ gboolean keyboard_bind(GList *keylist, ObActionsAct *action)
     g_assert(keylist != NULL);
     g_assert(action != NULL);
 
     g_assert(keylist != NULL);
     g_assert(action != NULL);
 

-    if (!(tree = tree_build(keylist)))
+    if (!(tree = tree_build(keylist, grab)))

         return FALSE;
 
     if ((t = tree_find(tree, &conflict)) != NULL) {
         return FALSE;
 
     if ((t = tree_find(tree, &conflict)) != NULL) {


@@ -295,7 +295,7 @@ static void node_rebind(KeyBindingTree *node)
         while (node->actions) {
             /* add each action, and remove them from the original tree so
                they don't get free'd on us */
         while (node->actions) {
             /* add each action, and remove them from the original tree so
                they don't get free'd on us */

-            keyboard_bind(node->keylist, node->actions->data);
+            keyboard_bind(node->keylist, node->actions->data, node->grab);

             node->actions = g_slist_delete_link(node->actions, node->actions);
         }
 
             node->actions = g_slist_delete_link(node->actions, node->actions);
         }
 

diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index c89f67e..8569b97 100644 (file)
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -37,7 +37,7 @@ void keyboard_shutdown(gboolean reconfig);
 void keyboard_rebind(void);
 
 void keyboard_chroot(GList *keylist);
 void keyboard_rebind(void);
 
 void keyboard_chroot(GList *keylist);

-gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action);
+gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action, gboolean grab);

 void keyboard_unbind_all(void);
 
 gboolean keyboard_event(struct _ObClient *client, const XEvent *e);
 void keyboard_unbind_all(void);
 
 gboolean keyboard_event(struct _ObClient *client, const XEvent *e);

diff --git a/openbox/keytree.c b/openbox/keytree.c
index 93a0c7a..87003a0 100644 (file)
--- a/openbox/keytree.c
+++ b/openbox/keytree.c
@@ -44,7 +44,7 @@ void tree_destroy(KeyBindingTree *tree)
     }
 }
 
     }
 }
 

-KeyBindingTree *tree_build(GList *keylist)
+KeyBindingTree *tree_build(GList *keylist, gboolean grab)

 {
     GList *it;
     KeyBindingTree *ret = NULL, *p;
 {
     GList *it;
     KeyBindingTree *ret = NULL, *p;


@@ -62,6 +62,7 @@ KeyBindingTree *tree_build(GList *keylist)
             ret->keylist = g_list_prepend(ret->keylist,
                                           g_strdup(kit->data)); /* deep copy */
         ret->first_child = p;
             ret->keylist = g_list_prepend(ret->keylist,
                                           g_strdup(kit->data)); /* deep copy */
         ret->first_child = p;

+        ret->grab = grab;

         if (p != NULL) p->parent = ret;
         translate_key(it->data, &ret->state, &ret->key);
     }
         if (p != NULL) p->parent = ret;
         translate_key(it->data, &ret->state, &ret->key);
     }

diff --git a/openbox/keytree.h b/openbox/keytree.h
index 66edc3c..6b37606 100644 (file)
--- a/openbox/keytree.h
+++ b/openbox/keytree.h
@@ -24,6 +24,7 @@
 typedef struct KeyBindingTree {
     guint state;
     guint key;
 typedef struct KeyBindingTree {
     guint state;
     guint key;

+    gboolean grab;

     GList *keylist;
     GSList *actions; /* list of Action pointers */
     gboolean chroot;
     GList *keylist;
     GSList *actions; /* list of Action pointers */
     gboolean chroot;


@@ -37,7 +38,7 @@ typedef struct KeyBindingTree {
 } KeyBindingTree;
 
 void tree_destroy(KeyBindingTree *tree);
 } KeyBindingTree;
 
 void tree_destroy(KeyBindingTree *tree);

-KeyBindingTree *tree_build(GList *keylist);
+KeyBindingTree *tree_build(GList *keylist, gboolean grab);

 void tree_assimilate(KeyBindingTree *node);
 KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
 gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
 void tree_assimilate(KeyBindingTree *node);
 KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
 gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);