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;
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)))
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 (WINDOW_IS_CLIENT(it->data)) {
c = it->data;
- if (c->fullscreen)
+ if (c->fullscreen || (c->max_vert && c->max_horz))
continue;
} else
continue;
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;
static gboolean place_transient(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;
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;
}