X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=64bb99deeabe3a7469d1cc8adb908fce5d394f5e;hb=cadab91e522c6426cc79df4f06e7c05232cb0a64;hp=f79bd56b4033b3ff6d42433ccc9af40e71cdb8f3;hpb=2e824eece1c54e96e5178c952ca92c3c2415b099;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index f79bd56b..64bb99de 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,66 +1,80 @@
 #ifndef __action_h
 #define __action_h
 
-#include "client.h"
+#include "misc.h"
 #include "parser/parse.h"
 
+typedef struct _ObAction ObAction;
+
 /* 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*
    available (possibly NULL though) if it wants it.
 */
 
 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 Activate {
+    struct _ObClient *c;
+    gboolean here; /* bring it to the current desktop */
 };
 
 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;
+    ObDirection dir;
     gboolean wrap;
-    gboolean follow;
+    gboolean linear;
+    gboolean final;
+    gboolean cancel;
 };
 
 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;
+    ObDirection dir;
     gboolean wrap;
+    gboolean linear;
+    gboolean final;
+    gboolean cancel;
 };
 
 struct MoveResize {
-    Client *c;
+    struct _ObClient *c;
     int x;
     int y;
     guint32 corner; /* prop_atoms.net_wm_moveresize_* */
@@ -68,14 +82,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;
@@ -87,6 +101,7 @@ union ActionData {
     struct DirectionalAction diraction;
     struct Execute execute;
     struct ClientAction client;
+    struct Activate activate;
     struct MoveResizeRelative relative;
     struct SendToDesktop sendto;
     struct SendToDesktopDirection sendtodir;
@@ -98,15 +113,15 @@ union ActionData {
     struct Layer layer;
 };
 
-typedef struct {
+struct _ObAction {
     /* The func member acts like an enum to tell which one of the structs in
        the data union are valid.
     */
     void (*func)(union ActionData *data);
     union ActionData data;
-} Action;
+};
 
-Action *action_new(void (*func)(union ActionData *data));
+ObAction *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
@@ -120,12 +135,14 @@ Action *action_new(void (*func)(union ActionData *data));
    action_resize_relative_vert - the delta
 */
 
-Action *action_from_string(char *name);
-Action *action_parse(xmlDocPtr doc, xmlNodePtr node);
-void action_free(Action *a);
+ObAction *action_from_string(char *name);
+ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node);
+void action_free(ObAction *a);
 
 /* Execute */
 void action_execute(union ActionData *data);
+/* ActivateAction */
+void action_activate(union ActionData *data);
 /* ClientAction */
 void action_focus(union ActionData *data);
 /* ClientAction */
@@ -133,6 +150,8 @@ void action_unfocus(union ActionData *data);
 /* ClientAction */
 void action_iconify(union ActionData *data);
 /* ClientAction */
+void action_raiselower(union ActionData *data);
+/* ClientAction */
 void action_raise(union ActionData *data);
 /* ClientAction */
 void action_lower(union ActionData *data);
@@ -181,23 +200,11 @@ void action_toggle_maximize_vert(union ActionData *data);
 /* SendToDesktop */
 void action_send_to_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);
+void action_send_to_desktop_dir(union ActionData *data);
 /* Desktop */
 void action_desktop(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);
+void action_desktop_dir(union ActionData *data);
 /* ClientAction */
 void action_toggle_decorations(union ActionData *data);
 /* MoveResize */
@@ -214,6 +221,8 @@ void action_cycle_windows(union ActionData *data);
 void action_directional_focus(union ActionData *data);
 /* DirectionalAction */
 void action_movetoedge(union ActionData *data);
+/* DirectionalAction */
+void action_growtoedge(union ActionData *data);
 /* Layer */
 void action_send_to_layer(union ActionData *data);
 /* Layer */