X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=3bfba7fbbdb9cb7083e8023e30d4598cdc9fa029;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=6fc1bd18741d23278e3e61761a2a4e7734dd55f8;hpb=21c29cba106e44fe89a0bd12de23878c9ea84262;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 6fc1bd18..3bfba7fb 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -122,18 +122,17 @@ 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_TOP(*a1) - RECT_TOP(*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;
@@ -151,11 +150,12 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
 
         if (c != client && !c->shaded && client_normal(c)) {
             spaces = area_remove(spaces, &c->frame->area);
-            break;
+            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;
@@ -164,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 + (r->width - client->frame->area.width) / 2;
-                *y = r->y + (r->height - client->frame->area.height) / 2;
+                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;
+                }
             }
         }
 
@@ -269,9 +274,10 @@ 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)     ||
+    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)))