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

diff --git a/openbox/action.h b/openbox/action.h
index 6c1c4d32..3abf7f2b 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,7 +1,7 @@
 #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
@@ -10,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_* */
@@ -68,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;
@@ -137,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);