From f307a3feabedd9bcadeaafd0fa8e1b1a60736eb2 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Thu, 13 May 2010 22:16:44 -0400
Subject: allow multiple contexts separated by space in a mouse binding

example: context="Top Left Right Bottom"
---
 openbox/mouse.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'openbox/mouse.c')

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 2f8604eb..567ec4dc 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -362,25 +362,20 @@ gboolean mouse_event(ObClient *client, XEvent *e)
     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;
-    ObFrameContext context;
     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;
     }
 
-    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) {
-- 
cgit v1.2.3