<group> option for raise/lower related actions. hi floam.

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index bfe0dc9a4277918ea711ac085779a6a7433fd108..035828751dc11ee0ef89ef5532d531d526dccc18 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -32,7 +32,15 @@ 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;
@@ -50,6 +58,7 @@ struct InteractiveAction {
 struct InterDirectionalAction{
     struct InteractiveAction inter;
     ObDirection direction;
+    gboolean dialog;
 };
 
 struct DirectionalAction{
@@ -59,7 +68,7 @@ struct DirectionalAction{
 
 struct Execute {
     struct AnyAction any;
-    char *path;
+    gchar *path;
 };
 
 struct ClientAction {
@@ -73,7 +82,7 @@ struct Activate {
 
 struct MoveResizeRelative {
     struct AnyAction any;
-    int delta;
+    gint delta;
 };
 
 struct SendToDesktop {
@@ -91,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 {
@@ -115,13 +124,19 @@ struct MoveResize {
 
 struct ShowMenu {
     struct AnyAction any;
-    char *name;
+    gchar *name;
 };
 
 struct CycleWindows {
     struct InteractiveAction inter;
     gboolean linear;
     gboolean forward;
+    gboolean dialog;
+};
+
+struct Stacking {
+    struct AnyAction any;
+    gboolean group;
 };
 
 union ActionData {
@@ -141,10 +156,12 @@ union ActionData {
     struct ShowMenu showmenu;
     struct CycleWindows cycle;
     struct Layer layer;
+    struct Stacking stacking;
 };
 
 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.
     */
@@ -165,10 +182,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.
@@ -197,6 +217,8 @@ void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context,
 #define action_run(a, c, s) \
     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);
 /* ActivateAction */
@@ -233,6 +255,8 @@ void action_toggle_omnipresent(union ActionData *data);
 void action_move_relative_horz(union ActionData *data);
 /* MoveResizeRelative */
 void action_move_relative_vert(union ActionData *data);
+/* ClientAction */
+void action_move_to_center(union ActionData *data);
 /* MoveResizeRelative */
 void action_resize_relative_horz(union ActionData *data);
 /* MoveResizeRelative */
@@ -255,6 +279,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 */
@@ -290,6 +316,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);