X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=93d00784fb7232638f616795d8f7c1ce4c876dfc;hb=6375df675f01dd1a9bc625e95d799b9cb40bcda3;hp=bb7689281f06c60129be6e430ad0dc4385d041bd;hpb=1045079482453424f8320de99639390e3020eb72;p=chaz%2Fopenbox

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! */