make binding fallback for mouse clicks less restrictive. if you dont have a binding...

[chaz/openbox] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 27172d525c614c7933b297d1f9108e3947c7edd6..a96b02b9ca586e73af98009fedda7bd5126d965d 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -48,7 +48,8 @@ typedef struct {
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
 
 ObFrameContext mouse_button_frame_context(ObFrameContext context,
-                                          guint button)
+                                          guint button,
+                                          guint state)
 {
     GSList *it;
     ObFrameContext x = context;
@@ -56,7 +57,7 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context,
     for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
         ObMouseBinding *b = it->data;
 
-        if (b->button == button)
+        if (b->button == button && b->state == state)
             return context;
     }
 
@@ -65,16 +66,19 @@ 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:
+    case OB_FRAME_CONTEXT_LEFT:
+    case OB_FRAME_CONTEXT_RIGHT:
         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:
@@ -87,7 +91,11 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context,
         g_assert_not_reached();
     }
 
-    return x;
+    /* allow for multiple levels of fall-through */
+    if (x != context)
+        return mouse_button_frame_context(x, button, state);
+    else
+        return x;
 }
 
 void mouse_grab_for_client(ObClient *client, gboolean grab)
@@ -179,7 +187,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;
@@ -187,11 +195,15 @@ void mouse_event(ObClient *client, XEvent *e)
 
     switch (e->type) {
     case ButtonPress:
-        context = frame_context(client, e->xany.window);
-        context = mouse_button_frame_context(context, e->xbutton.button);
+        context = frame_context(client, e->xbutton.window,
+                                e->xbutton.x, e->xbutton.y);
+        context = mouse_button_frame_context(context, e->xbutton.button,
+                                             e->xbutton.state);
 
         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;
 
@@ -201,6 +213,11 @@ void mouse_event(ObClient *client, XEvent *e)
                      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*/
             XAllowEvents(ob_display, ReplayPointer, event_curtime);
@@ -209,8 +226,13 @@ void mouse_event(ObClient *client, XEvent *e)
             break;
 
     case ButtonRelease:
-        context = frame_context(client, e->xany.window);
-        context = mouse_button_frame_context(context, e->xbutton.button);
+        /* 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,
+                                             e->xbutton.state);
+
+        if (e->xbutton.button == button)
+            pwx = pwy = -1;
 
         if (e->xbutton.button == button) {
             /* clicks are only valid if its released over the window */
@@ -252,7 +274,8 @@ 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,
@@ -272,13 +295,11 @@ void mouse_event(ObClient *client, XEvent *e)
 
     case MotionNotify:
         if (button) {
-            context = frame_context(client, e->xany.window);
-            context = mouse_button_frame_context(context, button);
+            context = frame_context(client, e->xmotion.window, pwx, pwy);
+            context = mouse_button_frame_context(context, button, state);
 
-            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 ||
@@ -311,13 +332,13 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
     GSList *it;
 
     if (!translate_button(buttonstr, &state, &button)) {
-        g_message(_("Invalid button '%s' in pointer binding"), buttonstr);
+        g_message(_("Invalid button '%s' in mouse binding"), buttonstr);
         return FALSE;
     }
 
     context = frame_context_from_string(contextstr);
     if (!context) {
-        g_message(_("Invalid context '%s' in pointer binding"), contextstr);
+        g_message(_("Invalid context '%s' in mouse binding"), contextstr);
         return FALSE;
     }