diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-19 22:03:12 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-19 22:03:12 +0000 |
| commit | 198aab2b713b9a916079b0fd6cf88555d7f3c9b8 (patch) | |
| tree | af702e7f4652ba6783e748ba6f41215aa2be2571 /openbox/mouse.c | |
| parent | ed4d0ca31a9c1c6c815cb87a058bb1d36a0888c1 (diff) | |
make binding fallback for mouse clicks less restrictive. if you dont have a binding for the same button AND STATE then fallback.
Diffstat (limited to 'openbox/mouse.c')
| -rw-r--r-- | openbox/mouse.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/openbox/mouse.c b/openbox/mouse.c index 96cb0660..a96b02b9 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -48,7 +48,8 @@ typedef struct { 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 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, 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 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, 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 @@ void mouse_event(ObClient *client, XEvent *e) 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 @@ void mouse_event(ObClient *client, XEvent *e) 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 @@ void mouse_event(ObClient *client, XEvent *e) 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) { |