X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=debae8ebdbf834dc8167dd0b37cd11d3df82336c;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=9066b6efae9184401d61e7c102ec538034476245;hpb=4d814a383b099c48ad9b61cb94d25ef16b1a698a;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 9066b6ef..debae8eb 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,7 +1,13 @@
 #ifndef __action_h
 #define __action_h
 
-#include "client.h"
+#include "misc.h"
+#include "frame.h"
+#include "parser/parse.h"
+
+struct _ObClient;
+
+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,103 +15,123 @@
 */
 
 struct AnyAction {
-    Client *c;
+    struct _ObClient *c;
+    gboolean interactive;
+    gint x;
+    gint y;
+    gint button;
+};
+
+struct InteractiveAction {
+    struct AnyAction any;
+    gboolean final;
+    gboolean cancel;
+};
+
+struct InterDirectionalAction{
+    struct InteractiveAction inter;
+    ObDirection direction;
 };
 
 struct DirectionalAction{
-    Client *c;
-    int direction;
+    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;
+    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 Layer {
-    Client *c;
+    struct AnyAction any;
     int layer; /* < 0 = below, 0 = normal, > 0 = above */
 };
 
-struct NextPreviousDesktop {
-    Client *c;
+struct DesktopDirection {
+    struct InteractiveAction inter;
+    ObDirection dir;
     gboolean wrap;
+    gboolean linear;
 };
 
 struct MoveResize {
-    Client *c;
-    int x;
-    int y;
-    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
-    guint button;
+    struct AnyAction any;
+    gboolean move;
+    gboolean keyboard;
 };
 
 struct ShowMenu {
-    Client *c;
+    struct AnyAction any;
     char *name;
-    int x;
-    int y;
 };
 
 struct CycleWindows {
-    Client *c;
+    struct InteractiveAction inter;
     gboolean linear;
     gboolean forward;
-    gboolean final;
-    gboolean cancel;
 };
 
 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 DesktopDirection desktopdir;
     struct MoveResize moveresize;
     struct ShowMenu showmenu;
     struct CycleWindows cycle;
     struct Layer layer;
 };
 
-typedef struct {
+struct _ObAction {
+    ObUserAction act;
     /* 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));
+};
 
 /* Creates a new Action from the name of the action
    A few action types need data set after making this call still. Check if
@@ -113,17 +139,49 @@ Action *action_new(void (*func)(union ActionData *data));
    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_send_to_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);
-void action_free(Action *a);
+ObAction *action_from_string(char *name, ObUserAction uact);
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       ObUserAction uact);
+void action_free(ObAction *a);
+
+/*! Executes an action.
+  @param c The client associated with the action. Can be NULL.
+  @param state The keyboard modifiers state at the time the user action occured
+  @param button The mouse button used to execute the action.
+  @param x The x coord at which the user action occured.
+  @param y The y coord at which the user action occured.
+  @param cancel If the action is cancelling an interactive action. This only
+         affects interactive actions, but should generally always be FALSE.
+  @param done If the action is completing an interactive action. This only
+         affects interactive actions, but should generally always be FALSE.
+*/
+void action_run_full(ObAction *a, struct _ObClient *c,
+                     guint state, guint button, gint x, gint y,
+                     gboolean cancel, gboolean done);
+
+#define action_run_mouse(a, c, s, b, x, y) \
+    action_run_full(a, c, s, b, x, y, FALSE, FALSE)
+
+#define action_run_interactive(a, c, s, n, d) \
+    action_run_full(a, c, s, 0, -1, -1, n, d)
+
+#define action_run_key(a, c, s, x, y) \
+    action_run_full(a, c, s, 0, x, y, FALSE,FALSE)
+
+#define action_run(a, c, s) \
+    action_run_full(a, c, s, 0, -1, -1, FALSE,FALSE)
 
 /* Execute */
 void action_execute(union ActionData *data);
+/* ActivateAction */
+void action_activate(union ActionData *data);
 /* ClientAction */
 void action_focus(union ActionData *data);
 /* ClientAction */
@@ -131,12 +189,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);
@@ -180,28 +238,20 @@ 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);
 /* MoveResize */
 void action_moveresize(union ActionData *data);
+/* Any */
+void action_reconfigure(union ActionData *data);
 /* Execute */
 void action_restart(union ActionData *data);
 /* Any */
@@ -210,12 +260,21 @@ void action_exit(union ActionData *data);
 void action_showmenu(union ActionData *data);
 /* CycleWindows */
 void action_cycle_windows(union ActionData *data);
-/* DirectionalAction */
+/* 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