X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=3abf7f2bf1fa786e96d708c39ff79d9974c691fe;hb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;hp=f7c372a473fc3f38c5611f0a7bbe9ede0738b55c;hpb=e48325700788622cc82b34f1ede5f02f74911d41;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index f7c372a4..3abf7f2b 100644
--- 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,57 +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 SendToDesktopDirection {
-    Client *c;
+    struct _ObClient *c;
     gboolean wrap;
     gboolean follow;
 };
 
 struct Desktop {
-    Client *c;
+    struct _ObClient *c;
     guint desk;
 };
 
 struct Layer {
-    Client *c;
+    struct _ObClient *c;
     int layer; /* < 0 = below, 0 = normal, > 0 = above */
 };
 
 struct DesktopDirection {
-    Client *c;
+    struct _ObClient *c;
     gboolean wrap;
 };
 
 struct MoveResize {
-    Client *c;
+    struct _ObClient *c;
     int x;
     int y;
     guint32 corner; /* prop_atoms.net_wm_moveresize_* */
@@ -67,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;
@@ -120,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 */
@@ -135,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);
@@ -218,4 +218,11 @@ void action_movetoedge(union ActionData *data);
 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