dont need to swallow enter events on ungrab cuz we just ignore them all now

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index f780ce884b8fa2629ec768e202faae7f1c244e66..c6e66c3517ceaa1f8b5cf3162d802e6780f4722d 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -29,10 +29,37 @@
 #include "grab.h"
 #include "keyboard.h"
 #include "event.h"
+#include "config.h"
 
 #include <glib.h>
 
-typedef struct ActionString {
+inline void client_action_start(union ActionData *data)
+{
+    if (config_focus_follow)
+        if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
+            grab_pointer(TRUE, OB_CURSOR_NONE);
+}
+
+inline void client_action_end(union ActionData *data)
+{
+    if (config_focus_follow)
+        if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
+            if (!data->any.button) {
+                grab_pointer(FALSE, OB_CURSOR_NONE);
+            } else {
+                ObClient *c;
+
+                /* usually this is sorta redundant, but with a press action
+                   the enter event will come as a GrabNotify which is
+                   ignored, so this will handle that case */
+                if ((c = client_under_pointer()))
+                    event_enter_client(c);
+            }
+        }
+}
+
+typedef struct
+{
     const gchar *name;
     void (*func)(union ActionData *);
     void (*setup)(ObAction **, ObUserAction uact);
@@ -785,7 +812,7 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     return act;
 }
 
