split up the relative move/resize actions into horz/vert

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index 0f277fa84e5eae9881df81e1276393ad637eb4dc..672ee6c42b1f78c9e9e1bb253d2553641c033f10 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -23,8 +23,7 @@ struct ClientAction {
 
 struct MoveResizeRelative {
     Client *c;
-    int dx;
-    int dy;
+    int delta;
 };
 
 struct SendToDesktop {
@@ -85,6 +84,15 @@ typedef struct {
 } Action;
 
 Action *action_new(void (*func)(union ActionData *data));
+
+/* Creates a new Action from the name of the action
+   A few action types need data set after making this call still. Check if
+   the returned action's "func" is one of these.
+   action_execute - the path needs to be set
+   action_restart - the path can optionally be set
+   action_desktop - the destination desktop needs to be set
+*/
+Action *action_from_string(char *name);
 void action_free(Action *a);
 
 /* Execute */
@@ -100,8 +108,12 @@ void action_raise(union ActionData *data);
 /* ClientAction */
 void action_lower(union ActionData *data);
 /* ClientAction */
+void action_focusraise(union ActionData *data);
+/* ClientAction */
 void action_close(union ActionData *data);
 /* ClientAction */
+void action_kill(union ActionData *data);
+/* ClientAction */
 void action_shade(union ActionData *data);
 /* ClientAction */
 void action_unshade(union ActionData *data);
@@ -110,9 +122,13 @@ void action_toggle_shade(union ActionData *data);
 /* ClientAction */
 void action_toggle_omnipresent(union ActionData *data);
 /* MoveResizeRelative */
-void action_move_relative(union ActionData *data);
+void action_move_relative_horz(union ActionData *data);
 /* MoveResizeRelative */
-void action_resize_relative(union ActionData *data);
+void action_move_relative_vert(union ActionData *data);
+/* MoveResizeRelative */
+void action_resize_relative_horz(union ActionData *data);
+/* MoveResizeRelative */
+void action_resize_relative_vert(union ActionData *data);
 /* ClientAction */
 void action_maximize_full(union ActionData *data);
 /* ClientAction */
@@ -157,5 +173,9 @@ void action_toggle_decorations(union ActionData *data);
 void action_move(union ActionData *data);
 /* Resize */
 void action_resize(union ActionData *data);
+/* Execute */
+void action_restart(union ActionData *data);
+/* Any */
+void action_exit(union ActionData *data);
 
 #endif