X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fplacement%2Fplacement.c;h=d03fb4b361735879e4ea9352b96cb16e01e731dc;hb=07b38ba2c3fb7d63bc09a6221c675e1c1a3afc4d;hp=a84c41ec4fc0b294874f7fe3b34bb95c673c4937;hpb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;p=chaz%2Fopenbox

diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index a84c41ec..d03fb4b3 100644
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -1,5 +1,6 @@
 #include "kernel/dispatch.h"
 #include "kernel/client.h"
+#include "kernel/group.h"
 #include "kernel/frame.h"
 #include "kernel/screen.h"
 #include "kernel/openbox.h"
@@ -13,6 +14,7 @@ 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);
 }
@@ -30,7 +32,7 @@ static void place_random(ObClient *c)
     int x, y;
     Rect *area;
 
-    if (ob_state == OB_STATE_STARTING) return;
+    if (ob_state() == OB_STATE_STARTING) return;
 
     area = screen_area_monitor(c->desktop,
                                g_random_int_range(0, screen_num_monitors));
@@ -57,6 +59,51 @@ static void event(ObEvent *e, void *foo)
     /* requested a position */
     if (e->data.c.client->positioned) return;
 
+    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);
 }