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

diff --git a/openbox/action.h b/openbox/action.h
index 95d15282..debae8eb 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -2,8 +2,11 @@
 #define __action_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
@@ -13,89 +16,103 @@ typedef struct _ObAction ObAction;
 
 struct AnyAction {
     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{
-    struct _ObClient *c;
+    struct AnyAction any;
     ObDirection direction;
 };
 
 struct Execute {
-    struct _ObClient *c;
+    struct AnyAction any;
     char *path;
 };
 
 struct ClientAction {
-    struct _ObClient *c;
+    struct AnyAction any;
+};
+
+struct Activate {
+    struct AnyAction any;
+    gboolean here; /* bring it to the current desktop */
 };
 
 struct MoveResizeRelative {
-    struct _ObClient *c;
+    struct AnyAction any;
     int delta;
 };
 
 struct SendToDesktop {
-    struct _ObClient *c;
+    struct AnyAction any;
     guint desk;
     gboolean follow;
 };
 
 struct SendToDesktopDirection {
-    struct _ObClient *c;
+    struct InteractiveAction inter;
     ObDirection dir;
     gboolean wrap;
     gboolean linear;
-    gboolean final;
-    gboolean cancel;
+    gboolean follow;
 };
 
 struct Desktop {
-    struct _ObClient *c;
+    struct AnyAction any;
     guint desk;
 };
 
 struct Layer {
-    struct _ObClient *c;
+    struct AnyAction any;
     int layer; /* < 0 = below, 0 = normal, > 0 = above */
 };
 
 struct DesktopDirection {
-    struct _ObClient *c;
+    struct InteractiveAction inter;
     ObDirection dir;
     gboolean wrap;
     gboolean linear;
-    gboolean final;
-    gboolean cancel;
 };
 
 struct MoveResize {
-    struct _ObClient *c;
-    int x;
-    int y;
-    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
-    guint button;
+    struct AnyAction any;
+    gboolean move;
+    gboolean keyboard;
 };
 
 struct ShowMenu {
-    struct _ObClient *c;
+    struct AnyAction any;
     char *name;
-    int x;
-    int y;
 };
 
 struct CycleWindows {
-    struct _ObClient *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 SendToDesktopDirection sendtodir;
@@ -108,6 +125,7 @@ union ActionData {
 };
 
 struct _ObAction {
+    ObUserAction act;
     /* The func member acts like an enum to tell which one of the structs in
        the data union are valid.
     */
@@ -115,26 +133,55 @@ struct _ObAction {
     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
    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_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
 */
 
-ObAction *action_from_string(char *name);
-ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node);
+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 */
@@ -142,6 +189,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);
@@ -195,10 +244,14 @@ void action_send_to_desktop_dir(union ActionData *data);
 void action_desktop(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 */
@@ -207,7 +260,7 @@ 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);