X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=e0ea0d566d8c7b8e650122d2c07fc5679b7ce958;hb=ea6d0e0d4d31d0d810fa752d04b702b3b599e3df;hp=672ee6c42b1f78c9e9e1bb253d2553641c033f10;hpb=1a32ba561afef1a3dabeb8d4443c1aafe7ad9977;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 672ee6c4..e0ea0d56 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -12,6 +12,11 @@ struct AnyAction {
     Client *c;
 };
 
+struct DirectionalFocus {
+    Client *c;
+    int direction;
+};
+
 struct Execute {
     Client *c;
     char *path;
@@ -28,7 +33,8 @@ struct MoveResizeRelative {
 
 struct SendToDesktop {
     Client *c;
-    guint desktop;
+    guint desk;
+    gboolean follow;
 };
 
 struct SendToNextPreviousDesktop {
@@ -47,23 +53,32 @@ struct NextPreviousDesktop {
     gboolean wrap;
 };
 
-struct Move {
+struct MoveResize {
     Client *c;
     int x;
     int y;
-    gboolean final;
+    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
+    guint button;
 };
 
-struct Resize {
+struct ShowMenu {
     Client *c;
+    char *name;
     int x;
     int y;
+};
+
+struct CycleWindows {
+    Client *c;
+    gboolean linear;
+    gboolean forward;
     gboolean final;
-    Corner corner;
+    gboolean cancel;
 };
 
 union ActionData {
     struct AnyAction any;
+    struct DirectionalFocus dfocus;
     struct Execute execute;
     struct ClientAction client;
     struct MoveResizeRelative relative;
@@ -71,8 +86,9 @@ union ActionData {
     struct SendToNextPreviousDesktop sendtonextprev;
     struct Desktop desktop;
     struct NextPreviousDesktop nextprevdesktop;
-    struct Move move;
-    struct Resize resize;
+    struct MoveResize moveresize;
+    struct ShowMenu showmenu;
+    struct CycleWindows cycle;
 };
 
 typedef struct {
@@ -91,7 +107,12 @@ Action *action_new(void (*func)(union ActionData *data));
    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_move_relative_horz - the delta
+   action_move_relative_vert - the delta
+   action_resize_relative_horz - the delta
+   action_resize_relative_vert - the delta
 */
+
 Action *action_from_string(char *name);
 void action_free(Action *a);
 
@@ -116,6 +137,10 @@ void action_kill(union ActionData *data);
 /* ClientAction */
 void action_shade(union ActionData *data);
 /* ClientAction */
+void action_shadelower(union ActionData *data);
+/* ClientAction */
+void action_unshaderaise(union ActionData *data);
+/* ClientAction */
 void action_unshade(union ActionData *data);
 /* ClientAction */
 void action_toggle_shade(union ActionData *data);
@@ -169,13 +194,16 @@ void action_next_desktop_row(union ActionData *data);
 void action_previous_desktop_row(union ActionData *data);
 /* ClientAction */
 void action_toggle_decorations(union ActionData *data);
-/* Move */
-void action_move(union ActionData *data);
-/* Resize */
-void action_resize(union ActionData *data);
+/* MoveResize */
+void action_moveresize(union ActionData *data);
 /* Execute */
 void action_restart(union ActionData *data);
 /* Any */
 void action_exit(union ActionData *data);
+/* ShowMenu */
+void action_showmenu(union ActionData *data);
+/* CycleWindows */
+void action_cycle_windows(union ActionData *data);
 
+void action_directional_focus(union ActionData *data);
 #endif