X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=ace7bca0c59aca82b172dd5b539d5398ed1bfe12;hb=2cd1644e1040684d5f646541f65a36b01b011db2;hp=6651a1f2c1c39d73e34da2140c78e7cc69d86d5a;hpb=8529aab619c0f26a79cd49ec0f8910433a541263;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 6651a1f2..ace7bca0 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -1,5 +1,6 @@ #include "openbox.h" #include "config.h" +#include "xerror.h" #include "action.h" #include "event.h" #include "client.h" @@ -14,9 +15,15 @@ typedef struct { guint state; guint button; - GSList *actions[NUM_MOUSEACTION]; /* lists of Action pointers */ + GSList *actions[OB_MOUSE_NUM_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 PointerBinding*s. */ static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS]; @@ -33,11 +40,11 @@ void mouse_grab_for_client(ObClient *client, gboolean grab) int mode; unsigned int mask; - if (i == OB_FRAME_CONTEXT_FRAME) { + if (FRAME_CONTEXT(i, client)) { win = client->frame->window; mode = GrabModeAsync; mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; - } else if (i == OB_FRAME_CONTEXT_CLIENT) { + } else if (CLIENT_CONTEXT(i, client)) { win = client->frame->plate; mode = GrabModeSync; /* this is handled in event */ mask = ButtonPressMask; /* can't catch more than this with Sync @@ -46,7 +53,8 @@ void mouse_grab_for_client(ObClient *client, gboolean grab) } else continue; if (grab) - grab_button_full(b->button, b->state, win, mask, mode, None); + grab_button_full(b->button, b->state, win, mask, mode, + OB_CURSOR_NONE); else ungrab_button(b->button, b->state, win); } @@ -70,7 +78,7 @@ static void clearall() int j; ObMouseBinding *b = it->data; - for (j = 0; j < NUM_MOUSEACTION; ++j) { + for (j = 0; j < OB_MOUSE_NUM_ACTIONS; ++j) { GSList *it; for (it = b->actions[j]; it; it = it->next) { action_free(it->data); @@ -80,12 +88,13 @@ static void clearall() g_free(b); } g_slist_free(bound_contexts[i]); + bound_contexts[i] = NULL; } } -static void fire_button(ObMouseAction a, ObFrameContext context, - ObClient *c, guint state, - guint button, int x, int y) +static gboolean fire_button(ObMouseAction a, ObFrameContext context, + ObClient *c, guint state, + guint button, int x, int y) { GSList *it; ObMouseBinding *b; @@ -96,7 +105,7 @@ static void fire_button(ObMouseAction a, ObFrameContext context, break; } /* if not bound, then nothing to do! */ - if (it == NULL) return; + if (it == NULL) return FALSE; for (it = b->actions[a]; it; it = it->next) { ObAction *act = it->data; @@ -110,30 +119,21 @@ static void fire_button(ObMouseAction a, ObFrameContext context, act->data.showmenu.y = y; } - if (act->func == action_desktop_dir) - { - act->data.desktopdir.final = FALSE; - act->data.desktopdir.cancel = FALSE; - } - if (act->func == action_send_to_desktop_dir) - { - act->data.sendtodir.final = FALSE; - act->data.sendtodir.cancel = FALSE; - } - - if ((act->func == action_desktop_dir || - act->func == action_send_to_desktop_dir)) { + if (act->data.any.interactive) { + act->data.inter.cancel = FALSE; + act->data.inter.final = FALSE; keyboard_interactive_grab(state, c, context, act); } act->func(&act->data); } } + return TRUE; } -static void fire_motion(ObMouseAction a, ObFrameContext context, ObClient *c, - guint state, guint button, int x_root, int y_root, - guint32 corner) +static gboolean fire_motion(ObMouseAction a, ObFrameContext context, + ObClient *c, guint state, guint button, + int x_root, int y_root, guint32 corner) { GSList *it; ObMouseBinding *b; @@ -144,7 +144,7 @@ static void fire_motion(ObMouseAction a, ObFrameContext context, ObClient *c, break; } /* if not bound, then nothing to do! */ - if (it == NULL) return; + if (it == NULL) return FALSE; for (it = b->actions[a]; it; it = it->next) { ObAction *act = it->data; @@ -168,6 +168,7 @@ static void fire_motion(ObMouseAction a, ObFrameContext context, ObClient *c, act->func(&act->data); } } + return TRUE; } static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch) @@ -194,7 +195,7 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) static int px, py; gboolean click = FALSE; gboolean dclick = FALSE; - + switch (e->type) { case ButtonPress: px = e->xbutton.x_root; @@ -202,12 +203,12 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) button = e->xbutton.button; state = e->xbutton.state; - fire_button(MouseAction_Press, context, + fire_button(OB_MOUSE_ACTION_PRESS, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, e->xbutton.y_root); - if (context == OB_FRAME_CONTEXT_CLIENT) { + 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! */ @@ -220,45 +221,49 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) int junk1, junk2; Window wjunk; guint ujunk, b, w, h; - XGetGeometry(ob_display, e->xbutton.window, - &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk); - if (e->xbutton.x >= (signed)-b && - e->xbutton.y >= (signed)-b && - e->xbutton.x < (signed)(w+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) { - dclick = TRUE; - lbutton = 0; + xerror_set_ignore(TRUE); + junk1 = XGetGeometry(ob_display, e->xbutton.window, + &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk); + xerror_set_ignore(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)) { + 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) { + dclick = TRUE; + lbutton = 0; + } else { + lbutton = button; + lwindow = e->xbutton.window; + } } else { - lbutton = button; - lwindow = e->xbutton.window; + lbutton = 0; + lwindow = None; } - } else { - lbutton = 0; - lwindow = None; } button = 0; state = 0; ltime = e->xbutton.time; } - fire_button(MouseAction_Release, context, + fire_button(OB_MOUSE_ACTION_RELEASE, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, e->xbutton.y_root); if (click) - fire_button(MouseAction_Click, context, + fire_button(OB_MOUSE_ACTION_CLICK, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, e->xbutton.y_root); if (dclick) - fire_button(MouseAction_DClick, context, + fire_button(OB_MOUSE_ACTION_DOUBLE_CLICK, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, @@ -300,7 +305,7 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) client->area.height + client->frame->size.top + client->frame->size.bottom); - fire_motion(MouseAction_Motion, context, + fire_motion(OB_MOUSE_ACTION_MOTION, context, client, state, button, px, py, corner); button = 0; state = 0; @@ -345,6 +350,13 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact, grab_all_clients(FALSE); + /* 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; @@ -357,11 +369,11 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact, return TRUE; } -void mouse_startup() +void mouse_startup(gboolean reconfig) { } -void mouse_shutdown() +void mouse_shutdown(gboolean reconfig) { grab_all_clients(FALSE); clearall();