change how rc parsing will work. a=b will be parsed in any [section] and given to...

[chaz/openbox] / plugins / placement / placement.c

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index f33e45de22e7cb8ce1dedc6f502612f794940a27..23ffbb5d9a47929b6280df8c3030f9e130c8da4e 100644 (file)
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -1,16 +1,41 @@
-#include "../../kernel/dispatch.h"
-#include "../../kernel/client.h"
-#include "../../kernel/frame.h"
-#include "../../kernel/screen.h"
-#include "../../kernel/openbox.h"
+#include "kernel/dispatch.h"
+#include "kernel/client.h"
+#include "kernel/frame.h"
+#include "kernel/screen.h"
+#include "kernel/openbox.h"
+#include "kernel/parse.h"
+#include "history.h"
 #include <glib.h>
 
-void place_random(Client *c)
+static gboolean history;
+
+static void parse_assign(char *name, ParseToken *value)
+{
+    if  (!g_ascii_strcasecmp(name, "remember")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else
+            history = value->data.bool;
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
+}
+
+void plugin_setup_config()
+{
+    history = TRUE;
+
+    parse_reg_section("placement", NULL, parse_assign);
+}
+
+static void place_random(Client *c)
 {
     int l, r, t, b;
     int x, y;
     Rect *area;
 
+    if (ob_state == State_Starting) return;
+
     area = screen_area(c->desktop);
 
     l = area->x;
@@ -18,29 +43,37 @@ void place_random(Client *c)
     r = area->x + area->width - c->frame->area.width;
     b = area->y + area->height - c->frame->area.height;
 
-    x = g_random_int_range(l, r + 1);
-    y = g_random_int_range(t, b + 1);
+    if (r > l) x = g_random_int_range(l, r + 1);
+    else       x = 0;
+    if (b > t) y = g_random_int_range(t, b + 1);
+    else       y = 0;
 
     frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */
     client_configure(c, Corner_TopLeft, x, y, c->area.width, c->area.height,
                      TRUE, TRUE);
 }
 
-void event(ObEvent *e, void *foo)
+static void event(ObEvent *e, void *foo)
 {
     g_assert(e->type == Event_Client_New);
 
-    if (ob_state == State_Starting) return;
+    /* requested a position */
+    if (e->data.c.client->positioned) return;
 
-    place_random(e->data.c.client);
+    if (!history || !place_history(e->data.c.client))
+        place_random(e->data.c.client);
 }
 
 void plugin_startup()
 {
     dispatch_register(Event_Client_New, (EventHandler)event, NULL);
+
+    history_startup();
 }
 
 void plugin_shutdown()
 {
     dispatch_register(0, (EventHandler)event, NULL);
+
+    history_shutdown();
 }