use action_run_string for raising/lowering

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 52a602ccf7071ba53818f0737a8307c4a5083d0c..8a1a7d27cc4b2264052a97390ef7befe67844ec6 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -30,6 +30,7 @@
 #include "keyboard.h"
 #include "event.h"
 #include "config.h"
+#include "mainloop.h"
 
 #include <glib.h>
 
@@ -94,6 +95,21 @@ void action_unref(ObAction *a)
     g_free(a);
 }
 
+ObAction* action_copy(const ObAction *src)
+{
+    ObAction *a = action_new(src->func);
+
+    a->data = src->data;
+
+    /* deal with pointers */
+    if (a->func == action_execute || a->func == action_restart)
+        a->data.execute.path = g_strdup(a->data.execute.path);
+    else if (a->func == action_showmenu)
+        a->data.showmenu.name = g_strdup(a->data.showmenu.name);
+
+    return a;
+}
+
 void setup_action_directional_focus_north(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
@@ -346,7 +362,8 @@ void setup_action_move(ObAction **a, ObUserAction uact)
     (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.moveresize.move = TRUE;
     (*a)->data.moveresize.keyboard =
-        (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+        (uact == OB_USER_ACTION_NONE ||
+         uact == OB_USER_ACTION_KEYBOARD_KEY ||
          uact == OB_USER_ACTION_MENU_SELECTION);
 }
 
@@ -355,7 +372,8 @@ void setup_action_resize(ObAction **a, ObUserAction uact)
     (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.moveresize.move = FALSE;
     (*a)->data.moveresize.keyboard =
-        (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+        (uact == OB_USER_ACTION_NONE ||
+         uact == OB_USER_ACTION_KEYBOARD_KEY ||
          uact == OB_USER_ACTION_MENU_SELECTION);
 }
 
@@ -903,12 +921,11 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
                     keyboard_interactive_grab(state, a->data.any.c, a);
             }
 
-            a->func(&a->data);
+            ob_main_loop_queue_action(ob_main_loop, a);
         }
     }
 }
 
-void action_execute(union ActionData *data)
 {
     GError *e = NULL;
     char *cmd;