X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=2f0c8f59f70e3f39bffbb6070595d08d53995274;hb=HEAD;hp=f2e13cdf28b54fabb1f6adcaf17a4c6e955bd94a;hpb=83c739df9117cde1982a1fec4487ea1a3eb6ebf0;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index f2e13cdf..2f0c8f59 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -19,16 +19,15 @@ #include "openbox.h" #include "config.h" -#include "xerror.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 @@ -38,12 +37,6 @@ 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 @@ -73,6 +66,7 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, 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; @@ -162,7 +156,7 @@ void mouse_unbind_all(void) 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; @@ -203,21 +197,22 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context, return TRUE; } -void mouse_replay_pointer() +void mouse_replay_pointer(void) { if (replay_pointer_needed) { /* replay the pointer event before any windows move */ - XAllowEvents(ob_display, ReplayPointer, event_curtime); + XAllowEvents(obt_display, ReplayPointer, event_time()); replay_pointer_needed = FALSE; } } -void mouse_event(ObClient *client, XEvent *e) +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, pwx = -1, pwy = -1; + static gint px, py, pwx = -1, pwy = -1, lx = -10, ly = -10; + gboolean used = FALSE; ObFrameContext context; gboolean click = FALSE; @@ -253,10 +248,10 @@ void mouse_event(ObClient *client, XEvent *e) if (CLIENT_CONTEXT(context, client)) replay_pointer_needed = TRUE; - fire_binding(OB_MOUSE_ACTION_PRESS, context, - client, e->xbutton.state, - e->xbutton.button, - e->xbutton.x_root, e->xbutton.y_root); + 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 */ @@ -287,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; @@ -318,23 +319,23 @@ 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: @@ -354,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; } @@ -365,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, +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_message(_("Invalid button '%s' in mouse binding"), buttonstr); - return FALSE; - } + g_assert(context != OB_FRAME_CONTEXT_NONE); - context = frame_context_from_string(contextstr); - if (!context) { - g_message(_("Invalid context '%s' in mouse binding"), contextstr); + if (!translate_button(buttonstr, &state, &button)) { + g_message(_("Invalid button \"%s\" in mouse binding"), buttonstr); return FALSE; } @@ -395,7 +392,7 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, } /* 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);