X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=2f0c8f59f70e3f39bffbb6070595d08d53995274;hb=HEAD;hp=8a390d9f0cd9bb50b16b91d4c84a53b545672c19;hpb=d9f14c1d010860e658f4a9adc6682e0264b410aa;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 8a390d9f..2f0c8f59 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -2,7 +2,7 @@ mouse.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,15 +19,16 @@ #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 typedef struct { @@ -36,17 +37,15 @@ typedef struct { GSList *actions[OB_NUM_MOUSE_ACTIONS]; /* lists of Action pointers */ } ObMouseBinding; -#define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \ - co == OB_FRAME_CONTEXT_FRAME : FALSE) -#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \ - co == OB_FRAME_CONTEXT_DESKTOP : \ - co == OB_FRAME_CONTEXT_CLIENT) - /* Array of GSList*s of ObMouseBinding*s. */ static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS]; +/* TRUE when we have a grab on the pointer and need to replay the pointer event + to send it to other applications */ +static gboolean replay_pointer_needed; ObFrameContext mouse_button_frame_context(ObFrameContext context, - guint button) + guint button, + guint state) { GSList *it; ObFrameContext x = context; @@ -54,7 +53,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; } @@ -63,16 +62,23 @@ 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: + case OB_FRAME_CONTEXT_DOCK: + 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: @@ -85,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) @@ -106,7 +116,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 @@ -129,30 +139,44 @@ 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); + g_slice_free(ObMouseBinding, b); } g_slist_free(bound_contexts[i]); bound_contexts[i] = NULL; } } +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) @@ -168,16 +192,27 @@ 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); + actions_run_acts(b->actions[a], mouse_action_to_user_action(a), + state, x, y, button, context, c); return TRUE; } -void mouse_event(ObClient *client, XEvent *e) +void mouse_replay_pointer(void) +{ + if (replay_pointer_needed) { + /* replay the pointer event before any windows move */ + XAllowEvents(obt_display, ReplayPointer, event_time()); + replay_pointer_needed = FALSE; + } +} + +gboolean 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, lx = -10, ly = -10; + gboolean used = FALSE; ObFrameContext context; gboolean click = FALSE; @@ -185,29 +220,61 @@ 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; - fire_binding(OB_MOUSE_ACTION_PRESS, context, - client, e->xbutton.state, - e->xbutton.button, - e->xbutton.x_root, e->xbutton.y_root); + /* 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, set that we need it, and if nothing + else causes the replay pointer to be run, then we will do it + after all the actions are finished. + + (We do it after all the actions because FocusIn interrupts + dragging for kdesktop, so if we send the button event now, and + then they get a focus event after, it breaks. Instead, wait to send + the button press until after the actions when possible.) + */ + if (CLIENT_CONTEXT(context, client)) + replay_pointer_needed = TRUE; + + used = fire_binding(OB_MOUSE_ACTION_PRESS, context, + client, e->xbutton.state, + e->xbutton.button, + e->xbutton.x_root, e->xbutton.y_root) || used; + + /* 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) */ + mouse_replay_pointer(); - if (CLIENT_CONTEXT(context, client)) { - /* Replay the event, so it goes to the client*/ - XAllowEvents(ob_display, ReplayPointer, event_lasttime); - /* Fall through to the release case! */ - } else + /* 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 */ @@ -215,26 +282,32 @@ 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 && e->xbutton.x < (signed)(w+b) && - e->xbutton.y < (signed)(h+b)) { + e->xbutton.y < (signed)(h+b)) + { click = TRUE; /* double clicks happen if there were 2 in a row! */ if (lbutton == button && lwindow == e->xbutton.window && e->xbutton.time - config_mouse_dclicktime <= - ltime) { + ltime && + ABS(e->xbutton.x - lx) < 8 && + ABS(e->xbutton.y - ly) < 8) + { dclick = TRUE; lbutton = 0; } else { lbutton = button; lwindow = e->xbutton.window; + lx = e->xbutton.x; + ly = e->xbutton.y; } } else { lbutton = 0; @@ -246,33 +319,32 @@ void mouse_event(ObClient *client, XEvent *e) state = 0; ltime = e->xbutton.time; } - fire_binding(OB_MOUSE_ACTION_RELEASE, context, - client, e->xbutton.state, - e->xbutton.button, - e->xbutton.x_root, e->xbutton.y_root); + used = fire_binding(OB_MOUSE_ACTION_RELEASE, context, + client, e->xbutton.state, + e->xbutton.button, + e->xbutton.x_root, + e->xbutton.y_root) || used; if (click) - fire_binding(OB_MOUSE_ACTION_CLICK, context, - client, e->xbutton.state, - e->xbutton.button, - e->xbutton.x_root, - e->xbutton.y_root); + used = fire_binding(OB_MOUSE_ACTION_CLICK, context, + client, e->xbutton.state, + e->xbutton.button, + e->xbutton.x_root, + e->xbutton.y_root) || used; 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); + used = fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context, + client, e->xbutton.state, + e->xbutton.button, + e->xbutton.x_root, + e->xbutton.y_root) || used; 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 || @@ -283,8 +355,8 @@ void mouse_event(ObClient *client, XEvent *e) context == OB_FRAME_CONTEXT_CLOSE) break; - fire_binding(OB_MOUSE_ACTION_MOTION, context, - client, state, button, px, py); + used = fire_binding(OB_MOUSE_ACTION_MOTION, context, + client, state, button, px, py); button = 0; state = 0; } @@ -294,24 +366,20 @@ void mouse_event(ObClient *client, XEvent *e) default: g_assert_not_reached(); } + return used; } -gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, - ObMouseAction mact, ObAction *action) +gboolean mouse_bind(const gchar *buttonstr, ObFrameContext context, + ObMouseAction mact, ObActionsAct *action) { guint state, button; - ObFrameContext context; ObMouseBinding *b; GSList *it; - if (!translate_button(buttonstr, &state, &button)) { - g_warning("invalid button '%s'", buttonstr); - return FALSE; - } + g_assert(context != OB_FRAME_CONTEXT_NONE); - context = frame_context_from_string(contextstr); - if (!context) { - g_warning("invalid context '%s'", contextstr); + if (!translate_button(buttonstr, &state, &button)) { + g_message(_("Invalid button \"%s\" in mouse binding"), buttonstr); return FALSE; } @@ -323,15 +391,8 @@ 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 = g_slice_new0(ObMouseBinding); b->state = state; b->button = button; b->actions[mact] = g_slist_append(NULL, action);