X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=e8b6aec0b855956bb8d84ebecf7a8d16dff782c9;hb=416ee379eaf1b9c0fb98e0367bd0e19d67d51bbb;hp=58dc07c952aef5fb2c983086e543a74e82b86f47;hpb=d59508ae910dc095e207910cbba301d79c4f5ef0;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 58dc07c9..e8b6aec0 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -19,7 +19,7 @@ typedef struct {
 } ObMouseBinding;
 
 #define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
-                                co == OB_FRAME_CONTEXT_ROOT : \
+                                co == OB_FRAME_CONTEXT_DESKTOP : \
                                 co == OB_FRAME_CONTEXT_CLIENT)
 
 /* Array of GSList*s of PointerBinding*s. */
@@ -115,21 +115,9 @@ static gboolean fire_button(ObMouseAction a, ObFrameContext context,
                 act->data.showmenu.y = y;
             }
 
-            if (act->func == action_desktop_dir)
-            {
-                act->data.desktopdir.final = FALSE;
-                act->data.desktopdir.cancel = FALSE;
-            }
-            if (act->func == action_send_to_desktop_dir)
-            {
-                act->data.sendtodir.final = FALSE;
-                act->data.sendtodir.cancel = FALSE;
-            }
-
-            if (config_desktop_popup &&
-                (act->func == action_desktop_dir ||
-                 act->func == action_send_to_desktop_dir))
-            {
+            if (act->data.any.interactive) {
+                act->data.inter.cancel = FALSE;
+                act->data.inter.final = FALSE;
                 keyboard_interactive_grab(state, c, context, act);
             }
 
@@ -358,6 +346,13 @@ 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) {
+        action->data.any.interactive = FALSE;
+        action->data.inter.final = TRUE;
+    }
+
     /* add the binding */
     b = g_new0(ObMouseBinding, 1);
     b->state = state;