X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fplacement%2Fplacement.c;h=76b45525fcbcaf03d4660b0f4eeac1b658839e95;hb=d447dc0f59619d26073699d9f81d7de77c200be4;hp=f33e45de22e7cb8ce1dedc6f502612f794940a27;hpb=29e3748605eaf86635aed48273bddfdcdcae05c4;p=chaz%2Fopenbox

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index f33e45de..76b45525 100644
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -3,14 +3,32 @@
 #include "../../kernel/frame.h"
 #include "../../kernel/screen.h"
 #include "../../kernel/openbox.h"
+#include "../../kernel/config.h"
+#include "history.h"
 #include <glib.h>
 
-void place_random(Client *c)
+gboolean history = TRUE;
+
+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);
+}
+
+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 +36,42 @@ 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)
 {
+    ConfigValue remember;
+
     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 (!config_get("placement.remember", Config_Bool, &remember))
+        g_assert_not_reached();
+
+    if (!remember.bool || !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();
 }