X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=78e25d8966275c23d9d8f1b384fa86328ce798ca;hb=3addcd8bb9c65db54c43d6c829c2b041e4959ca9;hp=18f35d3cd6e335d5478b6503b68d716c42c94011;hpb=78af5d15e9dd94959786811e9eddfa1e5024067c;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index 18f35d3c..78e25d89 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -2,7 +2,7 @@ mouse.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + 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 @@ -28,6 +28,8 @@ #include "frame.h" #include "translate.h" #include "mouse.h" +#include "gettext.h" + #include typedef struct { @@ -63,16 +65,17 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context, 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_BOTTOM: case OB_FRAME_CONTEXT_BLCORNER: case OB_FRAME_CONTEXT_BRCORNER: - x = OB_FRAME_CONTEXT_HANDLE; + x = OB_FRAME_CONTEXT_BOTTOM; break; case OB_FRAME_CONTEXT_TLCORNER: case OB_FRAME_CONTEXT_TRCORNER: + case OB_FRAME_CONTEXT_TOP: case OB_FRAME_CONTEXT_MAXIMIZE: case OB_FRAME_CONTEXT_ALLDESKTOPS: case OB_FRAME_CONTEXT_SHADE: @@ -155,7 +158,7 @@ void mouse_unbind_all() static gboolean fire_binding(ObMouseAction a, ObFrameContext context, ObClient *c, guint state, - guint button, gint x, gint y) + guint button, gint x, gint y, Time time) { GSList *it; ObMouseBinding *b; @@ -168,7 +171,7 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context, /* if not bound, then nothing to do! */ if (it == NULL) return FALSE; - action_run_mouse(b->actions[a], c, context, state, button, x, y); + action_run_mouse(b->actions[a], c, context, state, button, x, y, time); return TRUE; } @@ -177,7 +180,7 @@ void mouse_event(ObClient *client, XEvent *e) static Time ltime; static guint button = 0, state = 0, lbutton = 0; static Window lwindow = None; - static gint px, py; + static gint px, py, pwx = -1, pwy = -1; ObFrameContext context; gboolean click = FALSE; @@ -185,18 +188,27 @@ void mouse_event(ObClient *client, XEvent *e) switch (e->type) { case ButtonPress: - context = frame_context(client, e->xany.window); + context = frame_context(client, e->xbutton.window, + e->xbutton.x, e->xbutton.y); context = mouse_button_frame_context(context, e->xbutton.button); px = e->xbutton.x_root; py = e->xbutton.y_root; + if (!button) pwx = e->xbutton.x; + if (!button) pwy = e->xbutton.y; button = e->xbutton.button; state = e->xbutton.state; 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 the bindings grab the pointer, there won't be a ButtonRelease + event for us */ + if (grab_on_pointer()) + button = 0; if (CLIENT_CONTEXT(context, client)) { /* Replay the event, so it goes to the client*/ @@ -206,9 +218,13 @@ void mouse_event(ObClient *client, XEvent *e) break; case ButtonRelease: - context = frame_context(client, e->xany.window); + /* use where the press occured in the window */ + context = frame_context(client, e->xbutton.window, pwx, pwy); context = mouse_button_frame_context(context, e->xbutton.button); + if (e->xbutton.button == button) + pwx = pwy = -1; + if (e->xbutton.button == button) { /* clicks are only valid if its released over the window */ gint junk1, junk2; @@ -249,30 +265,32 @@ 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: if (button) { - context = frame_context(client, e->xany.window); + context = frame_context(client, e->xmotion.window, pwx, pwy); context = mouse_button_frame_context(context, button); - if (ABS(e->xmotion.x_root - px) >= - config_mouse_threshold || - ABS(e->xmotion.y_root - py) >= - config_mouse_threshold) { + if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold || + ABS(e->xmotion.y_root - py) >= config_mouse_threshold) { /* You can't drag on buttons */ if (context == OB_FRAME_CONTEXT_MAXIMIZE || @@ -284,7 +302,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; } @@ -305,13 +323,13 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, GSList *it; if (!translate_button(buttonstr, &state, &button)) { - g_warning("invalid button '%s'", buttonstr); + g_message(_("Invalid button '%s' in mouse binding"), buttonstr); return FALSE; } context = frame_context_from_string(contextstr); if (!context) { - g_warning("invalid context '%s'", contextstr); + g_message(_("Invalid context '%s' in mouse binding"), contextstr); return FALSE; }