}
/* more than one guy in his group (more than just him) */
- if (c->group && c->group->members->next) {
+ if (client_has_group_siblings(c)) {
GSList *it;
/* try on the client's desktop */
static gboolean place_random(ObClient *client, gint *x, gint *y)
{
- int l, r, t, b;
+ gint l, r, t, b;
Rect *area;
area = pick_head(client);
static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
{
- Rect *carea = data;
+ ObClient *c = data;
+ Rect *carea = &c->frame->area;
const Rect *a1 = p1, *a2 = p2;
+ gboolean diffhead = FALSE;
+ guint i;
+ Rect *a;
+
+ for (i = 0; i < screen_num_monitors; ++i) {
+ a = screen_physical_area_monitor(i);
+ if (RECT_CONTAINS(*a, a1->x, a1->y) &&
+ !RECT_CONTAINS(*a, a2->x, a2->y))
+ {
+ diffhead = TRUE;
+ break;
+ }
+ }
+
+ /* has to be more than me in the group */
+ if (diffhead && client_has_group_siblings(c)) {
+ guint *num, most;
+ GSList *it;
+
+ /* find how many clients in the group are on each monitor, use the
+ monitor with the most in it */
+ num = g_new0(guint, screen_num_monitors);
+ for (it = c->group->members; it; it = g_slist_next(it))
+ if (it->data != c)
+ ++num[client_monitor(it->data)];
+ most = 0;
+ for (i = 1; i < screen_num_monitors; ++i)
+ if (num[i] > num[most])
+ most = i;
+
+ a = screen_physical_area_monitor(most);
+ if (RECT_CONTAINS(*a, a1->x, a1->y))
+ return -1;
+ if (RECT_CONTAINS(*a, a2->x, a2->y))
+ return 1;
+ }
return MIN((a1->width - carea->width), (a1->height - carea->height)) -
MIN((a2->width - carea->width), (a2->height - carea->height));
SMART_FOCUSED
} ObSmartType;
-#define SMART_IGNORE(placer, c) \
- (placer == c || c->shaded || !client_normal(c) || \
- (c->desktop != DESKTOP_ALL && \
- c->desktop != (placer->desktop == DESKTOP_ALL ? \
+#define SMART_IGNORE(placer, c) \
+ (placer == c || !c->frame->visible || c->shaded || !client_normal(c) || \
+ (c->desktop != DESKTOP_ALL && \
+ c->desktop != (placer->desktop == DESKTOP_ALL ? \
screen_desktop : placer->desktop)))
static gboolean place_smart(ObClient *client, gint *x, gint *y,
for (i = 0; i < screen_num_monitors; ++i)
spaces = area_add(spaces, screen_area_monitor(client->desktop, i));
- if (type == SMART_FULL || type == SMART_FOCUSED) {
- GList *list;
-
- list = focus_order[client->desktop == DESKTOP_ALL ?
- screen_desktop : client->desktop];
-
- for (it = list; it; it = g_list_next(it)) {
- ObClient *c = it->data;
+ /* stay out from under windows in higher layers */
+ for (it = stacking_list; it; it = g_list_next(it)) {
+ ObClient *c;
- if (!SMART_IGNORE(client, c)) {
- spaces = area_remove(spaces, &c->frame->area);
- if (type == SMART_FOCUSED)
- break;
- }
- }
- } else if (type == SMART_GROUP) {
- if (!client->group)
- return FALSE;
+ if (WINDOW_IS_CLIENT(it->data)) {
+ c = it->data;
+ if (c->fullscreen)
+ continue;
+ } else
+ continue;
- for (sit = client->group->members; sit; sit = g_slist_next(sit)) {
- ObClient *c = sit->data;
+ if (c->layer > client->layer) {
if (!SMART_IGNORE(client, c))
spaces = area_remove(spaces, &c->frame->area);
- }
- } else
- g_assert_not_reached();
+ } else
+ break;
+ }
+
+ if (client->type == OB_CLIENT_TYPE_NORMAL) {
+ if (type == SMART_FULL || type == SMART_FOCUSED) {
+ gboolean found_foc = FALSE, stop = FALSE;
+ ObClient *foc;
+ GList *list;
+
+ list = focus_order[client->desktop == DESKTOP_ALL ?
+ screen_desktop : client->desktop];
+ foc = list ? list->data : NULL;
+
+ for (; it && !stop; it = g_list_next(it)) {
+ ObClient *c;
+
+ if (WINDOW_IS_CLIENT(it->data)) {
+ c = it->data;
+ if (c->fullscreen)
+ continue;
+ } else
+ continue;
+
+ if (!SMART_IGNORE(client, c)) {
+ if (type == SMART_FOCUSED)
+ if (found_foc)
+ stop = TRUE;
+ if (!stop)
+ spaces = area_remove(spaces, &c->frame->area);
+ }
+
+ if (c == foc)
+ found_foc = TRUE;
+ }
+ } else if (type == SMART_GROUP) {
+ /* has to be more than me in the group */
+ if (!client_has_group_siblings(client))
+ return FALSE;
+
+ for (sit = client->group->members; sit; sit = g_slist_next(sit)) {
+ ObClient *c = sit->data;
+ if (!SMART_IGNORE(client, c))
+ spaces = area_remove(spaces, &c->frame->area);
+ }
+ } else
+ g_assert_not_reached();
+ }
- spaces = g_slist_sort_with_data(spaces, area_cmp, &client->frame->area);
+ spaces = g_slist_sort_with_data(spaces, area_cmp, client);
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;
- if (type != SMART_FULL) {
+ if (client->type == OB_CLIENT_TYPE_DIALOG ||
+ type != SMART_FULL)
+ {
*x = r->x + (r->width - client->frame->area.width) / 2;
*y = r->y + (r->height - client->frame->area.height) / 2;
} else {
} else {
GSList *it;
gboolean first = TRUE;
- int l, r, t, b;
+ gint l, r, t, b;
for (it = client->group->members; it; it = it->next) {
ObClient *m = it->data;
if (!(m == client || m->transient_for)) {
return FALSE;
}
-static gboolean place_dialog(ObClient *client, gint *x, gint *y)
-{
- /* center parentless dialogs on the screen */
- if (client->type == OB_CLIENT_TYPE_DIALOG) {
- Rect *area;
-
- area = pick_head(client);
- if (!area)
- area = screen_area_monitor(client->desktop, 0);
-
- *x = (area->width - client->frame->area.width) / 2 + area->x;
- *y = (area->height - client->frame->area.height) / 2 + area->y;
- return TRUE;
- }
- return FALSE;
-}
-
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, SMART_FULL) ||
- place_smart(client, x, y, SMART_GROUP) ||
- place_smart(client, x, y, SMART_FOCUSED) ||
- (config_focus_follow ?
+ if (place_transient(client, x, y) ||
+ ((config_place_policy == OB_PLACE_POLICY_MOUSE) ?
place_under_mouse(client, x, y) :
+ place_smart(client, x, y, SMART_FULL) ||
+ place_smart(client, x, y, SMART_GROUP) ||
+ place_smart(client, x, y, SMART_FOCUSED) ||
place_random(client, x, y)))
{
/* get where the client should be */
projects / chaz / openbox / blobdiff