X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=493e1000c1eb546674053154896504cfae599935;hb=fbc7607fbd1a380428a53094e727ac7631871bd4;hp=9ca7987728fa43044893dc105d488559275fb71c;hpb=f237e72a307acd7c487c7e2257e24a735c3e7d6e;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 9ca79877..493e1000 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -20,7 +20,7 @@ #include "openbox.h" #include "config.h" #include "xerror.h" -#include "action.h" +#include "actions.h" #include "event.h" #include "client.h" #include "prop.h" @@ -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; } @@ -65,16 +66,22 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, case OB_FRAME_CONTEXT_DESKTOP: case OB_FRAME_CONTEXT_CLIENT: case OB_FRAME_CONTEXT_TITLEBAR: - case OB_FRAME_CONTEXT_HANDLE: case OB_FRAME_CONTEXT_FRAME: case OB_FRAME_CONTEXT_MOVE_RESIZE: + case OB_FRAME_CONTEXT_LEFT: + case OB_FRAME_CONTEXT_RIGHT: break; + case OB_FRAME_CONTEXT_ROOT: + x = OB_FRAME_CONTEXT_DESKTOP; + break; + case OB_FRAME_CONTEXT_BOTTOM: case OB_FRAME_CONTEXT_BLCORNER: case OB_FRAME_CONTEXT_BRCORNER: - x = OB_FRAME_CONTEXT_HANDLE; + x = OB_FRAME_CONTEXT_BOTTOM; break; case OB_FRAME_CONTEXT_TLCORNER: case OB_FRAME_CONTEXT_TRCORNER: + case OB_FRAME_CONTEXT_TOP: case OB_FRAME_CONTEXT_MAXIMIZE: case OB_FRAME_CONTEXT_ALLDESKTOPS: case OB_FRAME_CONTEXT_SHADE: @@ -87,7 +94,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) @@ -108,7 +119,7 @@ void mouse_grab_for_client(ObClient *client, gboolean grab) mode = GrabModeAsync; mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; } else if (CLIENT_CONTEXT(i, client)) { - win = client->frame->plate; + win = client->window; mode = GrabModeSync; /* this is handled in event */ mask = ButtonPressMask; /* can't catch more than this with Sync mode the release event is @@ -145,7 +156,7 @@ void mouse_unbind_all() GSList *it; for (it = b->actions[j]; it; it = g_slist_next(it)) - action_unref(it->data); + actions_act_unref(it->data); g_slist_free(b->actions[j]); } g_free(b); @@ -155,9 +166,23 @@ void mouse_unbind_all() } } +static ObUserAction mouse_action_to_user_action(ObMouseAction a) +{ + switch (a) { + case OB_MOUSE_ACTION_PRESS: return OB_USER_ACTION_MOUSE_PRESS; + case OB_MOUSE_ACTION_RELEASE: return OB_USER_ACTION_MOUSE_RELEASE; + case OB_MOUSE_ACTION_CLICK: return OB_USER_ACTION_MOUSE_CLICK; + case OB_MOUSE_ACTION_DOUBLE_CLICK: + return OB_USER_ACTION_MOUSE_DOUBLE_CLICK; + case OB_MOUSE_ACTION_MOTION: return OB_USER_ACTION_MOUSE_MOTION; + default: + g_assert_not_reached(); + } +} + static gboolean fire_binding(ObMouseAction a, ObFrameContext context, ObClient *c, guint state, - guint button, gint x, gint y, Time time) + guint button, gint x, gint y) { GSList *it; ObMouseBinding *b; @@ -170,7 +195,8 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context, /* if not bound, then nothing to do! */ if (it == NULL) return FALSE; - action_run_mouse(b->actions[a], c, context, state, button, x, y, time); + actions_run_acts(b->actions[a], mouse_action_to_user_action(a), + state, x, y, context, c); return TRUE; } @@ -189,7 +215,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; @@ -201,8 +228,12 @@ void mouse_event(ObClient *client, XEvent *e) fire_binding(OB_MOUSE_ACTION_PRESS, context, client, e->xbutton.state, e->xbutton.button, - e->xbutton.x_root, e->xbutton.y_root, - e->xbutton.time); + e->xbutton.x_root, e->xbutton.y_root); + + /* if the bindings grab the pointer, there won't be a ButtonRelease + event for us */ + if (grab_on_pointer()) + button = 0; if (CLIENT_CONTEXT(context, client)) { /* Replay the event, so it goes to the client*/ @@ -214,7 +245,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; @@ -260,28 +292,25 @@ void mouse_event(ObClient *client, XEvent *e) client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, - e->xbutton.y_root, - e->xbutton.time); + e->xbutton.y_root); if (click) fire_binding(OB_MOUSE_ACTION_CLICK, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, - e->xbutton.y_root, - e->xbutton.time); + e->xbutton.y_root); if (dclick) fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, - e->xbutton.y_root, - e->xbutton.time); + e->xbutton.y_root); break; 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) { @@ -296,7 +325,7 @@ void mouse_event(ObClient *client, XEvent *e) break; fire_binding(OB_MOUSE_ACTION_MOTION, context, - client, state, button, px, py, e->xmotion.time); + client, state, button, px, py); button = 0; state = 0; } @@ -309,7 +338,7 @@ void mouse_event(ObClient *client, XEvent *e) } gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, - ObMouseAction mact, ObAction *action) + ObMouseAction mact, ObActionsAct *action) { guint state, button; ObFrameContext context; @@ -335,13 +364,6 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, } } - /* when there are no modifiers in the binding, then the action cannot - be interactive */ - if (!state && action->data.any.interactive) { - action->data.any.interactive = FALSE; - action->data.inter.final = TRUE; - } - /* add the binding */ b = g_new0(ObMouseBinding, 1); b->state = state;