X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=bfe0dc9a4277918ea711ac085779a6a7433fd108;hb=d9e08487dffd010f4434d24b98a3a571b2e5a600;hp=684887317960934688967bf2cd382b436030f8a0;hpb=ebe3091560a859996a9904c342c62b512b39bee0;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 68488731..bfe0dc9a 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -34,6 +34,7 @@ typedef struct _ObAction ObAction;
 
 struct AnyAction {
     struct _ObClient *c;
+    ObFrameContext context;
     gboolean interactive;
     gint x;
     gint y;
@@ -169,7 +170,7 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        ObUserAction uact);
 void action_free(ObAction *a);
 
-/*! Executes an action.
+/*! Executes a list of actions.
   @param c The client associated with the action. Can be NULL.
   @param state The keyboard modifiers state at the time the user action occured
   @param button The mouse button used to execute the action.
@@ -180,21 +181,21 @@ void action_free(ObAction *a);
   @param done If the action is completing an interactive action. This only
          affects interactive actions, but should generally always be FALSE.
 */
-void action_run_full(ObAction *a, struct _ObClient *c,
+void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context,
                      guint state, guint button, gint x, gint y,
                      gboolean cancel, gboolean done);
 
-#define action_run_mouse(a, c, s, b, x, y) \
-    action_run_full(a, c, s, b, x, y, FALSE, FALSE)
+#define action_run_mouse(a, c, n, s, b, x, y) \
+    action_run_list(a, c, n, s, b, x, y, FALSE, FALSE)
 
 #define action_run_interactive(a, c, s, n, d) \
-    action_run_full(a, c, s, 0, -1, -1, n, d)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, n, d)
 
 #define action_run_key(a, c, s, x, y) \
-    action_run_full(a, c, s, 0, x, y, FALSE,FALSE)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, x, y, FALSE, FALSE)
 
 #define action_run(a, c, s) \
-    action_run_full(a, c, s, 0, -1, -1, FALSE,FALSE)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, FALSE, FALSE)
 
 /* Execute */
 void action_execute(union ActionData *data);