X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=601c4f1bf5c16e3cdf84720c50b73a42c94c41b3;hb=261d3193c5258126fda8234a3305180066f0f939;hp=e8b6aec0b855956bb8d84ebecf7a8d16dff782c9;hpb=829a9fafd4516f8af21065195d43ded010f2e232;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index e8b6aec0..601c4f1b 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -18,6 +18,8 @@ typedef struct {
     GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */
 } ObMouseBinding;
 
+#define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \
+                               co == OB_FRAME_CONTEXT_FRAME : FALSE)
 #define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
                                 co == OB_FRAME_CONTEXT_DESKTOP : \
                                 co == OB_FRAME_CONTEXT_CLIENT)
@@ -38,7 +40,7 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
             int mode;
             unsigned int mask;
 
-            if (i == OB_FRAME_CONTEXT_FRAME) {
+            if (FRAME_CONTEXT(i, client)) {
                 win = client->frame->window;
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
@@ -51,7 +53,8 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
             } else continue;
 
             if (grab)
-                grab_button_full(b->button, b->state, win, mask, mode, None);
+                grab_button_full(b->button, b->state, win, mask, mode,
+                                 OB_CURSOR_NONE);
             else
                 ungrab_button(b->button, b->state, win);
         }
@@ -85,6 +88,7 @@ static void clearall()
             g_free(b);
         }
         g_slist_free(bound_contexts[i]);
+        bound_contexts[i] = NULL;
     }
 }
 
@@ -344,8 +348,6 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
 	}
     }
 
-    grab_all_clients(FALSE);
-
     /* when there are no modifiers in the binding, then the action cannot
        be interactive */
     if (!state && action->data.any.interactive) {
@@ -360,16 +362,15 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
     b->actions[mact] = g_slist_append(NULL, action);
     bound_contexts[context] = g_slist_append(bound_contexts[context], b);
 
-    grab_all_clients(TRUE);
-
     return TRUE;
 }
 
-void mouse_startup()
+void mouse_startup(gboolean reconfig)
 {
+    grab_all_clients(TRUE);
 }
 
-void mouse_shutdown()
+void mouse_shutdown(gboolean reconfig)
 {
     grab_all_clients(FALSE);
     clearall();