X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=6077b3eda97b4131198d640bee07f4be92db6614;hb=fdd1c3c8a7eac8ba1246ae64cbfca6f922294c51;hp=af90bb61eba87339d95e2c71cdbd81920bc1648c;hpb=e5703910d0a1f92e06d8a8173f3408d4f2240a73;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index af90bb61..6077b3ed 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   place.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "client.h"
 #include "group.h"
 #include "screen.h"
@@ -122,15 +140,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 +173,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 +182,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;
+                }
             }
         }