X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=0e4d570f97f662fca3ea4b3835b43250297b5e2e;hb=6675b28dede3e0581a1b1bfb73fb0dd3b5dd1863;hp=a395af2d19c03ca5d41f095e4a8139e8d8497ac9;hpb=ebe3091560a859996a9904c342c62b512b39bee0;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index a395af2d..0e4d570f 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -28,11 +28,23 @@
 #include "openbox.h"
 #include "grab.h"
 #include "keyboard.h"
+#include "event.h"
+#include "config.h"
 
 #include <glib.h>
 
+#define ACT_START(d) \
+    ((d->any.context != OB_FRAME_CONTEXT_CLIENT && config_focus_follow) ? \
+     grab_pointer(TRUE, OB_CURSOR_NONE), 0 : 0)
+
+#define ACT_END(d) \
+    ((d->any.context != OB_FRAME_CONTEXT_CLIENT && config_focus_follow) ? \
+     grab_pointer(FALSE, OB_CURSOR_NONE), \
+     (d->any.button ? focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS), 1 : 0) : \
+     0)
+
 typedef struct ActionString {
-    char *name;
+    const gchar *name;
     void (*func)(union ActionData *);
     void (*setup)(ObAction **, ObUserAction uact);
 } ActionString;
@@ -784,27 +796,58 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     return act;
 }
 
-void action_run_full(ObAction *a, 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)
 {
+    GSList *it;
+    ObAction *a;
+    gboolean inter = FALSE;
+
+    if (!acts)
+        return;
+
     if (x < 0 && y < 0)
         screen_pointer_pos(&x, &y);
 
-    a->data.any.c = c;
-    a->data.any.x = x;
-    a->data.any.y = y;
-
-    a->data.any.button = button;
+    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 (a->data.any.interactive) {
-        a->data.inter.cancel = cancel;
-        a->data.inter.final = done;
-        if (!(cancel || done))
-            keyboard_interactive_grab(state, c, a);
+    if (!inter) {
+        /* sometimes when we execute another app as an action,
+           it won't work right unless we XUngrabKeyboard first,
+           even though we grabbed the key/button Asychronously.
+           e.g. "gnome-panel-control --main-menu" */
+        XUngrabKeyboard(ob_display, event_lasttime);
     }
 
-    a->func(&a->data);
+    for (it = acts; it; it = g_slist_next(it)) {
+        a = it->data;
+
+        a->data.any.c = c;
+        a->data.any.context = context;
+        a->data.any.x = x;
+        a->data.any.y = y;
+
+        a->data.any.button = button;
+
+        if (a->data.any.interactive) {
+            a->data.inter.cancel = cancel;
+            a->data.inter.final = done;
+            if (!(cancel || done))
+                keyboard_interactive_grab(state, c, a);
+        }
+
+        a->func(&a->data);
+    }
 }
 
 void action_execute(union ActionData *data)
@@ -872,27 +915,38 @@ void action_raiselower(union ActionData *data)
         }
     }
 
-    if (raise)
+    if (raise) {
+        ACT_START(data);
         stacking_raise(CLIENT_AS_WINDOW(c));
-    else
+        ACT_END(data);
+    } else {
+        ACT_START(data);
         stacking_lower(CLIENT_AS_WINDOW(c));
+        ACT_END(data);
+    }
 }
 
 void action_raise(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+        ACT_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);
+            ACT_START(data);
             client_shade(data->client.any.c, FALSE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
-        } else
+            ACT_END(data);
+        } else {
+            ACT_START(data);
             stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+            ACT_END(data);
+        }
     }
 }
 
@@ -902,17 +956,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);
+            ACT_START(data);
             client_shade(data->client.any.c, TRUE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
+            ACT_END(data);
         }
     }
 }
 
 void action_lower(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
+        ACT_END(data);
+    }
 }
 
 void action_close(union ActionData *data)
@@ -930,27 +987,27 @@ void action_kill(union ActionData *data)
 void action_shade(union ActionData *data)
 {
     if (data->client.any.c) { 
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        ACT_START(data);
         client_shade(data->client.any.c, TRUE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
 void action_unshade(union ActionData *data)
 {
     if (data->client.any.c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        ACT_START(data);
         client_shade(data->client.any.c, FALSE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
 void action_toggle_shade(union ActionData *data)
 {
     if (data->client.any.c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        ACT_START(data);
         client_shade(data->client.any.c, !data->client.any.c->shaded);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
@@ -966,9 +1023,9 @@ void action_move_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        ACT_START(data);
         client_move(c, c->area.x + data->relative.delta, c->area.y);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
@@ -976,9 +1033,9 @@ void action_move_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        ACT_START(data);
         client_move(c, c->area.x, c->area.y + data->relative.delta);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
@@ -986,11 +1043,11 @@ void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
+        ACT_START(data);
         client_resize(c,
                       c->area.width + data->relative.delta * c->size_inc.width,
                       c->area.height);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
@@ -998,69 +1055,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);
+        ACT_START(data);
         client_resize(c, c->area.width, c->area.height +
                       data->relative.delta * c->size_inc.height);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        ACT_END(data);
     }
 }
 
 void action_maximize_full(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c, TRUE, 0, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_unmaximize_full(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c, FALSE, 0, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_toggle_maximize_full(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c,
                         !(data->client.any.c->max_horz ||
                           data->client.any.c->max_vert),
                         0, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_maximize_horz(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c, TRUE, 1, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_unmaximize_horz(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c, FALSE, 1, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_toggle_maximize_horz(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c,
                         !data->client.any.c->max_horz, 1, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_maximize_vert(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c, TRUE, 2, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_unmaximize_vert(union ActionData *data)
 {
-    if (data->client.any.c)
+    if (data->client.any.c) {
+        ACT_START(data);
         client_maximize(data->client.any.c, FALSE, 2, TRUE);
+        ACT_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) {
+        ACT_START(data);
+        client_maximize(data->client.any.c,
+                        !data->client.any.c->max_vert, 2, TRUE);
+        ACT_END(data);
+    }
 }
 
 void action_send_to_desktop(union ActionData *data)
@@ -1123,10 +1208,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) {
+        ACT_START(data);
+        c->decorate = !c->decorate;
+        client_setup_decor_and_functions(c);
+        ACT_END(data);
+    }
 }
 
 static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
@@ -1240,9 +1327,9 @@ void action_movetoedge(union ActionData *data)
         g_assert_not_reached();
     }
     frame_frame_gravity(c->frame, &x, &y);
-    grab_pointer(TRUE, OB_CURSOR_NONE);
+    ACT_START(data);
     client_move(c, x, y);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    ACT_END(data);
 
 }
 
@@ -1306,9 +1393,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);
+    ACT_START(data);
     client_move_resize(c, x, y, width, height);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    ACT_END(data);
 }
 
 void action_send_to_layer(union ActionData *data)
@@ -1322,10 +1409,12 @@ void action_toggle_layer(union ActionData *data)
     ObClient *c = data->layer.any.c;
 
     if (c) {
+        ACT_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);
+        ACT_END(data);
     }
 }