X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=b2893cee6814afd151b35d807f9f85e36eaeb6ac;hb=0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8;hp=55f1bf535b99b7462f49aabbeba7af2bca802d9a;hpb=a488360f48abbfd6e67576a1844d792b28e6065c;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 55f1bf53..b2893cee 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -19,16 +19,15 @@ #include "openbox.h" #include "config.h" -#include "xerror.h" -#include "action.h" +#include "actions.h" #include "event.h" #include "client.h" -#include "prop.h" #include "grab.h" #include "frame.h" #include "translate.h" #include "mouse.h" #include "gettext.h" +#include "obt/display.h" #include @@ -48,7 +47,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 +56,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 +65,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 +93,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) @@ -106,10 +116,9 @@ void mouse_grab_for_client(ObClient *client, gboolean grab) if (FRAME_CONTEXT(i, client)) { win = client->frame->window; mode = GrabModeAsync; - mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask | - PointerMotionHintMask; + 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 @@ -132,21 +141,21 @@ static void grab_all_clients(gboolean grab) mouse_grab_for_client(it->data, grab); } -void mouse_unbind_all() +void mouse_unbind_all(void) { gint i; GSList *it; - + for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) { for (it = bound_contexts[i]; it; it = g_slist_next(it)) { ObMouseBinding *b = it->data; gint j; for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) { - GSList *it; + GSList *jt; - for (it = b->actions[j]; it; it = g_slist_next(it)) - action_unref(it->data); + for (jt = b->actions[j]; jt; jt = g_slist_next(jt)) + actions_act_unref(jt->data); g_slist_free(b->actions[j]); } g_free(b); @@ -156,9 +165,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; @@ -171,7 +194,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, button, context, c); return TRUE; } @@ -180,7 +204,7 @@ void mouse_event(ObClient *client, XEvent *e) static Time ltime; static guint button = 0, state = 0, lbutton = 0; static Window lwindow = None; - static gint px, py; + static gint px, py, pwx = -1, pwy = -1; ObFrameContext context; gboolean click = FALSE; @@ -188,30 +212,57 @@ void mouse_event(ObClient *client, XEvent *e) switch (e->type) { case ButtonPress: - context = frame_context(client, e->xany.window); - context = mouse_button_frame_context(context, e->xbutton.button); + context = frame_context(client, e->xbutton.window, + e->xbutton.x, e->xbutton.y); + context = mouse_button_frame_context(context, e->xbutton.button, + e->xbutton.state); px = e->xbutton.x_root; py = e->xbutton.y_root; + if (!button) pwx = e->xbutton.x; + if (!button) pwy = e->xbutton.y; button = e->xbutton.button; state = e->xbutton.state; + /* if the binding was in a client context, then we need to call + XAllowEvents with ReplayPointer at some point, to send the event + through to the client. when this happens though depends. if + windows are going to be moved on screen, then the click will end + up going somewhere wrong, so have the action system perform the + ReplayPointer for us if that is the case. */ + if (CLIENT_CONTEXT(context, client)) + actions_set_need_pointer_replay_before_move(TRUE); + else + actions_set_need_pointer_replay_before_move(FALSE); + 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); - - if (CLIENT_CONTEXT(context, client)) { - /* Replay the event, so it goes to the client*/ - XAllowEvents(ob_display, ReplayPointer, event_curtime); - /* Fall through to the release case! */ - } else + 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; + + /* replay the pointer event if it hasn't been replayed yet (i.e. no + windows were moved) */ + if (actions_get_need_pointer_replay_before_move()) + XAllowEvents(obt_display, ReplayPointer, event_curtime); + + /* in the client context, we won't get a button release because of the + way it is grabbed, so just fake one */ + if (!CLIENT_CONTEXT(context, client)) break; case ButtonRelease: - context = frame_context(client, e->xany.window); - context = mouse_button_frame_context(context, e->xbutton.button); + /* 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, + e->xbutton.state); + + if (e->xbutton.button == button) + pwx = pwy = -1; if (e->xbutton.button == button) { /* clicks are only valid if its released over the window */ @@ -219,10 +270,10 @@ void mouse_event(ObClient *client, XEvent *e) Window wjunk; guint ujunk, b, w, h; /* this can cause errors to occur when the window closes */ - xerror_set_ignore(TRUE); - junk1 = XGetGeometry(ob_display, e->xbutton.window, + obt_display_ignore_errors(TRUE); + junk1 = XGetGeometry(obt_display, e->xbutton.window, &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk); - xerror_set_ignore(FALSE); + obt_display_ignore_errors(FALSE); if (junk1) { if (e->xbutton.x >= (signed)-b && e->xbutton.y >= (signed)-b && @@ -253,33 +304,29 @@ void mouse_event(ObClient *client, XEvent *e) fire_binding(OB_MOUSE_ACTION_RELEASE, 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 (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->xany.window); - context = mouse_button_frame_context(context, button); + context = frame_context(client, e->xmotion.window, pwx, pwy); + 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) { + if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold || + ABS(e->xmotion.y_root - py) >= config_mouse_threshold) { /* You can't drag on buttons */ if (context == OB_FRAME_CONTEXT_MAXIMIZE || @@ -291,7 +338,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; } @@ -304,7 +351,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; @@ -312,13 +359,13 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, GSList *it; if (!translate_button(buttonstr, &state, &button)) { - g_message(_("Invalid button '%s' in pointer binding"), buttonstr); + 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 pointer binding"), contextstr); + g_message(_("Invalid context '%s' in mouse binding"), contextstr); return FALSE; } @@ -330,13 +377,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;