X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=517ed6e695c362ac6b3ae0d2fdfa2705a1e0e887;hb=e84fb1b052584b83947715d8ae4ec5d8afd201e7;hp=26aa85969d54fb09fb73a0126ef4d5a3db156a6d;hpb=9caa096ad95772741514b1a5cccf288f249e9b1e;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 26aa8596..517ed6e6 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-2007 Dana 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" @@ -9,6 +28,8 @@ #include "frame.h" #include "translate.h" #include "mouse.h" +#include "gettext.h" + #include typedef struct { @@ -46,6 +67,7 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, 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: @@ -70,23 +92,23 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, 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; mode = GrabModeAsync; mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask; } else if (CLIENT_CONTEXT(i, client)) { - win = client->frame->plate; + win = client->window; mode = GrabModeSync; /* this is handled in event */ mask = ButtonPressMask; /* can't catch more than this with Sync mode the release event is @@ -105,25 +127,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); @@ -135,12 +157,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, Time time) { 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; @@ -148,8 +170,7 @@ 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, state, button, x, y); + action_run_mouse(b->actions[a], c, context, state, button, x, y, time); return TRUE; } @@ -158,7 +179,7 @@ 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; @@ -177,11 +198,12 @@ void mouse_event(ObClient *client, XEvent *e) fire_binding(OB_MOUSE_ACTION_PRESS, context, client, e->xbutton.state, e->xbutton.button, - e->xbutton.x_root, e->xbutton.y_root); + e->xbutton.x_root, e->xbutton.y_root, + e->xbutton.time); 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; @@ -192,9 +214,10 @@ void mouse_event(ObClient *client, XEvent *e) 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); @@ -229,19 +252,22 @@ void mouse_event(ObClient *client, XEvent *e) fire_binding(OB_MOUSE_ACTION_RELEASE, context, client, e->xbutton.state, e->xbutton.button, - e->xbutton.x_root, e->xbutton.y_root); + e->xbutton.x_root, e->xbutton.y_root, + e->xbutton.time); if (click) fire_binding(OB_MOUSE_ACTION_CLICK, context, client, e->xbutton.state, e->xbutton.button, e->xbutton.x_root, - e->xbutton.y_root); + e->xbutton.y_root, + e->xbutton.time); 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); + e->xbutton.y_root, + e->xbutton.time); break; case MotionNotify: @@ -264,7 +290,7 @@ void mouse_event(ObClient *client, XEvent *e) break; fire_binding(OB_MOUSE_ACTION_MOTION, context, - client, state, button, px, py); + client, state, button, px, py, e->xmotion.time); button = 0; state = 0; } @@ -276,8 +302,8 @@ void mouse_event(ObClient *client, 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; @@ -285,25 +311,22 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact, GSList *it; if (!translate_button(buttonstr, &state, &button)) { - g_warning("invalid button '%s'", buttonstr); + g_message(_("Invalid button '%s' in pointer binding"), buttonstr); 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); + g_message(_("Invalid context '%s' in pointer binding"), 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 @@ -331,5 +354,5 @@ void mouse_startup(gboolean reconfig) void mouse_shutdown(gboolean reconfig) { grab_all_clients(FALSE); - clearall(); + mouse_unbind_all(); }