X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=f940f7eacd5e7b688f169344e56a582074689867;hb=ed4c6995ca199e5d015f1ca90654b4030c7ea760;hp=1cd8f42faef1a7436616616e68d48d2434fad54b;hpb=34bff2d25507d70d3ff92bf01ebfdb0c78be125e;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 1cd8f42f..f940f7ea 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -32,8 +32,17 @@ typedef struct _ObAction ObAction;
    available (possibly NULL though) if it wants it.
 */
 
+typedef enum
+{
+    OB_CLIENT_ACTION_NO,
+    OB_CLIENT_ACTION_OPTIONAL,
+    OB_CLIENT_ACTION_ALWAYS
+} ObClientActionReq;
+
 struct AnyAction {
+    ObClientActionReq client_action;
     struct _ObClient *c;
+    ObFrameContext context;
     gboolean interactive;
     gint x;
     gint y;
@@ -49,6 +58,7 @@ struct InteractiveAction {
 struct InterDirectionalAction{
     struct InteractiveAction inter;
     ObDirection direction;
+    gboolean dialog;
 };
 
 struct DirectionalAction{
@@ -58,7 +68,7 @@ struct DirectionalAction{
 
 struct Execute {
     struct AnyAction any;
-    char *path;
+    gchar *path;
 };
 
 struct ClientAction {
@@ -72,7 +82,7 @@ struct Activate {
 
 struct MoveResizeRelative {
     struct AnyAction any;
-    int delta;
+    gint delta;
 };
 
 struct SendToDesktop {
@@ -90,13 +100,13 @@ struct SendToDesktopDirection {
 };
 
 struct Desktop {
-    struct AnyAction any;
+    struct InteractiveAction inter;
     guint desk;
 };
 
 struct Layer {
     struct AnyAction any;
-    int layer; /* < 0 = below, 0 = normal, > 0 = above */
+    gint layer; /* < 0 = below, 0 = normal, > 0 = above */
 };
 
 struct DesktopDirection {
@@ -114,13 +124,14 @@ struct MoveResize {
 
 struct ShowMenu {
     struct AnyAction any;
-    char *name;
+    gchar *name;
 };
 
 struct CycleWindows {
     struct InteractiveAction inter;
     gboolean linear;
     gboolean forward;
+    gboolean dialog;
 };
 
 union ActionData {
@@ -143,7 +154,8 @@ union ActionData {
 };
 
 struct _ObAction {
-    ObUserAction act;
+    guint ref;
+
     /* The func member acts like an enum to tell which one of the structs in
        the data union are valid.
     */
@@ -164,10 +176,13 @@ struct _ObAction {
    action_resize_relative_vert - the delta
 */
 
-ObAction *action_from_string(const gchar *name, ObUserAction uact);
-ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ObAction* action_from_string(const gchar *name, ObUserAction uact);
+ObAction* action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        ObUserAction uact);
-void action_free(ObAction *a);
+void action_ref(ObAction *a);
+void action_unref(ObAction *a);
+
+ObAction* action_copy(const ObAction *a);
 
 /*! Executes a list of actions.
   @param c The client associated with the action. Can be NULL.
@@ -180,21 +195,23 @@ void action_free(ObAction *a);
   @param done If the action is completing an interactive action. This only
          affects interactive actions, but should generally always be FALSE.
 */
-void action_run_list(GSList *acts, struct _ObClient *c,
+void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context,
                      guint state, guint button, gint x, gint y,
                      gboolean cancel, gboolean done);
 
-#define action_run_mouse(a, c, s, b, x, y) \
-    action_run_list(a, c, s, b, x, y, FALSE, FALSE)
+#define action_run_mouse(a, c, n, s, b, x, y) \
+    action_run_list(a, c, n, s, b, x, y, FALSE, FALSE)
 
 #define action_run_interactive(a, c, s, n, d) \
-    action_run_list(a, c, s, 0, -1, -1, n, d)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, n, d)
 
 #define action_run_key(a, c, s, x, y) \
-    action_run_list(a, c, s, 0, x, y, FALSE, FALSE)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, x, y, FALSE, FALSE)
 
 #define action_run(a, c, s) \
-    action_run_list(a, c, s, 0, -1, -1, FALSE, FALSE)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, FALSE, FALSE)
+
+void action_run_string(const gchar *name, struct _ObClient *c);
 
 /* Execute */
 void action_execute(union ActionData *data);
@@ -254,6 +271,8 @@ void action_maximize_vert(union ActionData *data);
 void action_unmaximize_vert(union ActionData *data);
 /* ClientAction */
 void action_toggle_maximize_vert(union ActionData *data);
+/* ClientAction */
+void action_toggle_fullscreen(union ActionData *data);
 /* SendToDesktop */
 void action_send_to_desktop(union ActionData *data);
 /* SendToDesktopDirection */
@@ -289,6 +308,8 @@ void action_send_to_layer(union ActionData *data);
 /* Layer */
 void action_toggle_layer(union ActionData *data);
 /* Any */
+void action_toggle_dockautohide(union ActionData *data);
+/* Any */
 void action_toggle_show_desktop(union ActionData *data);
 /* Any */
 void action_show_desktop(union ActionData *data);