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
#include "frame.h"
#include "focus.h"
#include "config.h"
+#include "debug.h"
static void add_choice(guint *choice, guint mychoice)
{
g_assert_not_reached();
}
+/*! Pick a monitor to place a window on.
+ The returned array value should be freed with g_free. The areas within the
+ array should not be freed. */
static Rect **pick_head(ObClient *c)
{
Rect **area;
/* try direct parent first */
if (c->transient_for && c->transient_for != OB_TRAN_GROUP) {
add_choice(choice, client_monitor(c->transient_for));
+ ob_debug("placement adding choice %d for parent\n",
+ client_monitor(c->transient_for));
}
/* more than one window in its group (more than just this window) */
if (itc != c &&
(itc->desktop == c->desktop ||
itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL))
+ {
add_choice(choice, client_monitor(it->data));
+ ob_debug("placement adding choice %d for group sibling\n",
+ client_monitor(it->data));
+ }
}
/* try on all desktops */
for (it = c->group->members; it; it = g_slist_next(it)) {
ObClient *itc = it->data;
- if (itc != c)
+ if (itc != c) {
add_choice(choice, client_monitor(it->data));
+ ob_debug("placement adding choice %d for group sibling on "
+ "another desktop\n", client_monitor(it->data));
+ }
}
}
- if (focus_client)
+ if (focus_client) {
add_choice(choice, client_monitor(focus_client));
+ ob_debug("placement adding choice %d for focused window\n",
+ client_monitor(focus_client));
+ }
screen_pointer_pos(&px, &py);
for (i = 0; i < screen_num_monitors; i++)
if (RECT_CONTAINS(*screen_physical_area_monitor(i), px, py)) {
add_choice(choice, i);
+ ob_debug("placement adding choice %d for mouse pointer\n", i);
break;
}
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);
} ObSmartType;
#define SMART_IGNORE(placer, c) \
- (placer == c || !c->frame->visible || c->shaded || !client_normal(c) || \
+ (placer == c || c->shaded || !client_normal(c) || !c->frame->visible || \
(c->desktop != DESKTOP_ALL && \
c->desktop != (placer->desktop == DESKTOP_ALL ? \
screen_desktop : placer->desktop)))
areas = pick_head(client);
- for (i = 0; i < screen_num_monitors; ++i) {
+ for (i = 0; i < screen_num_monitors && !ret; ++i) {
spaces = area_add(spaces, areas[i]);
/* stay out from under windows in higher layers */
if (WINDOW_IS_CLIENT(it->data)) {
c = it->data;
- if (c->fullscreen)
+ if (c->fullscreen || (c->max_vert && c->max_horz))
continue;
} else
continue;
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;
if (WINDOW_IS_CLIENT(it->data)) {
c = it->data;
- if (c->fullscreen)
+ if (c->fullscreen || (c->max_vert && c->max_horz))
continue;
} else
continue;
Rect *area;
area = pick_pointer_head(client);
+ screen_pointer_pos(&px, &py);
l = area->x;
t = area->y;
static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
ObAppSettings *settings)
{
- Rect *screen;
+ Rect *screen = NULL;
if (!settings || (settings && !settings->pos_given))
return FALSE;
/* Find which head the pointer is on */
- if (settings->head == -1)
+ if (settings->monitor == 0)
screen = pick_pointer_head(client);
- else
- screen = screen_area_monitor(client->desktop, settings->head);
+ else if (settings->monitor > 0 &&
+ (guint)settings->monitor <= screen_num_monitors)
+ screen = screen_area_monitor(client->desktop,
+ (guint)settings->monitor - 1);
+ else {
+ Rect **all = NULL;
+ all = pick_head(client);
+ screen = all[0];
+ g_free(all); /* the areas themselves don't need to be freed */
+ }
if (settings->center_x)
*x = screen->x + screen->width / 2 - client->area.width / 2;
return TRUE;
}
-static gboolean place_transient(ObClient *client, gint *x, gint *y)
+static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
{
- if (client->transient_for) {
+ if (client->transient_for && client->type == OB_CLIENT_TYPE_DIALOG) {
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 && client->type == OB_CLIENT_TYPE_DIALOG)
+ || client->type == OB_CLIENT_TYPE_SPLASH)
+ {
+ 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;
}
gboolean ret = FALSE;
if (client->positioned)
return FALSE;
- if (place_transient(client, x, y))
+ if (place_transient_splash(client, x, y))
ret = TRUE;
else if (!(
place_per_app_setting(client, x, y, settings) ||
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;
}
projects / chaz / openbox / blobdiff