allow multiple contexts separated by space in a mouse binding

[dana/openbox.git] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 2f8604e..567ec4d 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -362,25 +362,20 @@ gboolean mouse_event(ObClient *client, XEvent *e)
     return used;
 }
 
     return used;
 }
 

-gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
+gboolean mouse_bind(const gchar *buttonstr, ObFrameContext context,

                     ObMouseAction mact, ObActionsAct *action)
 {
     guint state, button;
                     ObMouseAction mact, ObActionsAct *action)
 {
     guint state, button;

-    ObFrameContext context;

     ObMouseBinding *b;
     GSList *it;
 
     ObMouseBinding *b;
     GSList *it;
 

+    g_assert(context != OB_FRAME_CONTEXT_NONE);
+

     if (!translate_button(buttonstr, &state, &button)) {
         g_message(_("Invalid button \"%s\" in mouse binding"), buttonstr);
         return FALSE;
     }
 
     if (!translate_button(buttonstr, &state, &button)) {
         g_message(_("Invalid button \"%s\" in mouse binding"), buttonstr);
         return FALSE;
     }
 

-    context = frame_context_from_string(contextstr);
-    if (!context) {
-        g_message(_("Invalid context \"%s\" in mouse binding"), contextstr);
-        return FALSE;
-    }
-

     for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
         b = it->data;
         if (b->state == state && b->button == button) {
     for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
         b = it->data;
         if (b->state == state && b->button == button) {