fix focus cycle indicator positioning

[chaz/openbox] / openbox / actions / maximize.c

diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index 508c2d375d0c4a85651ecb424703ac9f849001f5..443ff7e76bbd3d85432046390481d52ad425c30e 100644 (file)
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -1,24 +1,66 @@
 #include "openbox/actions.h"
 #include "openbox/client.h"
 
+typedef struct {
+    gboolean toggle;
+    gboolean on;
+} Options;
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_maximize_startup()
 {
     actions_register("Maximize",
-                     NULL, NULL,
+                     setup_func,
+                     free_func,
                      run_func,
                      NULL, NULL);
 }
 
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+    o->toggle = TRUE;
+
+    if ((n = parse_find_node("state", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "toggle")) {
+            o->toggle = FALSE;
+            o->on = parse_bool(doc, n);
+        }
+        g_free(s);
+    }
+
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
+    Options *o = options;
+
     if (data->client) {
         actions_client_move(data, TRUE);
-        client_maximize(data->client,
-                        !(data->client->max_horz || data->client->max_vert),
-                        0);
+
+        if (o->toggle)
+            client_maximize(data->client,
+                            !data->client->max_horz || !data->client->max_vert,
+                            0);
+        else
+            client_maximize(data->client, o->on, 0);
+
         actions_client_move(data, FALSE);
     }