X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=18f35d3cd6e335d5478b6503b68d716c42c94011;hb=80a6f06c0a3d6de2c7d94066c5a9764b97a600af;hp=25068401362842542a6b9edbc49d295bab956c9a;hpb=78282959f970d28131e6aa8d66adce359aa145dc;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 25068401..18f35d3c 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -1,3 +1,22 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + mouse.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003 Ben 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "openbox.h" #include "config.h" #include "xerror.h" @@ -23,21 +42,64 @@ typedef struct { co == OB_FRAME_CONTEXT_DESKTOP : \ co == OB_FRAME_CONTEXT_CLIENT) -/* Array of GSList*s of PointerBinding*s. */ +/* Array of GSList*s of ObMouseBinding*s. */ static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS]; +ObFrameContext mouse_button_frame_context(ObFrameContext context, + guint button) +{ + GSList *it; + ObFrameContext x = context; + + for (it = bound_contexts[context]; it; it = g_slist_next(it)) { + ObMouseBinding *b = it->data; + + if (b->button == button) + return context; + } + + switch (context) { + case OB_FRAME_CONTEXT_NONE: + 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: + break; + case OB_FRAME_CONTEXT_BLCORNER: + case OB_FRAME_CONTEXT_BRCORNER: + x = OB_FRAME_CONTEXT_HANDLE; + break; + case OB_FRAME_CONTEXT_TLCORNER: + case OB_FRAME_CONTEXT_TRCORNER: + case OB_FRAME_CONTEXT_MAXIMIZE: + case OB_FRAME_CONTEXT_ALLDESKTOPS: + case OB_FRAME_CONTEXT_SHADE: + case OB_FRAME_CONTEXT_ICONIFY: + case OB_FRAME_CONTEXT_ICON: + case OB_FRAME_CONTEXT_CLOSE: + x = OB_FRAME_CONTEXT_TITLEBAR; + break; + case OB_FRAME_NUM_CONTEXTS: + g_assert_not_reached(); + } + + return x; +} + void mouse_grab_for_client(ObClient *client, gboolean grab) { - int i; + gint i; GSList *it; for (i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) - for (it = bound_contexts[i]; it != NULL; it = g_slist_next(it)) { + for (it = bound_contexts[i]; it; it = g_slist_next(it)) { /* grab/ungrab the button */ ObMouseBinding *b = it->data; Window win; - int mode; - unsigned int mask; + gint mode; + guint mask; if (FRAME_CONTEXT(i, client)) { win = client->frame->window; @@ -63,25 +125,25 @@ static void grab_all_clients(gboolean grab) { GList *it; - for (it = client_list; it != NULL; it = it->next) - mouse_grab_for_client(it->data, grab); + for (it = client_list; it; it = g_list_next(it)) + mouse_grab_for_client(it->data, grab); } -static void clearall() +void mouse_unbind_all() { - int i; + gint i; GSList *it; for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) { - for (it = bound_contexts[i]; it != NULL; it = it->next) { + for (it = bound_contexts[i]; it; it = g_slist_next(it)) { ObMouseBinding *b = it->data; - int j; + gint j; for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) { GSList *it; - for (it = b->actions[j]; it; it = it->next) - action_free(it->data); + for (it = b->actions[j]; it; it = g_slist_next(it)) + action_unref(it->data); g_slist_free(b->actions[j]); } g_free(b); @@ -93,12 +155,12 @@ static void clearall() static gboolean fire_binding(ObMouseAction a, ObFrameContext context, ObClient *c, guint state, - guint button, int x, int y) + guint button, gint x, gint y) { GSList *it; ObMouseBinding *b; - for (it = bound_contexts[context]; it != NULL; it = it->next) { + for (it = bound_contexts[context]; it; it = g_slist_next(it)) { b = it->data; if (b->state == state && b->button == button) break; @@ -106,23 +168,26 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context, /* if not bound, then nothing to do! */ if (it == NULL) return FALSE; - for (it = b->actions[a]; it; it = it->next) - action_run_mouse(it->data, c, context, state, button, x, y); + action_run_mouse(b->actions[a], c, context, state, button, x, y); return TRUE; } -void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) +void mouse_event(ObClient *client, XEvent *e) { static Time ltime; static guint button = 0, state = 0, lbutton = 0; - static Window lwindow = None; - static int px, py; + static gint px, py; + + ObFrameContext context; gboolean click = FALSE; gboolean dclick = FALSE; switch (e->type) { case ButtonPress: + context = frame_context(client, e->xany.window); + context = mouse_button_frame_context(context, e->xbutton.button); + px = e->xbutton.x_root; py = e->xbutton.y_root; button = e->xbutton.button; @@ -135,17 +200,21 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) if (CLIENT_CONTEXT(context, client)) { /* Replay the event, so it goes to the client*/ - XAllowEvents(ob_display, ReplayPointer, event_lasttime); + XAllowEvents(ob_display, ReplayPointer, event_curtime); /* Fall through to the release case! */ } else break; case ButtonRelease: + context = frame_context(client, e->xany.window); + context = mouse_button_frame_context(context, e->xbutton.button); + if (e->xbutton.button == button) { /* clicks are only valid if its released over the window */ - int junk1, junk2; + gint junk1, junk2; 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, &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk); @@ -197,6 +266,9 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) case MotionNotify: if (button) { + context = frame_context(client, e->xany.window); + context = mouse_button_frame_context(context, button); + if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold || ABS(e->xmotion.y_root - py) >= @@ -224,8 +296,8 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e) } } -gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact, - ObAction *action) +gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, + ObMouseAction mact, ObAction *action) { guint state, button; ObFrameContext context; @@ -237,21 +309,18 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact, return FALSE; } - contextstr = g_ascii_strdown(contextstr, -1); context = frame_context_from_string(contextstr); if (!context) { g_warning("invalid context '%s'", contextstr); - g_free(contextstr); return FALSE; } - g_free(contextstr); - for (it = bound_contexts[context]; it != NULL; it = it->next){ - b = it->data; - if (b->state == state && b->button == button) { + for (it = bound_contexts[context]; it; it = g_slist_next(it)) { + b = it->data; + if (b->state == state && b->button == button) { b->actions[mact] = g_slist_append(b->actions[mact], action); return TRUE; - } + } } /* when there are no modifiers in the binding, then the action cannot @@ -279,5 +348,5 @@ void mouse_startup(gboolean reconfig) void mouse_shutdown(gboolean reconfig) { grab_all_clients(FALSE); - clearall(); + mouse_unbind_all(); }