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

diff --git a/openbox/action.h b/openbox/action.h
index 52080251..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,71 +10,92 @@
 */
 
 struct AnyAction {
-    Client *c;
+    struct _ObClient *c;
+};
+
+struct DirectionalAction{
+    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;
-    int dx;
-    int dy;
+    struct _ObClient *c;
+    int delta;
 };
 
 struct SendToDesktop {
-    Client *c;
-    guint desktop;
+    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 Move {
-    Client *c;
+struct MoveResize {
+    struct _ObClient *c;
     int x;
     int y;
-    gboolean final;
+    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
+    guint button;
 };
 
-struct Resize {
-    Client *c;
+struct ShowMenu {
+    struct _ObClient *c;
+    char *name;
     int x;
     int y;
+};
+
+struct CycleWindows {
+    struct _ObClient *c;
+    gboolean linear;
+    gboolean forward;
     gboolean final;
-    Corner corner;
+    gboolean cancel;
 };
 
 union ActionData {
     struct AnyAction any;
+    struct DirectionalAction diraction;
     struct Execute execute;
     struct ClientAction client;
     struct MoveResizeRelative relative;
     struct SendToDesktop sendto;
-    struct SendToNextPreviousDesktop sendtonextprev;
+    struct SendToDesktopDirection sendtodir;
     struct Desktop desktop;
-    struct NextPreviousDesktop nextprevdesktop;
-    struct Move move;
-    struct Resize resize;
+    struct DesktopDirection desktopdir;
+    struct MoveResize moveresize;
+    struct ShowMenu showmenu;
+    struct CycleWindows cycle;
+    struct Layer layer;
 };
 
 typedef struct {
@@ -85,6 +107,21 @@ typedef struct {
 } Action;
 
 Action *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
+   the returned action's "func" is one of these.
+   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);
+Action *action_parse(xmlDocPtr doc, xmlNodePtr node);
 void action_free(Action *a);
 
 /* Execute */
@@ -100,23 +137,29 @@ 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);
 /* 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);
 /* ClientAction */
 void action_toggle_omnipresent(union ActionData *data);
 /* MoveResizeRelative */
-void action_move_relative(union ActionData *data);
+void action_move_relative_horz(union ActionData *data);
 /* MoveResizeRelative */
-void action_resize_relative(union ActionData *data);
+void action_move_relative_vert(union ActionData *data);
+/* MoveResizeRelative */
+void action_resize_relative_horz(union ActionData *data);
+/* MoveResizeRelative */
+void action_resize_relative_vert(union ActionData *data);
 /* ClientAction */
 void action_maximize_full(union ActionData *data);
 /* ClientAction */
@@ -137,33 +180,49 @@ 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);
-/* 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);
+/* 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