X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmouse%2Fmouse.c;h=4ed7b9dda22a05d93b75fdd7e65bcfbd761e77eb;hb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;hp=dfdde6af4eabc811deec7d1e6550ee27ed0cdb96;hpb=e4fe6da48c7ddb14639ab91f8532e89b16e72deb;p=chaz%2Fopenbox diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c index dfdde6af..4ed7b9dd 100644 --- a/plugins/mouse/mouse.c +++ b/plugins/mouse/mouse.c @@ -1,98 +1,179 @@ -#include "../../kernel/openbox.h" -#include "../../kernel/dispatch.h" -#include "../../kernel/action.h" -#include "../../kernel/client.h" -#include "../../kernel/frame.h" -#include "../../kernel/engine.h" +#include "kernel/openbox.h" +#include "kernel/dispatch.h" +#include "kernel/action.h" +#include "kernel/event.h" +#include "kernel/client.h" +#include "kernel/prop.h" +#include "kernel/grab.h" +#include "kernel/frame.h" +#include "parser/parse.h" #include "translate.h" #include "mouse.h" #include -/* GData of GSList*s of PointerBinding*s. */ -static GData *bound_contexts; +static int threshold; +static int dclicktime; +/* -struct foreach_grab_temp { - Client *client; - gboolean grab; -}; + + + + + -static void grab_button(Client *client, guint state, guint button, - GQuark context, gboolean grab) +*/ + +static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d) { - Window win; - int mode = GrabModeAsync; - unsigned int mask; - - if (context == g_quark_try_string("frame")) { - win = client->frame->window; - mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; - } else if (context == g_quark_try_string("client")) { - win = client->frame->plate; - mode = GrabModeSync; /* this is handled in pointer_event */ - mask = ButtonPressMask; /* can't catch more than this with Sync mode - the release event is manufactured in - pointer_fire */ - } else return; - - if (grab) - /* XXX grab all lock keys */ - XGrabButton(ob_display, button, state, win, FALSE, mask, mode, - GrabModeAsync, None, None); - else - /* XXX ungrab all lock keys */ - XUngrabButton(ob_display, button, state, win); + xmlNodePtr n, nbut, nact; + char *buttonstr; + char *contextstr; + MouseAction mact; + Action *action; + + if ((n = parse_find_node("dragThreshold", node))) + threshold = parse_int(doc, n); + if ((n = parse_find_node("doubleClickTime", node))) + dclicktime = parse_int(doc, n); + + n = parse_find_node("context", node); + while (n) { + if (!parse_attr_string("name", n, &contextstr)) + goto next_n; + nbut = parse_find_node("mousebind", n->xmlChildrenNode); + while (nbut) { + if (!parse_attr_string("button", nbut, &buttonstr)) + goto next_nbut; + if (parse_attr_contains("press", nbut, "action")) + mact = MouseAction_Press; + else if (parse_attr_contains("release", nbut, "action")) + mact = MouseAction_Release; + else if (parse_attr_contains("click", nbut, "action")) + mact = MouseAction_Click; + else if (parse_attr_contains("doubleclick", nbut,"action")) + mact = MouseAction_DClick; + else if (parse_attr_contains("drag", nbut, "action")) + mact = MouseAction_Motion; + else + goto next_nbut; + nact = parse_find_node("action", nbut->xmlChildrenNode); + while (nact) { + if ((action = action_parse(doc, nact))) { + /* validate that its okay for a mouse binding*/ + if (mact == MouseAction_Motion) { + if (action->func != action_moveresize || + action->data.moveresize.corner == + prop_atoms.net_wm_moveresize_move_keyboard || + action->data.moveresize.corner == + prop_atoms.net_wm_moveresize_size_keyboard) { + action_free(action); + action = NULL; + } + } else { + if (action->func == action_moveresize && + action->data.moveresize.corner != + prop_atoms.net_wm_moveresize_move_keyboard && + action->data.moveresize.corner != + prop_atoms.net_wm_moveresize_size_keyboard) { + action_free(action); + action = NULL; + } + } + if (action) + mbind(buttonstr, contextstr, mact, action); + } + nact = parse_find_node("action", nact->next); + } + g_free(buttonstr); + next_nbut: + nbut = parse_find_node("mousebind", nbut->next); + } + g_free(contextstr); + next_n: + n = parse_find_node("context", n->next); + } } -static void foreach_grab(GQuark key, gpointer data, gpointer user_data) +void plugin_setup_config() { - struct foreach_grab_temp *d = user_data; - GSList *it; - for (it = data; it != NULL; it = it->next) { - MouseBinding *b = it->data; - grab_button(d->client, b->state, b->button, key, d->grab); - } + threshold = 3; + dclicktime = 200; + parse_register("mouse", parse_xml, NULL); } - -static void grab_for_client(Client *client, gboolean grab) + +/* Array of GSList*s of PointerBinding*s. */ +static GSList *bound_contexts[NUM_CONTEXTS]; + +static void grab_for_client(ObClient *client, gboolean grab) { - struct foreach_grab_temp bt; - bt.client = client; - bt.grab = grab; - g_datalist_foreach(&bound_contexts, foreach_grab, &bt); + int i; + GSList *it; + + for (i = 0; i < NUM_CONTEXTS; ++i) + for (it = bound_contexts[i]; it != NULL; it = it->next) { + /* grab/ungrab the button */ + MouseBinding *b = it->data; + Window win; + int mode; + unsigned int mask; + + if (i == Context_Frame) { + win = client->frame->window; + mode = GrabModeAsync; + mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; + } else if (i == Context_Client) { + win = client->frame->plate; + mode = GrabModeSync; /* this is handled in event */ + mask = ButtonPressMask; /* can't catch more than this with Sync + mode the release event is + manufactured in event() */ + } else continue; + + if (grab) + grab_button_full(b->button, b->state, win, mask, mode, None); + else + ungrab_button(b->button, b->state, win); + } } static void grab_all_clients(gboolean grab) { - GSList *it; + GList *it; for (it = client_list; it != NULL; it = it->next) grab_for_client(it->data, grab); } -static void foreach_clear(GQuark key, gpointer data, gpointer user_data) +static void clearall() { + int i; GSList *it; - user_data = user_data; - for (it = data; it != NULL; it = it->next) { - int i; - - MouseBinding *b = it->data; - for (i = 0; i < NUM_MOUSEACTION; ++i) - if (b->action[i] != NULL) - action_free(b->action[i]); - g_free(b); + + for(i = 0; i < NUM_CONTEXTS; ++i) { + for (it = bound_contexts[i]; it != NULL; it = it->next) { + int j; + + MouseBinding *b = it->data; + for (j = 0; j < NUM_MOUSEACTION; ++j) { + GSList *it; + for (it = b->actions[j]; it; it = it->next) { + action_free(it->data); + } + g_slist_free(b->actions[j]); + } + g_free(b); + } + g_slist_free(bound_contexts[i]); } - g_slist_free(data); } -static void fire_button(MouseAction a, GQuark context, Client *c, guint state, - guint button) +static void fire_button(MouseAction a, Context context, ObClient *c, guint state, + guint button, int x, int y) { GSList *it; MouseBinding *b; - for (it = g_datalist_id_get_data(&bound_contexts, context); - it != NULL; it = it->next) { + for (it = bound_contexts[context]; it != NULL; it = it->next) { b = it->data; if (b->state == state && b->button == button) break; @@ -100,27 +181,31 @@ static void fire_button(MouseAction a, GQuark context, Client *c, guint state, /* if not bound, then nothing to do! */ if (it == NULL) return; - if (b->action[a] != NULL && b->action[a]->func != NULL) { - b->action[a]->data.any.c = c; + for (it = b->actions[a]; it; it = it->next) { + Action *act = it->data; + if (act->func != NULL) { + act->data.any.c = c; - g_assert(!(b->action[a]->func == action_move || - b->action[a]->func == action_resize)); + g_assert(act->func != action_moveresize); + + if (act->func == action_showmenu) { + act->data.showmenu.x = x; + act->data.showmenu.y = y; + } - b->action[a]->func(&b->action[a]->data); + act->func(&act->data); + } } } -/* corner should be the opposite corner of the window in which the pointer - clicked, Corner_TopLeft if a good default if there is no client */ -static void fire_motion(MouseAction a, GQuark context, Client *c, guint state, - guint button, int cx, int cy, int cw, int ch, - int dx, int dy, gboolean final, Corner corner) +static void fire_motion(MouseAction a, Context context, ObClient *c, + guint state, guint button, int x_root, int y_root, + guint32 corner) { GSList *it; MouseBinding *b; - for (it = g_datalist_id_get_data(&bound_contexts, context); - it != NULL; it = it->next) { + for (it = bound_contexts[context]; it != NULL; it = it->next) { b = it->data; if (b->state == state && b->button == button) break; @@ -128,64 +213,54 @@ static void fire_motion(MouseAction a, GQuark context, Client *c, guint state, /* if not bound, then nothing to do! */ if (it == NULL) return; - if (b->action[a] != NULL && b->action[a]->func != NULL) { - b->action[a]->data.any.c = c; - - if (b->action[a]->func == action_move) { - b->action[a]->data.move.x = cx + dx; - b->action[a]->data.move.y = cy + dy; - b->action[a]->data.move.final = final; - } else if (b->action[a]->func == action_resize) { - b->action[a]->data.resize.corner = corner; - switch (corner) { - case Corner_TopLeft: - b->action[a]->data.resize.x = cw + dx; - b->action[a]->data.resize.y = ch + dy; - break; - case Corner_TopRight: - b->action[a]->data.resize.x = cw - dx; - b->action[a]->data.resize.y = ch + dy; - break; - case Corner_BottomLeft: - b->action[a]->data.resize.x = cw + dx; - b->action[a]->data.resize.y = ch - dy; - break; - case Corner_BottomRight: - b->action[a]->data.resize.x = cw - dx; - b->action[a]->data.resize.y = ch - dy; - break; - } - b->action[a]->data.resize.final = final; + for (it = b->actions[a]; it; it = it->next) { + Action *act = it->data; + if (act->func != NULL) { + act->data.any.c = c; + + if (act->func == action_moveresize) { + act->data.moveresize.x = x_root; + act->data.moveresize.y = y_root; + act->data.moveresize.button = button; + if (!(act->data.moveresize.corner == + prop_atoms.net_wm_moveresize_move || + act->data.moveresize.corner == + prop_atoms.net_wm_moveresize_move_keyboard || + act->data.moveresize.corner == + prop_atoms.net_wm_moveresize_size_keyboard)) + act->data.moveresize.corner = corner; + } else + g_assert_not_reached(); + + act->func(&act->data); } - b->action[a]->func(&b->action[a]->data); } } -static Corner pick_corner(int x, int y, int cx, int cy, int cw, int ch) +static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch) { if (x - cx < cw / 2) { if (y - cy < ch / 2) - return Corner_BottomRight; + return prop_atoms.net_wm_moveresize_size_topleft; else - return Corner_TopRight; + return prop_atoms.net_wm_moveresize_size_bottomleft; } else { if (y - cy < ch / 2) - return Corner_BottomLeft; + return prop_atoms.net_wm_moveresize_size_topright; else - return Corner_TopLeft; + return prop_atoms.net_wm_moveresize_size_bottomright; } } static void event(ObEvent *e, void *foo) { static Time ltime; - static int px, py, cx, cy, cw, ch, dx, dy; - static guint button = 0, lbutton = 0; - static gboolean drag = FALSE; - static Corner corner = Corner_TopLeft; + static guint button = 0, state = 0, lbutton = 0; + static int px, py; gboolean click = FALSE; gboolean dclick = FALSE; - + Context context; + switch (e->type) { case Event_Client_Mapped: grab_for_client(e->data.c.client, TRUE); @@ -196,90 +271,116 @@ static void event(ObEvent *e, void *foo) break; case Event_X_ButtonPress: - if (!button) { - if (e->data.x.client == NULL) - corner = Corner_TopLeft; - else { - cx = e->data.x.client->frame->area.x; - cy = e->data.x.client->frame->area.y; - cw = e->data.x.client->frame->area.width; - ch = e->data.x.client->frame->area.height; - px = e->data.x.e->xbutton.x_root; - py = e->data.x.e->xbutton.y_root; - corner = pick_corner(px, py, cx, cy, cw, ch); - button = e->data.x.e->xbutton.button; - } - } - fire_button(MouseAction_Press, - engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window), + context = frame_context(e->data.x.client, + e->data.x.e->xbutton.window); + + px = e->data.x.e->xbutton.x_root; + py = e->data.x.e->xbutton.y_root; + button = e->data.x.e->xbutton.button; + state = e->data.x.e->xbutton.state; + + fire_button(MouseAction_Press, context, e->data.x.client, e->data.x.e->xbutton.state, - e->data.x.e->xbutton.button); - break; + e->data.x.e->xbutton.button, + e->data.x.e->xbutton.x_root, e->data.x.e->xbutton.y_root); + + if (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 + break; case Event_X_ButtonRelease: + context = frame_context(e->data.x.client, + e->data.x.e->xbutton.window); if (e->data.x.e->xbutton.button == button) { - /* end drags */ - if (drag) { - fire_motion(MouseAction_Motion, - engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window), - e->data.x.client, e->data.x.e->xbutton.state, - e->data.x.e->xbutton.button, - cx, cy, cw, ch, dx, dy, TRUE, corner); - } - /* clicks are only valid if its released over the window */ - if (e->data.x.e->xbutton.x >= 0 && e->data.x.e->xbutton.y >= 0) { - int junk; - Window wjunk; - guint ujunk, w, h; - XGetGeometry(ob_display, e->data.x.e->xbutton.window, - &wjunk, &junk, &junk, &w, &h, &ujunk, &ujunk); - if (e->data.x.e->xbutton.x < (signed)w && - e->data.x.e->xbutton.y < (signed)h) { - click =TRUE; - /* double clicks happen if there were 2 in a row! */ - if (lbutton == button && - e->data.x.e->xbutton.time - 300 <= ltime) - dclick = TRUE; - } - lbutton = button; - } else + int junk1, junk2; + Window wjunk; + guint ujunk, b, w, h; + XGetGeometry(ob_display, e->data.x.e->xbutton.window, + &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk); + if (e->data.x.e->xbutton.x >= (signed)-b && + e->data.x.e->xbutton.y >= (signed)-b && + e->data.x.e->xbutton.x < (signed)(w+b) && + e->data.x.e->xbutton.y < (signed)(h+b)) { + click = TRUE; + /* double clicks happen if there were 2 in a row! */ + if (lbutton == button && + e->data.x.e->xbutton.time - dclicktime <= ltime) { + dclick = TRUE; + lbutton = 0; + } else + lbutton = button; + } else lbutton = 0; button = 0; + state = 0; ltime = e->data.x.e->xbutton.time; } - fire_button(MouseAction_Press, - engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window), + fire_button(MouseAction_Release, context, e->data.x.client, e->data.x.e->xbutton.state, - e->data.x.e->xbutton.button); + e->data.x.e->xbutton.button, + e->data.x.e->xbutton.x_root, e->data.x.e->xbutton.y_root); if (click) - fire_button(MouseAction_Click, - engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window), + fire_button(MouseAction_Click, context, e->data.x.client, e->data.x.e->xbutton.state, - e->data.x.e->xbutton.button); + e->data.x.e->xbutton.button, + e->data.x.e->xbutton.x_root, + e->data.x.e->xbutton.y_root); if (dclick) - fire_button(MouseAction_DClick, - engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window), + fire_button(MouseAction_DClick, context, e->data.x.client, e->data.x.e->xbutton.state, - e->data.x.e->xbutton.button); + e->data.x.e->xbutton.button, + e->data.x.e->xbutton.x_root, + e->data.x.e->xbutton.y_root); break; case Event_X_MotionNotify: if (button) { - drag = TRUE; - dx = e->data.x.e->xmotion.x_root - px; - dy = e->data.x.e->xmotion.y_root - py; - fire_motion(MouseAction_Motion, - engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window), - e->data.x.client, e->data.x.e->xmotion.state, - button, cx, cy, cw, ch, dx, dy, FALSE, corner); + if (ABS(e->data.x.e->xmotion.x_root - px) >= threshold || + ABS(e->data.x.e->xmotion.y_root - py) >= threshold) { + guint32 corner; + + context = frame_context(e->data.x.client, + e->data.x.e->xmotion.window); + + /* You can't drag on buttons */ + if (context == Context_Maximize || + context == Context_AllDesktops || + context == Context_Shade || + context == Context_Iconify || + context == Context_Icon || + context == Context_Close) + break; + + if (!e->data.x.client) + corner = prop_atoms.net_wm_moveresize_size_bottomright; + else + corner = + pick_corner(e->data.x.e->xmotion.x_root, + e->data.x.e->xmotion.y_root, + e->data.x.client->frame->area.x, + e->data.x.client->frame->area.y, + /* use the client size because the frame + can be differently sized (shaded + windows) and we want this based on the + clients size */ + e->data.x.client->area.width + + e->data.x.client->frame->size.left + + e->data.x.client->frame->size.right, + e->data.x.client->area.height + + e->data.x.client->frame->size.top + + e->data.x.client->frame->size.bottom); + fire_motion(MouseAction_Motion, context, + e->data.x.client, state, button, + e->data.x.e->xmotion.x_root, + e->data.x.e->xmotion.y_root, corner); + button = 0; + state = 0; + } } break; @@ -288,36 +389,32 @@ static void event(ObEvent *e, void *foo) } } -static gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact, - Action *action) +gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact, + Action *action) { guint state, button; - GQuark context; + Context context; MouseBinding *b; GSList *it; - guint i; if (!translate_button(buttonstr, &state, &button)) { - g_warning("invalid button"); + g_warning("invalid button '%s'", buttonstr); return FALSE; } - context = g_quark_try_string(contextstr); + contextstr = g_ascii_strdown(contextstr, -1); + context = frame_context_from_string(contextstr); if (!context) { - g_warning("invalid context"); + g_warning("invalid context '%s'", contextstr); + g_free(contextstr); return FALSE; } + g_free(contextstr); - for (it = g_datalist_id_get_data(&bound_contexts, context); - it != NULL; it = it->next){ + for (it = bound_contexts[context]; it != NULL; it = it->next){ b = it->data; if (b->state == state && b->button == button) { - /* already bound */ - if (b->action[mact] != NULL) { - g_warning("duplicate binding"); - return FALSE; - } - b->action[mact] = action; + b->actions[mact] = g_slist_append(b->actions[mact], action); return TRUE; } } @@ -325,55 +422,22 @@ static gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact, grab_all_clients(FALSE); /* add the binding */ - b = g_new(MouseBinding, 1); + b = g_new0(MouseBinding, 1); b->state = state; b->button = button; - for (i = 0; i < NUM_MOUSEACTION; ++i) - b->action[i] = NULL; - b->action[mact] = action; - g_datalist_id_set_data(&bound_contexts, context, - g_slist_append(g_datalist_id_get_data(&bound_contexts, context), b)); + b->actions[mact] = g_slist_append(NULL, action); + bound_contexts[context] = g_slist_append(bound_contexts[context], b); grab_all_clients(TRUE); return TRUE; } -static void binddef() -{ - Action *a; - - /* When creating an Action struct, all of the data elements in the - appropriate struct need to be set, except the Client*, which will be set - at call-time when then action function is used. - - For action_move and action_resize, the 'x', 'y', and 'final' data - elements should not be set, as they are set at call-time. - */ - - a = action_new(action_move); - mbind("1", "titlebar", MouseAction_Motion, a); - a = action_new(action_move); - mbind("1", "handle", MouseAction_Motion, a); - a = action_new(action_move); - mbind("A-1", "frame", MouseAction_Motion, a); - - a = action_new(action_resize); - mbind("1", "blcorner", MouseAction_Motion, a); - a = action_new(action_resize); - mbind("1", "brcorner", MouseAction_Motion, a); - a = action_new(action_resize); - mbind("A-3", "frame", MouseAction_Motion, a); -} - void plugin_startup() { dispatch_register(Event_Client_Mapped | Event_Client_Destroy | Event_X_ButtonPress | Event_X_ButtonRelease | Event_X_MotionNotify, (EventHandler)event, NULL); - - /* XXX parse a config */ - binddef(); } void plugin_shutdown() @@ -381,5 +445,5 @@ void plugin_shutdown() dispatch_register(0, (EventHandler)event, NULL); grab_all_clients(FALSE); - g_datalist_foreach(&bound_contexts, foreach_clear, NULL); + clearall(); }