place.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana 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
b = areas[i]->y + areas[i]->height - client->frame->area.height;
if (r > l) *x = g_random_int_range(l, r + 1);
- else *x = 0;
+ else *x = areas[i]->x;
if (b > t) *y = g_random_int_range(t, b + 1);
- else *y = 0;
+ else *y = areas[i]->y;
g_free(areas);
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;
+ foc = focus_order_find_first(client->desktop == DESKTOP_ALL ?
+ screen_desktop : client->desktop);
for (; it && !stop; it = g_list_next(it)) {
ObClient *c;
Rect *area;
area = pick_pointer_head(client);
+ screen_pointer_pos(&px, &py);
l = area->x;
t = area->y;
if (client->transient_for != OB_TRAN_GROUP) {
ObClient *c = client;
ObClient *p = client->transient_for;
- *x = (p->frame->area.width - c->frame->area.width) / 2 +
- p->frame->area.x;
- *y = (p->frame->area.height - c->frame->area.height) / 2 +
- p->frame->area.y;
- return TRUE;
+
+ if (client_normal(p)) {
+ *x = (p->frame->area.width - c->frame->area.width) / 2 +
+ p->frame->area.x;
+ *y = (p->frame->area.height - c->frame->area.height) / 2 +
+ p->frame->area.y;
+ return TRUE;
+ }
} else {
GSList *it;
gboolean first = TRUE;
gint l, r, t, b;
for (it = client->group->members; it; it = g_slist_next(it)) {
ObClient *m = it->data;
- if (!(m == client || m->transient_for)) {
+ if (!(m == client || m->transient_for) && client_normal(m)) {
if (first) {
l = RECT_LEFT(m->frame->area);
t = RECT_TOP(m->frame->area);
}
}
}
+
+ if (client->transient) {
+ Rect **areas;
+
+ areas = pick_head(client);
+
+ *x = (areas[0]->width - client->frame->area.width) / 2 + areas[0]->x;
+ *y = (areas[0]->height - client->frame->area.height) / 2 + areas[0]->y;
+
+ g_free(areas);
+ return TRUE;
+ }
+
return FALSE;
}
place_random(client, x, y))))
g_assert_not_reached(); /* the last one better succeed */
/* get where the client should be */
- frame_frame_gravity(client->frame, x, y);
+ frame_frame_gravity(client->frame, x, y,
+ client->area.width, client->area.height);
return ret;
}