dont save/load history. its slow and its stupid.

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

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index 6d025567ec9d7b8357ebd16953847332f158823d..d03fb4b361735879e4ea9352b96cb16e01e731dc 100644 (file)
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -1,35 +1,41 @@
-#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/group.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;
+
+    node = node->xmlChildrenNode;
+    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)
+static void place_random(ObClient *c)
 {
     int l, r, t, b;
     int x, y;
     Rect *area;
 
-    if (ob_state == State_Starting) return;
+    if (ob_state() == OB_STATE_STARTING) return;
 
-    area = screen_area(c->desktop);
+    area = screen_area_monitor(c->desktop,
+                               g_random_int_range(0, screen_num_monitors));
 
     l = area->x;
     t = area->y;
@@ -42,24 +48,63 @@ static void place_random(Client *c)
     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,
+    client_configure(c, OB_CORNER_TOPLEFT, x, y, c->area.width, c->area.height,
                      TRUE, TRUE);
 }
 
 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 (e->data.c.client->transient_for) {
+        if (e->data.c.client->transient_for != OB_TRAN_GROUP) {
+            ObClient *c = e->data.c.client;
+            ObClient *p = e->data.c.client->transient_for;
+            int x = (c->frame->area.width - p->frame->area.width) / 2 +
+                p->frame->area.x;
+            int y = (c->frame->area.height - p->frame->area.height) / 2 +
+                p->frame->area.y;
+            client_configure(c, OB_CORNER_TOPLEFT, x, y,
+                             c->area.width, c->area.height,
+                             TRUE, TRUE);
+            return;
+        } else {
+            GSList *it;
+            ObClient *c = e->data.c.client;
+            gboolean first = TRUE;
+            int l, r, t, b;
+            for (it = c->group->members; it; it = it->next) {
+                ObClient *m = it->data;
+                if (!(m == c || m->transient_for)) {
+                    if (first) {
+                        l = m->frame->area.x;
+                        t = m->frame->area.y;
+                        r = m->frame->area.x + m->frame->area.width - 1;
+                        b = m->frame->area.y + m->frame->area.height - 1;
+                        first = FALSE;
+                    } else {
+                        l = MIN(l, m->frame->area.x);
+                        t = MIN(t, m->frame->area.y);
+                        r = MAX(r, m->frame->area.x +m->frame->area.width - 1);
+                        b = MAX(b, m->frame->area.y +m->frame->area.height -1);
+                    }
+                }
+            }
+            if (!first) {
+                int x = ((r + 1 - l) - c->frame->area.width) / 2 + l; 
+                int y = ((b + 1 - t) - c->frame->area.height) / 2 + t;
+                client_configure(c, OB_CORNER_TOPLEFT, x, y,
+                                 c->area.width, c->area.height,
+                                 TRUE, TRUE);
+                return;
+            }
+        }
+    }
+
+    if (!history || !place_history(e->data.c.client))
         place_random(e->data.c.client);
 }