dont use the X done callback

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index bfe0dc9a4277918ea711ac085779a6a7433fd108..222755fcd9ce7340317137db782e50e2ee7e6122 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{
@@ -91,7 +100,7 @@ struct SendToDesktopDirection {
 };
 
 struct Desktop {
-    struct AnyAction any;
+    struct InteractiveAction inter;
     guint desk;
 };
 
@@ -122,6 +131,7 @@ struct CycleWindows {
     struct InteractiveAction inter;
     gboolean linear;
     gboolean forward;
+    gboolean dialog;
 };
 
 union ActionData {
@@ -144,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.
     */
@@ -165,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.
@@ -197,6 +211,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 */