X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=3f6d84eb8b6ac7c7124e4e1323020c7f94c8acef;hb=854da68d0f5bed8c85c101fd6895244d60183ff5;hp=ff99af99dbad2e74cff235b7779c41a72967f5be;hpb=a116f2c6310db702e377e9cd1a95c9a980aba5ae;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index ff99af99..3f6d84eb 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,7 +1,10 @@
 #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*
@@ -9,87 +12,125 @@
 */
 
 struct AnyAction {
-    Client *c;
+    struct _ObClient *c;
+    gboolean interactive;
+};
+
+struct InteractiveAction {
+    struct AnyAction any;
+    gboolean final;
+    gboolean cancel;
+};
+
+struct InterDirectionalAction{
+    struct InteractiveAction inter;
+    ObDirection direction;
+};
+
+struct DirectionalAction{
+    struct AnyAction any;
+    ObDirection direction;
 };
 
 struct Execute {
-    Client *c;
+    struct AnyAction any;
     char *path;
 };
 
 struct ClientAction {
-    Client *c;
+    struct AnyAction any;
+};
+
+struct Activate {
+    struct AnyAction any;
+    gboolean here; /* bring it to the current desktop */
 };
 
 struct MoveResizeRelative {
-    Client *c;
+    struct AnyAction any;
     int delta;
 };
 
 struct SendToDesktop {
-    Client *c;
-    guint desktop;
+    struct AnyAction any;
+    guint desk;
+    gboolean follow;
 };
 
-struct SendToNextPreviousDesktop {
-    Client *c;
+struct SendToDesktopDirection {
+    struct InteractiveAction inter;
+    ObDirection dir;
     gboolean wrap;
+    gboolean linear;
     gboolean follow;
 };
 
 struct Desktop {
-    Client *c;
+    struct AnyAction any;
     guint desk;
 };
 
-struct NextPreviousDesktop {
-    Client *c;
+struct Layer {
+    struct AnyAction any;
+    int layer; /* < 0 = below, 0 = normal, > 0 = above */
+};
+
+struct DesktopDirection {
+    struct InteractiveAction inter;
+    ObDirection dir;
     gboolean wrap;
+    gboolean linear;
 };
 
-struct Move {
-    Client *c;
+struct MoveResize {
+    struct AnyAction any;
     int x;
     int y;
-    gboolean final;
+    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
+    guint button;
 };
 
-struct Resize {
-    Client *c;
+struct ShowMenu {
+    struct AnyAction any;
+    char *name;
     int x;
     int y;
-    gboolean final;
-    Corner corner;
 };
 
-struct ShowMenu {
-    Client *c;
-    char * menuName;
+struct CycleWindows {
+    struct InteractiveAction inter;
+    gboolean linear;
+    gboolean forward;
 };
 
 union ActionData {
     struct AnyAction any;
+    struct InteractiveAction inter;
+    struct InterDirectionalAction interdiraction;
+    struct DirectionalAction diraction;
     struct Execute execute;
     struct ClientAction client;
+    struct Activate activate;
     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 ShowMenu showMenu;
+    struct DesktopDirection desktopdir;
+    struct MoveResize moveresize;
+    struct ShowMenu showmenu;
+    struct CycleWindows cycle;
+    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
@@ -102,11 +143,15 @@ Action *action_new(void (*func)(union ActionData *data));
    action_resize_relative_horz - the delta
    action_resize_relative_vert - the delta
 */
-Action *action_from_string(char *name);
-void action_free(Action *a);
+
+ObAction *action_from_string(char *name);
+ObAction *action_parse(ObParseInst *i, 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 */
@@ -114,12 +159,12 @@ 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);
 /* ClientAction */
-void action_focusraise(union ActionData *data);
-/* ClientAction */
 void action_close(union ActionData *data);
 /* ClientAction */
 void action_kill(union ActionData *data);
@@ -163,34 +208,41 @@ 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_dir(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_dir(union ActionData *data);
+/* Any */
+void action_desktop_last(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);
+/* InterDirectionalAction */
+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 */
+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