X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmouse%2Fmouse.c;h=e39720cbb022961b448d0bbf8e74ce4b00ec1c18;hb=d9bdc211920d12fe9964fbaca302121fa77d5118;hp=8df8e2a0552f19f9923e458dda989e5750782de1;hpb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;p=chaz%2Fopenbox

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index 8df8e2a0..e39720cb 100644
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -72,7 +72,7 @@ static void grab_for_client(Client *client, gboolean grab)
             } else continue;
 
             if (grab)
-                grab_button(b->button, b->state, win, mask, mode);
+                grab_button_full(b->button, b->state, win, mask, mode, None);
             else
                 ungrab_button(b->button, b->state, win);
         }
@@ -288,6 +288,18 @@ static void event(ObEvent *e, void *foo)
                 ABS(e->data.x.e->xmotion.y_root - py) >= threshold) {
                 guint32 corner;
 
+                context = frame_context(e->data.x.client,
+                                        e->data.x.e->xmotion.window);
+
+                /* You can't drag on buttons */
+                if (context == Context_Maximize ||
+                    context == Context_AllDesktops ||
+                    context == Context_Shade ||
+                    context == Context_Iconify ||
+                    context == Context_Icon ||
+                    context == Context_Close)
+                    break;
+
                 if (!e->data.x.client)
                     corner = prop_atoms.net_wm_moveresize_size_bottomright;
                 else
@@ -306,8 +318,6 @@ static void event(ObEvent *e, void *foo)
                                     e->data.x.client->area.height +
                                     e->data.x.client->frame->size.top +
                                     e->data.x.client->frame->size.bottom);
-                context = frame_context(e->data.x.client,
-                                        e->data.x.e->xmotion.window);
                 fire_motion(MouseAction_Motion, context,
                             e->data.x.client, state, button,
                             e->data.x.e->xmotion.x_root,