make ob_exit() take an error code. don't exit with 0 for signals other than TERM...

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index af90bb61eba87339d95e2c71cdbd81920bc1648c..3bfba7fbbdb9cb7083e8023e30d4598cdc9fa029 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -122,15 +122,13 @@ 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,
@@ -157,7 +155,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
         }
     }
 
-    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;
@@ -166,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;
+                }
             }
         }