X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=3bfba7fbbdb9cb7083e8023e30d4598cdc9fa029;hb=ec4c9b0c1f22eee6ded4578c9448fab353b010cf;hp=32d9fa32f33cb73d490be93e9894aada611c97ae;hpb=eb7229603e1b873ea0f4763a5e36f8c4be9f381b;p=chaz%2Fopenbox diff --git a/openbox/place.c b/openbox/place.c index 32d9fa32..3bfba7fb 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -122,11 +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) { + Rect *carea = data; const Rect *a1 = p1, *a2 = p2; - return a1->width * a1->height - a2->width * a2->height; + 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, @@ -153,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;