nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

smart placement has a fallback for just groups now too

Browse source
This commit is contained in:
Dana Jansens 2003-09-19 19:34:42 +00:00
parent f3746e29a5
commit b731e0e282
1 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
openbox/place.c
View file

@ -149,29 +149,56 @@ static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
MIN((a2->width - carea->width), (a2->height - carea->height)); MIN((a2->width - carea->width), (a2->height - carea->height));
} }
typedef enum
{
SMART_FULL,
SMART_GROUP,
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 ? \
screen_desktop : placer->desktop)))
static gboolean place_smart(ObClient *client, gint *x, gint *y, static gboolean place_smart(ObClient *client, gint *x, gint *y,
gboolean only_focused) ObSmartType type)
{ {
guint i; guint i;
gboolean ret = FALSE; gboolean ret = FALSE;
GSList *spaces = NULL, *sit; GSList *spaces = NULL, *sit;
GList *it, *list; GList *it;
list = focus_order[client->desktop == DESKTOP_ALL ?
screen_desktop : client->desktop];
for (i = 0; i < screen_num_monitors; ++i) for (i = 0; i < screen_num_monitors; ++i)
spaces = area_add(spaces, screen_area_monitor(client->desktop, 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)) { for (it = list; it; it = g_list_next(it)) {
ObClient *c = it->data; ObClient *c = it->data;
if (c != client && !c->shaded && client_normal(c)) { if (!SMART_IGNORE(client, c)) {
spaces = area_remove(spaces, &c->frame->area); spaces = area_remove(spaces, &c->frame->area);
if (only_focused) if (type == SMART_FOCUSED)
break; break;
} }
} }
} else if (type == SMART_GROUP) {
if (!client->group)
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->frame->area);
@ -182,7 +209,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
if (r->width >= client->frame->area.width && if (r->width >= client->frame->area.width &&
r->height >= client->frame->area.height) { r->height >= client->frame->area.height) {
ret = TRUE; ret = TRUE;
if (only_focused) { if (type != SMART_FULL) {
*x = r->x + (r->width - client->frame->area.width) / 2; *x = r->x + (r->width - client->frame->area.width) / 2;
*y = r->y + (r->height - client->frame->area.height) / 2; *y = r->y + (r->height - client->frame->area.height) / 2;
} else { } else {
@ -294,8 +321,9 @@ void place_client(ObClient *client, gint *x, gint *y)
return; return;
if (place_transient(client, x, y) || if (place_transient(client, x, y) ||
place_dialog(client, x, y) || place_dialog(client, x, y) ||
place_smart(client, x, y, FALSE) || place_smart(client, x, y, SMART_FULL) ||
place_smart(client, x, y, TRUE) || place_smart(client, x, y, SMART_GROUP) ||
place_smart(client, x, y, SMART_FOCUSED) ||
(config_focus_follow ? (config_focus_follow ?
place_under_mouse(client, x, y) : place_under_mouse(client, x, y) :
place_random(client, x, y))) place_random(client, x, y)))