make binding fallback for mouse clicks less restrictive. if you dont have a binding for the same button AND STATE then fallback.
Dana Jansens danakj@orodu.net
3 files changed,
16 insertions(+),
8 deletions(-)
M
openbox/event.c
→
openbox/event.c
@@ -772,7 +772,8 @@ !menu_frame_visible)
{ /* use where the press occured */ con = frame_context(client, e->xbutton.window, px, py); - con = mouse_button_frame_context(con, e->xbutton.button); + con = mouse_button_frame_context(con, e->xbutton.button, + e->xbutton.state); if (e->type == ButtonRelease && e->xbutton.button == pb) pb = 0, px = py = -1;
M
openbox/mouse.c
→
openbox/mouse.c
@@ -48,7 +48,8 @@ /* Array of GSList*s of ObMouseBinding*s. */
static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS]; ObFrameContext mouse_button_frame_context(ObFrameContext context, - guint button) + guint button, + guint state) { GSList *it; ObFrameContext x = context;@@ -56,7 +57,7 @@
for (it = bound_contexts[context]; it; it = g_slist_next(it)) { ObMouseBinding *b = it->data; - if (b->button == button) + if (b->button == button && b->state == state) return context; }@@ -90,7 +91,11 @@ case OB_FRAME_NUM_CONTEXTS:
g_assert_not_reached(); } - return x; + /* allow for multiple levels of fall-through */ + if (x != context) + return mouse_button_frame_context(x, button, state); + else + return x; } void mouse_grab_for_client(ObClient *client, gboolean grab)@@ -192,7 +197,8 @@ switch (e->type) {
case ButtonPress: context = frame_context(client, e->xbutton.window, e->xbutton.x, e->xbutton.y); - context = mouse_button_frame_context(context, e->xbutton.button); + context = mouse_button_frame_context(context, e->xbutton.button, + e->xbutton.state); px = e->xbutton.x_root; py = e->xbutton.y_root;@@ -222,7 +228,8 @@
case ButtonRelease: /* use where the press occured in the window */ context = frame_context(client, e->xbutton.window, pwx, pwy); - context = mouse_button_frame_context(context, e->xbutton.button); + context = mouse_button_frame_context(context, e->xbutton.button, + e->xbutton.state); if (e->xbutton.button == button) pwx = pwy = -1;@@ -289,7 +296,7 @@
case MotionNotify: if (button) { context = frame_context(client, e->xmotion.window, pwx, pwy); - context = mouse_button_frame_context(context, button); + context = mouse_button_frame_context(context, button, state); if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold || ABS(e->xmotion.y_root - py) >= config_mouse_threshold) {
M
openbox/mouse.h
→
openbox/mouse.h
@@ -37,6 +37,6 @@
void mouse_grab_for_client(struct _ObClient *client, gboolean grab); ObFrameContext mouse_button_frame_context(ObFrameContext context, - guint button); + guint button, guint state); #endif