From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 20 Oct 2014 13:39:34 +0000 (+0200)
Subject: Allow specifying several mousebinds in one go, like for keybinds
X-Git-Tag: release-3.6.0~37
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d6985fd99691dd552070563f8d05602f27da89f0;p=dana%2Fopenbox.git

Allow specifying several mousebinds in one go, like for keybinds

Also fixes minor indent error
---

diff --git a/openbox/config.c b/openbox/config.c
index 434791bf..898eeec1 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -567,6 +567,8 @@ static void parse_mouse(xmlNodePtr node, gpointer d)
 
             nbut = obt_xml_find_node(n->children, "mousebind");
             while (nbut) {
+                gchar **button, **buttons;
+
                 if (!obt_xml_attr_string(nbut, "button", &buttonstr))
                     goto next_nbut;
                 if (obt_xml_attr_contains(nbut, "action", "press"))
@@ -582,17 +584,26 @@ static void parse_mouse(xmlNodePtr node, gpointer d)
                 else
                     goto next_nbut;
 
+                buttons = g_strsplit(buttonstr, " ", 0);
                 nact = obt_xml_find_node(nbut->children, "action");
                 while (nact) {
                     ObActionsAct *action;
 
-                    if ((action = actions_parse(nact)))
-                        mouse_bind(buttonstr, cx, mact, action);
+                    /* actions_parse() creates one ref to the action, but we need
+                     * exactly one ref per binding we use it for. */
+                    if ((action = actions_parse(nact))) {
+                        for (button = buttons; *button; ++button) {
+                            actions_act_ref(action);
+                            mouse_bind(*button, cx, mact, action);
+                        }
+                        actions_act_unref(action);
+                    }
                     nact = obt_xml_find_node(nact->next, "action");
                 }
-            g_free(buttonstr);
+                g_strfreev(buttons);
+                g_free(buttonstr);
             next_nbut:
-            nbut = obt_xml_find_node(nbut->next, "mousebind");
+                nbut = obt_xml_find_node(nbut->next, "mousebind");
             }
         }
         g_free(modcxstr);