X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fplacement%2Fplacement.c;h=5f962e47c2bf74823994a9799f5217d16aa5c587;hb=34e819738b344a992a1dbfd6cdd165e0c8ddb3a9;hp=f33e45de22e7cb8ce1dedc6f502612f794940a27;hpb=29e3748605eaf86635aed48273bddfdcdcae05c4;p=chaz%2Fopenbox

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index f33e45de..5f962e47 100644
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -1,46 +1,76 @@
-#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 "parser/parse.h"
+#include "history.h"
 #include <glib.h>
 
-void place_random(Client *c)
+static gboolean history;
+
+static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+    xmlNodePtr n;
+
+    if ((n = parse_find_node("remember", node)))
+        history = parse_bool(doc, n);
+}
+
+void plugin_setup_config()
+{
+    history = TRUE;
+
+    parse_register("placement", parse_xml, NULL);
+}
+
+static void place_random(Client *c)
 {
     int l, r, t, b;
     int x, y;
     Rect *area;
 
-    area = screen_area(c->desktop);
+    if (ob_state == State_Starting) return;
+
+    area = screen_area_xinerama(c->desktop,
+                                g_random_int_range(0, screen_num_xin_areas));
 
     l = area->x;
     t = area->y;
     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();
 }