X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmouse%2Fmouse.c;h=fef8b07ac6b78caebcd90f96eeed4ca765a8a68d;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=7d60869f971e0ad24cf299330141db174b1429d4;hpb=80c7f14520694771c08b9564487ba65e7dadd75e;p=chaz%2Fopenbox diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c index 7d60869f..fef8b07a 100644 --- a/plugins/mouse/mouse.c +++ b/plugins/mouse/mouse.c @@ -1,98 +1,117 @@ -#include "../../kernel/openbox.h" -#include "../../kernel/dispatch.h" -#include "../../kernel/action.h" -#include "../../kernel/client.h" -#include "../../kernel/frame.h" -#include "../../kernel/grab.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/parse.h" +#include "kernel/frame.h" #include "translate.h" #include "mouse.h" +#include "mouseparse.h" #include -void plugin_setup_config() +static int threshold; +static int dclicktime; + +static void parse_assign(char *name, ParseToken *value) { + if (!g_ascii_strcasecmp(name, "dragthreshold")) { + if (value->type != TOKEN_INTEGER) + yyerror("invalid value"); + else { + if (value->data.integer >= 0) + threshold = value->data.integer; + } + } else if (!g_ascii_strcasecmp(name, "doubleclicktime")) { + if (value->type != TOKEN_INTEGER) + yyerror("invalid value"); + else { + if (value->data.integer >= 0) + dclicktime = value->data.integer; + } + } else + yyerror("invalid option"); + parse_free_token(value); } -static int drag_threshold = 3; - -/* GData of GSList*s of PointerBinding*s. */ -static GData *bound_contexts; - -struct foreach_grab_temp { - Client *client; - gboolean grab; -}; - -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) { - /* grab/ungrab the button */ - MouseBinding *b = it->data; - Window win; - int mode; - unsigned int mask; - - if (key == g_quark_try_string("frame")) { - win = d->client->frame->window; - mode = GrabModeAsync; - mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; - } else if (key == g_quark_try_string("client")) { - win = d->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 return; - - if (d->grab) - grab_button(b->button, b->state, win, mask, mode); - else - ungrab_button(b->button, b->state, win); - } + threshold = 3; + dclicktime = 200; + parse_reg_section("mouse", mouseparse, parse_assign); } - + +/* Array of GSList*s of PointerBinding*s. */ +static GSList *bound_contexts[NUM_CONTEXTS]; + static void grab_for_client(Client *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(b->button, b->state, win, mask, mode); + 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) + if (b->action[j] != NULL) + action_free(b->action[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, Client *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; @@ -103,24 +122,25 @@ static void fire_button(MouseAction a, GQuark context, Client *c, guint state, if (b->action[a] != NULL && b->action[a]->func != NULL) { b->action[a]->data.any.c = c; - g_assert(!(b->action[a]->func == action_move || - b->action[a]->func == action_resize)); + g_assert(b->action[a]->func != action_moveresize); + + if (b->action[a]->func == action_showmenu) { + b->action[a]->data.showmenu.x = x; + b->action[a]->data.showmenu.y = y; + } b->action[a]->func(&b->action[a]->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, Client *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; @@ -131,62 +151,48 @@ static void fire_motion(MouseAction a, GQuark context, Client *c, guint state, 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; - } + if (b->action[a]->func == action_moveresize) { + b->action[a]->data.moveresize.x = x_root; + b->action[a]->data.moveresize.y = y_root; + b->action[a]->data.moveresize.button = button; + if (!(b->action[a]->data.moveresize.corner == + prop_atoms.net_wm_moveresize_move || + b->action[a]->data.moveresize.corner == + prop_atoms.net_wm_moveresize_move_keyboard || + b->action[a]->data.moveresize.corner == + prop_atoms.net_wm_moveresize_size_keyboard)) + b->action[a]->data.moveresize.corner = corner; + } else + g_assert_not_reached(); + 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; - GQuark context; - + Context context; + switch (e->type) { case Event_Client_Mapped: grab_for_client(e->data.c.client, TRUE); @@ -197,95 +203,101 @@ static void event(ObEvent *e, void *foo) break; case Event_X_ButtonPress: + context = frame_context(e->data.x.client, + e->data.x.e->xbutton.window); + if (!button) { - if (e->data.x.client != NULL) { - 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); - } + 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; } - context = engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window); fire_button(MouseAction_Press, 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 (context == g_quark_try_string("client")) { + if (context == Context_Client) { /* Replay the event, so it goes to the client*/ - XAllowEvents(ob_display, ReplayPointer, CurrentTime); + XAllowEvents(ob_display, ReplayPointer, event_lasttime); /* Fall through to the release case! */ } else break; case Event_X_ButtonRelease: - context = 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); if (e->data.x.e->xbutton.button == button) { - /* end drags */ - if (drag) { - fire_motion(MouseAction_Motion, context, - e->data.x.client, e->data.x.e->xbutton.state, - e->data.x.e->xbutton.button, - cx, cy, cw, ch, dx, dy, TRUE, corner); - drag = FALSE; - - lbutton = 0; - } else { - /* 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 + /* clicks are only valid if its released over the window */ + int junk; + Window wjunk; + guint ujunk, b, w, h; + XGetGeometry(ob_display, e->data.x.e->xbutton.window, + &wjunk, &junk, &junk, &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, context, + 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, 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, 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) { - dx = e->data.x.e->xmotion.x_root - px; - dy = e->data.x.e->xmotion.y_root - py; - if (ABS(dx) >= drag_threshold || ABS(dy) >= drag_threshold) - drag = TRUE; - if (drag) { - context = engine_get_context(e->data.x.client, - e->data.x.e->xbutton.window); + if (ABS(e->data.x.e->xmotion.x_root - px) >= threshold || + ABS(e->data.x.e->xmotion.y_root - py) >= threshold) { + guint32 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); + context = frame_context(e->data.x.client, + e->data.x.e->xmotion.window); fire_motion(MouseAction_Motion, context, - e->data.x.client, e->data.x.e->xmotion.state, - button, cx, cy, cw, ch, dx, dy, FALSE, corner); + 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; @@ -295,28 +307,29 @@ 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 */ @@ -332,118 +345,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)); + 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); - - a = action_new(action_focus); - mbind("1", "titlebar", MouseAction_Press, a); - a = action_new(action_focus); - mbind("1", "handle", MouseAction_Press, a); - a = action_new(action_raise); - mbind("1", "titlebar", MouseAction_Click, a); - a = action_new(action_raise); - mbind("1", "handle", MouseAction_Click, a); - a = action_new(action_lower); - mbind("2", "titlebar", MouseAction_Press, a); - a = action_new(action_lower); - mbind("2", "handle", MouseAction_Press, a); - a = action_new(action_raise); - mbind("A-1", "frame", MouseAction_Click, a); - a = action_new(action_lower); - mbind("A-3", "frame", MouseAction_Click, a); - - a = action_new(action_focus); - mbind("1", "client", MouseAction_Press, a); - - a = action_new(action_toggle_shade); - mbind("1", "titlebar", MouseAction_DClick, a); - a = action_new(action_shade); - mbind("4", "titlebar", MouseAction_Press, a); - a = action_new(action_unshade); - mbind("5", "titlebar", MouseAction_Click, a); - - a = action_new(action_toggle_maximize_full); - mbind("1", "maximize", MouseAction_Click, a); - a = action_new(action_toggle_maximize_vert); - mbind("2", "maximize", MouseAction_Click, a); - a = action_new(action_toggle_maximize_horz); - mbind("3", "maximize", MouseAction_Click, a); - a = action_new(action_iconify); - mbind("1", "iconify", MouseAction_Click, a); - a = action_new(action_close); - mbind("1", "icon", MouseAction_DClick, a); - a = action_new(action_close); - mbind("1", "close", MouseAction_Click, a); - a = action_new(action_kill); - mbind("2", "close", MouseAction_Click, a); - a = action_new(action_toggle_omnipresent); - mbind("1", "alldesktops", MouseAction_Click, a); - - a = action_new(action_next_desktop); - a->data.nextprevdesktop.wrap = TRUE; - mbind("4", "root", MouseAction_Click, a); - a = action_new(action_previous_desktop); - a->data.nextprevdesktop.wrap = TRUE; - mbind("5", "root", MouseAction_Click, a); - a = action_new(action_next_desktop); - a->data.nextprevdesktop.wrap = TRUE; - mbind("A-4", "root", MouseAction_Click, a); - a = action_new(action_previous_desktop); - a->data.nextprevdesktop.wrap = TRUE; - mbind("A-5", "root", MouseAction_Click, a); - a = action_new(action_next_desktop); - a->data.nextprevdesktop.wrap = TRUE; - mbind("A-4", "frame", MouseAction_Click, a); - a = action_new(action_previous_desktop); - a->data.nextprevdesktop.wrap = TRUE; - mbind("A-5", "frame", MouseAction_Click, 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() @@ -451,5 +368,5 @@ void plugin_shutdown() dispatch_register(0, (EventHandler)event, NULL); grab_all_clients(FALSE); - g_datalist_foreach(&bound_contexts, foreach_clear, NULL); + clearall(); }