make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 4987b171fa6df681ff41084f4eac0782d86535e3..3bfba7fbbdb9cb7083e8023e30d4598cdc9fa029 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -39,7 +39,6 @@ static Rect* pick_head(ObClient *c)
     return NULL;
 }
 
-#if 0
 static gboolean place_random(ObClient *client, gint *x, gint *y)
 {
     int l, r, t, b;
@@ -62,7 +61,6 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
 
     return TRUE;
 }
-#endif
 
 static GSList* area_add(GSList *list, Rect *a)
 {
@@ -85,8 +83,8 @@ static GSList* area_remove(GSList *list, Rect *a)
         } else {
             Rect isect, extra;
 
-            /* Use an intersection of win and curr to determine the space
-               around curr that we can use.
+            /* Use an intersection of a and r to determine the space
+               around r that we can use.
 
                NOTE: the spaces calculated can overlap.
             */
@@ -124,22 +122,21 @@ static GSList* area_remove(GSList *list, Rect *a)
     return result;
 }
 
-static gint area_cmp(gconstpointer p1, gconstpointer p2)
+static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
 {
-    gint ret;
+    Rect *carea = data;
     const Rect *a1 = p1, *a2 = p2;
 
-    ret = RECT_BOTTOM(*a1) - RECT_BOTTOM(*a2);
-    if (!ret)
-        ret = RECT_LEFT(*a1) - RECT_LEFT(*a2);
-    return ret;
+    return MIN((a1->width - carea->width), (a1->height - carea->height)) -
+        MIN((a2->width - carea->width), (a2->height - carea->height));
 }
 
-static gboolean place_smart(ObClient *client, gint *x, gint *y)
+static gboolean place_smart(ObClient *client, gint *x, gint *y,
+                            gboolean only_focused)
 {
     guint i;
     gboolean ret = FALSE;
-    GSList *spaces, *sit;
+    GSList *spaces = NULL, *sit;
     GList *it, *list;
 
     list = focus_order[client->desktop == DESKTOP_ALL ?
@@ -151,12 +148,14 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
     for (it = list; it; it = g_list_next(it)) {
         ObClient *c = it->data;
 
-        if (c == client || c->shaded || !client_normal(c))
-            continue;
-        spaces = area_remove(spaces, &c->frame->area);
+        if (c != client && !c->shaded && client_normal(c)) {
+            spaces = area_remove(spaces, &c->frame->area);
+            if (only_focused)
+                break;
+        }
     }
 
-    spaces = g_slist_sort(spaces, area_cmp);
+    spaces = g_slist_sort_with_data(spaces, area_cmp, &client->frame->area);
 
     for (sit = spaces; sit; sit = g_slist_next(sit)) {
         Rect *r = sit->data;
@@ -165,8 +164,13 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
             if (r->width >= client->frame->area.width &&
                 r->height >= client->frame->area.height) {
                 ret = TRUE;
-                *x = r->x;
-                *y = r->y;
+                if (only_focused) {
+                    *x = r->x + (r->width - client->frame->area.width) / 2;
+                    *y = r->y + (r->height - client->frame->area.height) / 2;
+                } else {
+                    *x = r->x;
+                    *y = r->y;
+                }
             }
         }
 
@@ -270,10 +274,13 @@ void place_client(ObClient *client, gint *x, gint *y)
 {
     if (client->positioned)
         return;
-    if (place_transient(client, x, y) ||
-        place_dialog(client, x, y)    ||
-        place_smart(client, x, y)     ||
-        place_under_mouse(client, x, y))
+    if (place_transient(client, x, y)    ||
+        place_dialog(client, x, y)       ||
+        place_smart(client, x, y, FALSE) ||
+        place_smart(client, x, y, TRUE)  ||
+        (config_focus_follow ?
+         place_under_mouse(client, x, y) :
+         place_random(client, x, y)))
     {
         /* get where the client should be */
         frame_frame_gravity(client->frame, x, y);