X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=9edda8ebf96aa05e7469ebe203feb6ac2f7cd2af;hb=af7280b45d65480cf81f1262494b78df98a80681;hp=9a5ab53bc4be23b652c2e30c85f6229a2590b783;hpb=174de91c343dfbdfe866e566393bf4790ae22596;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 9a5ab53b..9edda8eb 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mouse.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   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
@@ -27,6 +28,8 @@
 #include "frame.h"
 #include "translate.h"
 #include "mouse.h"
+#include "gettext.h"
+
 #include <glib.h>
 
 typedef struct {
@@ -125,7 +128,7 @@ static void grab_all_clients(gboolean grab)
     GList *it;
 
     for (it = client_list; it; it = g_list_next(it))
-	mouse_grab_for_client(it->data, grab);
+        mouse_grab_for_client(it->data, grab);
 }
 
 void mouse_unbind_all()
@@ -154,7 +157,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;
@@ -167,7 +170,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;
 }
 
@@ -176,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 gint px, py;
+    static gint px, py, pwx = -1, pwy = -1;
 
     ObFrameContext context;
     gboolean click = FALSE;
@@ -184,30 +187,37 @@ 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 (pwx == -1) pwx = e->xbutton.x;
+        if (pwy == -1) 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 (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);
+        /* 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);
 
+        pwx = pwy = -1;
+
         if (e->xbutton.button == button) {
             /* clicks are only valid if its released over the window */
             gint junk1, junk2;
@@ -248,24 +258,27 @@ 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) >=
@@ -283,7 +296,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;
             }
@@ -304,22 +317,22 @@ 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;
     }
 
     for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
-	b = it->data;
-	if (b->state == state && b->button == button) {
+        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