grab root mouse bindings on desktop windows also, since they are conceptually the desktop.

2 files changed, 21 insertions, 4 deletions

diff --git a/openbox/frame.c b/openbox/frame.c
index 4ecc7b61..0d5ddb2e 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -640,11 +640,24 @@ ObFrameContext frame_context(ObClient *client, Window win)
 
     if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
-    if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
+    if (win == client->window) {
+        /* conceptually, this is the root window, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_ROOT;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
 
     self = client->frame;
+    if (win == self->plate) {
+        /* conceptually, this is the root window, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_ROOT;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
+
     if (win == self->window)   return OB_FRAME_CONTEXT_FRAME;
-    if (win == self->plate)    return OB_FRAME_CONTEXT_CLIENT;
     if (win == self->title)    return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->label)    return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->handle)   return OB_FRAME_CONTEXT_HANDLE;
diff --git a/openbox/mouse.c b/openbox/mouse.c
index bb768928..93d00784 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -17,6 +17,10 @@ typedef struct {
     GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */
 } ObMouseBinding;
 
+#define CLIENT_CONTEXT(co, cl) (co == OB_FRAME_CONTEXT_CLIENT || \
+                                (co == OB_FRAME_CONTEXT_ROOT && \
+                                 cl->type == OB_CLIENT_TYPE_DESKTOP))
+
 /* Array of GSList*s of PointerBinding*s. */
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
 
@@ -37,7 +41,7 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
                 win = client->frame->window;
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
-            } else if (i == OB_FRAME_CONTEXT_CLIENT) {
+            } else if (CLIENT_CONTEXT(i, client)) {
                 win = client->frame->plate;
                 mode = GrabModeSync; /* this is handled in event */
                 mask = ButtonPressMask; /* can't catch more than this with Sync
@@ -211,7 +215,7 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
                     e->xbutton.button,
                     e->xbutton.x_root, e->xbutton.y_root);
 
-        if (context == OB_FRAME_CONTEXT_CLIENT) {
+        if (CLIENT_CONTEXT(context, client)) {
             /* Replay the event, so it goes to the client*/
             XAllowEvents(ob_display, ReplayPointer, event_lasttime);
             /* Fall through to the release case! */