+/* -*- 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"
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 ?
for (it = list; it; it = g_list_next(it)) {
ObClient *c = it->data;
- if (c != client && !c->shaded && client_normal(c))
+ 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;
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;
+ }
}
}
{
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)))