-void action_run_list(GSList *acts, struct _ObClient *c,
+void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
                      guint state, guint button, gint x, gint y,
                      gboolean cancel, gboolean done)
 {
@@ -793,16 +820,22 @@ void action_run_list(GSList *acts, struct _ObClient *c,
     ObAction *a;
     gboolean inter = FALSE;
 
+    if (!acts)
+        return;
+
     if (x < 0 && y < 0)
         screen_pointer_pos(&x, &y);
 
-    for (it = acts; it; it = g_slist_next(it)) {
-        a = it->data;
-        if (a->data.any.interactive) {
-            inter = TRUE;
-            break;
+    if (grab_on_keyboard())
+        inter = TRUE;
+    else
+        for (it = acts; it; it = g_slist_next(it)) {
+            a = it->data;
+            if (a->data.any.interactive) {
+                inter = TRUE;
+                break;
+            }
         }
-    }
 
     if (!inter) {
         /* sometimes when we execute another app as an action,
@@ -816,6 +849,7 @@ void action_run_list(GSList *acts, struct _ObClient *c,
         a = it->data;
 
         a->data.any.c = c;
+        a->data.any.context = context;
         a->data.any.x = x;
         a->data.any.y = y;
 
@@ -897,27 +931,38 @@ void action_raiselower(union ActionData *data)
         }
     }
 
-    if (raise)
+    if (raise) {
+        client_action_start(data);
         stacking_raise(CLIENT_AS_WINDOW(c));
-    else
+        client_action_end(data);
+    } else {
+        client_action_start(data);
         stacking_lower(CLIENT_AS_WINDOW(c));
+        client_action_end(data);
+    }
 }
 
 void action_raise(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+        client_action_end(data);
+    }
 }
 
 void action_unshaderaise(union ActionData *data)
 {
     if (data->client.any.c) {
         if (data->client.any.c->shaded) {
-            grab_pointer(TRUE, OB_CURSOR_NONE);
+            client_action_start(data);
             client_shade(data->client.any.c, FALSE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
-        } else
+            client_action_end(data);
+        } else {
+            client_action_start(data);
             stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+            client_action_end(data);
+        }
     }
 }
 
@@ -927,17 +972,20 @@ void action_shadelower(union ActionData *data)
         if (data->client.any.c->shaded)
             stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
         else {
-            grab_pointer(TRUE, OB_CURSOR_NONE);
+            client_action_start(data);
             client_shade(data->client.any.c, TRUE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
+            client_action_end(data);
         }
     }
 }
 
 void action_lower(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
+        client_action_end(data);
+    }
 }
 
 void action_close(union ActionData *data)
@@ -955,27 +1003,27 @@ void action_kill(union ActionData *data)
 void action_shade(union ActionData *data)
 {
     if (data->client.any.c) { 
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_shade(data->client.any.c, TRUE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
 void action_unshade(union ActionData *data)
 {
     if (data->client.any.c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_shade(data->client.any.c, FALSE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
 void action_toggle_shade(union ActionData *data)
 {
     if (data->client.any.c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_shade(data->client.any.c, !data->client.any.c->shaded);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
@@ -991,9 +1039,9 @@ void action_move_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_move(c, c->area.x + data->relative.delta, c->area.y);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
@@ -1001,9 +1049,9 @@ void action_move_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_move(c, c->area.x, c->area.y + data->relative.delta);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
@@ -1011,11 +1059,11 @@ void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_resize(c,
                       c->area.width + data->relative.delta * c->size_inc.width,
                       c->area.height);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
@@ -1023,69 +1071,97 @@ void action_resize_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c && !c->shaded) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        client_action_start(data);
         client_resize(c, c->area.width, c->area.height +
                       data->relative.delta * c->size_inc.height);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        client_action_end(data);
     }
 }
 
 void action_maximize_full(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c, TRUE, 0, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_unmaximize_full(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c, FALSE, 0, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_toggle_maximize_full(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c,
                         !(data->client.any.c->max_horz ||
                           data->client.any.c->max_vert),
                         0, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_maximize_horz(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c, TRUE, 1, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_unmaximize_horz(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c, FALSE, 1, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_toggle_maximize_horz(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c,
                         !data->client.any.c->max_horz, 1, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_maximize_vert(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c, TRUE, 2, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_unmaximize_vert(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        client_action_start(data);
         client_maximize(data->client.any.c, FALSE, 2, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_toggle_maximize_vert(union ActionData *data)
 {
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, !data->client.any.c->max_vert, 2, TRUE);
+    if (data->client.any.c) {
+        client_action_start(data);
+        client_maximize(data->client.any.c,
+                        !data->client.any.c->max_vert, 2, TRUE);
+        client_action_end(data);
+    }
 }
 
 void action_send_to_desktop(union ActionData *data)
@@ -1148,10 +1224,12 @@ void action_toggle_decorations(union ActionData *data)
 {
     ObClient *c = data->client.any.c;
 
-    if (!c) return;
-
-    c->decorate = !c->decorate;
-    client_setup_decor_and_functions(c);
+    if (c) {
+        client_action_start(data);
+        c->decorate = !c->decorate;
+        client_setup_decor_and_functions(c);
+        client_action_end(data);
+    }
 }
 
 static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
@@ -1265,9 +1343,9 @@ void action_movetoedge(union ActionData *data)
         g_assert_not_reached();
     }
     frame_frame_gravity(c->frame, &x, &y);
-    grab_pointer(TRUE, OB_CURSOR_NONE);
+    client_action_start(data);
     client_move(c, x, y);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    client_action_end(data);
 
 }
 
@@ -1331,9 +1409,9 @@ void action_growtoedge(union ActionData *data)
     frame_frame_gravity(c->frame, &x, &y);
     width -= c->frame->size.left + c->frame->size.right;
     height -= c->frame->size.top + c->frame->size.bottom;
-    grab_pointer(TRUE, OB_CURSOR_NONE);
+    client_action_start(data);
     client_move_resize(c, x, y, width, height);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    client_action_end(data);
 }
 
 void action_send_to_layer(union ActionData *data)
@@ -1347,10 +1425,12 @@ void action_toggle_layer(union ActionData *data)
     ObClient *c = data->layer.any.c;
 
     if (c) {
+        client_action_start(data);
         if (data->layer.layer < 0)
             client_set_layer(c, c->below ? 0 : -1);
         else if (data->layer.layer > 0)
             client_set_layer(c, c->above ? 0 : 1);
+        client_action_end(data);
     }
 }