prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index ba5ff22359ca997981c5a7857596faae972698e6..3abf7f2bf1fa786e96d708c39ff79d9974c691fe 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,7 +1,8 @@
 #ifndef __action_h
 #define __action_h
 
-#include "client.h"
+#include "misc.h"
+#include "parser/parse.h"
 
 /* These have to all have a Client* at the top even if they don't use it, so
    that I can set it blindly later on. So every function will have a Client*
@@ -9,52 +10,57 @@
 */
 
 struct AnyAction {
-    Client *c;
+    struct _ObClient *c;
 };
 
 struct DirectionalAction{
-    Client *c;
-    int direction;
+    struct _ObClient *c;
+    ObDirection direction;
 };
 
 struct Execute {
-    Client *c;
+    struct _ObClient *c;
     char *path;
 };
 
 struct ClientAction {
-    Client *c;
+    struct _ObClient *c;
 };
 
 struct MoveResizeRelative {
-    Client *c;
+    struct _ObClient *c;
     int delta;
 };
 
 struct SendToDesktop {
-    Client *c;
+    struct _ObClient *c;
     guint desk;
     gboolean follow;
 };
 
-struct SendToNextPreviousDesktop {
-    Client *c;
+struct SendToDesktopDirection {
+    struct _ObClient *c;
     gboolean wrap;
     gboolean follow;
 };
 
 struct Desktop {
-    Client *c;
+    struct _ObClient *c;
     guint desk;
 };
 
-struct NextPreviousDesktop {
-    Client *c;
+struct Layer {
+    struct _ObClient *c;
+    int layer; /* < 0 = below, 0 = normal, > 0 = above */
+};
+
+struct DesktopDirection {
+    struct _ObClient *c;
     gboolean wrap;
 };
 
 struct MoveResize {
-    Client *c;
+    struct _ObClient *c;
     int x;
     int y;
     guint32 corner; /* prop_atoms.net_wm_moveresize_* */
@@ -62,14 +68,14 @@ struct MoveResize {
 };
 
 struct ShowMenu {
-    Client *c;
+    struct _ObClient *c;
     char *name;
     int x;
     int y;
 };
 
 struct CycleWindows {
-    Client *c;
+    struct _ObClient *c;
     gboolean linear;
     gboolean forward;
     gboolean final;
@@ -83,12 +89,13 @@ union ActionData {
     struct ClientAction client;
     struct MoveResizeRelative relative;
     struct SendToDesktop sendto;
-    struct SendToNextPreviousDesktop sendtonextprev;
+    struct SendToDesktopDirection sendtodir;
     struct Desktop desktop;
-    struct NextPreviousDesktop nextprevdesktop;
+    struct DesktopDirection desktopdir;
     struct MoveResize moveresize;
     struct ShowMenu showmenu;
     struct CycleWindows cycle;
+    struct Layer layer;
 };
 
 typedef struct {
@@ -114,6 +121,7 @@ Action *action_new(void (*func)(union ActionData *data));
 */
 
 Action *action_from_string(char *name);
+Action *action_parse(xmlDocPtr doc, xmlNodePtr node);
 void action_free(Action *a);
 
 /* Execute */
@@ -129,8 +137,6 @@ 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);
@@ -174,24 +180,24 @@ void action_unmaximize_vert(union ActionData *data);
 void action_toggle_maximize_vert(union ActionData *data);
 /* SendToDesktop */
 void action_send_to_desktop(union ActionData *data);
-/* SendToNextPreviousDesktop */
-void action_send_to_next_desktop(union ActionData *data);
-/* SendToNextPreviousDesktop */
-void action_send_to_previous_desktop(union ActionData *data);
+/* SendToDesktopDirection */
+void action_send_to_desktop_right(union ActionData *data);
+/* SendToDesktopDirection */
+void action_send_to_desktop_left(union ActionData *data);
+/* SendToDesktopDirection */
+void action_send_to_desktop_up(union ActionData *data);
+/* SendToDesktopDirection */
+void action_send_to_desktop_down(union ActionData *data);
 /* Desktop */
 void action_desktop(union ActionData *data);
-/* NextPreviousDesktop */
-void action_next_desktop(union ActionData *data);
-/* NextPreviousDesktop */
-void action_previous_desktop(union ActionData *data);
-/* NextPreviousDesktop */
-void action_next_desktop_column(union ActionData *data);
-/* NextPreviousDesktop */
-void action_previous_desktop_column(union ActionData *data);
-/* NextPreviousDesktop */
-void action_next_desktop_row(union ActionData *data);
-/* NextPreviousDesktop */
-void action_previous_desktop_row(union ActionData *data);
+/* DesktopDirection */
+void action_desktop_right(union ActionData *data);
+/* DesktopDirection */
+void action_desktop_left(union ActionData *data);
+/* DesktopDirection */
+void action_desktop_up(union ActionData *data);
+/* DesktopDirection */
+void action_desktop_down(union ActionData *data);
 /* ClientAction */
 void action_toggle_decorations(union ActionData *data);
 /* MoveResize */
@@ -204,7 +210,19 @@ void action_exit(union ActionData *data);
 void action_showmenu(union ActionData *data);
 /* CycleWindows */
 void action_cycle_windows(union ActionData *data);
-
+/* DirectionalAction */
 void action_directional_focus(union ActionData *data);
+/* DirectionalAction */
 void action_movetoedge(union ActionData *data);
+/* Layer */
+void action_send_to_layer(union ActionData *data);
+/* Layer */
+void action_toggle_layer(union ActionData *data);
+/* Any */
+void action_toggle_show_desktop(union ActionData *data);
+/* Any */
+void action_show_desktop(union ActionData *data);
+/* Any */
+void action_unshow_desktop(union ActionData *data);
+
 #endif