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

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index a6dbd868..5f962e47 100644
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -1,20 +1,39 @@
-#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>
 
-gboolean history = TRUE;
+static gboolean history;
 
-void place_random(Client *c)
+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;
@@ -31,26 +50,27 @@ void place_random(Client *c)
                      TRUE, TRUE);
 }
 
-void place_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;
 
-    if (!place_history(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)place_event, NULL);
+    dispatch_register(Event_Client_New, (EventHandler)event, NULL);
 
     history_startup();
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)place_event, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 
     history_shutdown();
 }