X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fplacement%2Fplacement.c;h=5f962e47c2bf74823994a9799f5217d16aa5c587;hb=1052ca3f744bdad473b6e4028999375fb11d220b;hp=6d025567ec9d7b8357ebd16953847332f158823d;hpb=22f38541c5af082805bf08bff1e04aff8fa430dd;p=chaz%2Fopenbox

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index 6d025567..5f962e47 100644
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -1,24 +1,27 @@
-#include "../../kernel/dispatch.h"
-#include "../../kernel/client.h"
-#include "../../kernel/frame.h"
-#include "../../kernel/screen.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/config.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;
+
+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()
 {
-    ConfigValue val;
-
-    config_def_set(config_def_new("placement.remember", Config_Bool,
-                                  "Remember Window Positions",
-                                  "Place windows where they last were "
-                                  "positioned."));
-    val.bool = TRUE;
-    config_set("placement.remember", Config_Bool, val);
+    history = TRUE;
+
+    parse_register("placement", parse_xml, NULL);
 }
 
 static void place_random(Client *c)
@@ -29,7 +32,8 @@ static void place_random(Client *c)
 
     if (ob_state == State_Starting) return;
 
-    area = screen_area(c->desktop);
+    area = screen_area_xinerama(c->desktop,
+                                g_random_int_range(0, screen_num_xin_areas));
 
     l = area->x;
     t = area->y;
@@ -48,18 +52,12 @@ static void place_random(Client *c)
 
 static void event(ObEvent *e, void *foo)
 {
-    ConfigValue remember;
-    gboolean r;
-
     g_assert(e->type == Event_Client_New);
 
     /* requested a position */
     if (e->data.c.client->positioned) return;
 
-    r = config_get("placement.remember", Config_Bool, &remember);
-    g_assert(r);
-
-    if (!remember.bool || !place_history(e->data.c.client))
+    if (!history || !place_history(e->data.c.client))
         place_random(e->data.c.client);
 }