X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=567ec4dc2817284f84b04c42937d9d0ae95d8364;hb=f307a3feabedd9bcadeaafd0fa8e1b1a60736eb2;hp=2f8604eb9796527e046e0ac9eb724855a57c566a;hpb=197ee0ad4732c8668fe38a6b49e0a747866ef3ea;p=chaz%2Fopenbox 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) {