X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=3f6d84eb8b6ac7c7124e4e1323020c7f94c8acef;hb=854da68d0f5bed8c85c101fd6895244d60183ff5;hp=2f57cb87673c3155b869d02ddc1647bf55ef6bff;hpb=9290376bbbb8b29411f59a35e5477f25304fe205;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 2f57cb87..3f6d84eb 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -13,69 +13,77 @@ typedef struct _ObAction ObAction;
 
 struct AnyAction {
     struct _ObClient *c;
+    gboolean interactive;
+};
+
+struct InteractiveAction {
+    struct AnyAction any;
+    gboolean final;
+    gboolean cancel;
+};
+
+struct InterDirectionalAction{
+    struct InteractiveAction inter;
+    ObDirection direction;
 };
 
 struct DirectionalAction{
-    struct _ObClient *c;
+    struct AnyAction any;
     ObDirection direction;
 };
 
 struct Execute {
-    struct _ObClient *c;
+    struct AnyAction any;
     char *path;
 };
 
 struct ClientAction {
-    struct _ObClient *c;
+    struct AnyAction any;
 };
 
 struct Activate {
-    struct _ObClient *c;
+    struct AnyAction any;
     gboolean here; /* bring it to the current desktop */
 };
 
 struct MoveResizeRelative {
-    struct _ObClient *c;
+    struct AnyAction any;
     int delta;
 };
 
 struct SendToDesktop {
-    struct _ObClient *c;
+    struct AnyAction any;
     guint desk;
     gboolean follow;
 };
 
 struct SendToDesktopDirection {
-    struct _ObClient *c;
+    struct InteractiveAction inter;
     ObDirection dir;
     gboolean wrap;
     gboolean linear;
-    gboolean final;
-    gboolean cancel;
     gboolean follow;
 };
 
 struct Desktop {
-    struct _ObClient *c;
+    struct AnyAction any;
     guint desk;
 };
 
 struct Layer {
-    struct _ObClient *c;
+    struct AnyAction any;
     int layer; /* < 0 = below, 0 = normal, > 0 = above */
 };
 
 struct DesktopDirection {
-    struct _ObClient *c;
+    struct InteractiveAction inter;
     ObDirection dir;
     gboolean wrap;
     gboolean linear;
-    gboolean final;
-    gboolean cancel;
 };
 
 struct MoveResize {
-    struct _ObClient *c;
+    struct AnyAction any;
     int x;
     int y;
     guint32 corner; /* prop_atoms.net_wm_moveresize_* */
@@ -83,22 +91,22 @@ struct MoveResize {
 };
 
 struct ShowMenu {
-    struct _ObClient *c;
+    struct AnyAction any;
     char *name;
     int x;
     int y;
 };
 
 struct CycleWindows {
-    struct _ObClient *c;
+    struct InteractiveAction inter;
     gboolean linear;
     gboolean forward;
-    gboolean final;
-    gboolean cancel;
 };
 
 union ActionData {
     struct AnyAction any;
+    struct InteractiveAction inter;
+    struct InterDirectionalAction interdiraction;
     struct DirectionalAction diraction;
     struct Execute execute;
     struct ClientAction client;
@@ -137,7 +145,7 @@ ObAction *action_new(void (*func)(union ActionData *data));
 */
 
 ObAction *action_from_string(char *name);
-ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node);
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 void action_free(ObAction *a);
 
 /* Execute */
@@ -206,6 +214,8 @@ void action_send_to_desktop_dir(union ActionData *data);
 void action_desktop(union ActionData *data);
 /* DesktopDirection */
 void action_desktop_dir(union ActionData *data);
+/* Any */
+void action_desktop_last(union ActionData *data);
 /* ClientAction */
 void action_toggle_decorations(union ActionData *data);
 /* MoveResize */
@@ -218,7 +228,7 @@ void action_exit(union ActionData *data);
 void action_showmenu(union ActionData *data);
 /* CycleWindows */
 void action_cycle_windows(union ActionData *data);
-/* DirectionalAction */
+/* InterDirectionalAction */
 void action_directional_focus(union ActionData *data);
 /* DirectionalAction */
 void action_movetoedge(union ActionData *data);