#include "config.h"
#include "dock.h"
#include "debug.h"
+#include "place_overlap.h"
extern ObDock *dock;
-static void add_choice(guint *choice, guint mychoice)
-{
- guint i;
- for (i = 0; i < screen_num_monitors; ++i) {
- if (choice[i] == mychoice)
- return;
- else if (choice[i] == screen_num_monitors) {
- choice[i] = mychoice;
- return;
- }
- }
-}
-
-static Rect *pick_pointer_head(ObClient *c)
+static Rect *choose_pointer_monitor(ObClient *c)
{
return screen_area(c->desktop, screen_monitor_pointer(), NULL);
}
-/*! Pick a monitor to place a window on. */
-static Rect **pick_head(ObClient *c)
-{
- Rect **area;
- guint *choice;
- guint i;
- gint px, py;
- ObClient *p;
+/* use the following priority lists for choose_monitor()
+
+ When a window is being placed in the FOREGROUND, use a monitor chosen in
+ the following order:
+ 1. per-app settings
+ 2. same monitor as parent
+ 3. primary monitor if placement=PRIMARY
+ active monitor if placement=ACTIVE
+ pointer monitor if placement=MOUSE
+ 4. primary monitor
+ 5. other monitors where the window has group members on the same desktop
+ 6. other monitors where the window has group members on other desktops
+ 7. other monitors
+
+ When a window is being placed in the BACKGROUND, use a monitor chosen in the
+ following order:
+ 1. per-app settings
+ 2. same monitor as parent
+ 3. other monitors where the window has group members on the same desktop
+ 3a. primary monitor in this set
+ 3b. other monitors in this set
+ 4. other monitors where the window has group members on other desktops
+ 4a. primary monitor in this set
+ 4b. other monitors in this set
+ 5. other monitors
+ 5a. primary monitor in this set
+ 5b. other monitors in this set
+*/
- area = g_new(Rect*, screen_num_monitors);
- choice = g_new(guint, screen_num_monitors);
- for (i = 0; i < screen_num_monitors; ++i)
- choice[i] = screen_num_monitors; /* make them all invalid to start */
+/*! One for each possible head, used to sort them in order of precedence. */
+typedef struct {
+ guint monitor;
+ guint flags;
+} ObPlaceHead;
- /* try direct parent first */
- if ((p = client_direct_parent(c))) {
- add_choice(choice, client_monitor(p));
- ob_debug("placement adding choice %d for parent",
- client_monitor(p));
- }
+/*! Flags for ObPlaceHead */
+enum {
+ HEAD_PARENT = 1 << 0, /* parent's monitor */
+ HEAD_PLACED = 1 << 1, /* chosen monitor by placement */
+ HEAD_PRIMARY = 1 << 2, /* primary monitor */
+ HEAD_GROUP_DESK = 1 << 3, /* has a group member on the same desktop */
+ HEAD_GROUP = 1 << 4, /* has a group member on another desktop */
+ HEAD_PERAPP = 1 << 5, /* chosen by per-app settings */
+};
- /* more than one window in its group (more than just this window) */
- if (client_has_group_siblings(c)) {
- GSList *it;
+gint cmp_foreground(const void *a, const void *b)
+{
+ const ObPlaceHead *h1 = a;
+ const ObPlaceHead *h2 = b;
+ gint i = 0;
- /* try on the client's desktop */
- for (it = c->group->members; it; it = g_slist_next(it)) {
- ObClient *itc = it->data;
- 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",
- client_monitor(it->data));
- }
- }
+ if (h1->monitor == h2->monitor) return 0;
- /* try on all desktops */
- for (it = c->group->members; it; it = g_slist_next(it)) {
- ObClient *itc = it->data;
- if (itc != c) {
- add_choice(choice, client_monitor(it->data));
- ob_debug("placement adding choice %d for group sibling on "
- "another desktop", client_monitor(it->data));
- }
- }
- }
+ if (h1->flags & HEAD_PERAPP) --i;
+ if (h2->flags & HEAD_PERAPP) ++i;
+ if (i) return i;
- /* skip this if placing by the mouse position */
- if (focus_client && client_normal(focus_client) &&
- config_place_monitor != OB_PLACE_MONITOR_MOUSE)
- {
- add_choice(choice, client_monitor(focus_client));
- ob_debug("placement adding choice %d for normal focused window",
- client_monitor(focus_client));
- }
+ if (h1->flags & HEAD_PARENT) --i;
+ if (h2->flags & HEAD_PARENT) ++i;
+ if (i) return i;
- screen_pointer_pos(&px, &py);
+ if (h1->flags & HEAD_PLACED) --i;
+ if (h2->flags & HEAD_PLACED) ++i;
+ if (i) return i;
- for (i = 0; i < screen_num_monitors; i++) {
- Rect *monitor = screen_physical_area_monitor(i);
- gboolean contain = RECT_CONTAINS(*monitor, px, py);
- g_free(monitor);
- if (contain) {
- add_choice(choice, i);
- ob_debug("placement adding choice %d for mouse pointer", i);
- break;
- }
- }
+ if (h1->flags & HEAD_PRIMARY) --i;
+ if (h2->flags & HEAD_PRIMARY) ++i;
+ if (i) return i;
- /* add any leftover choices */
- for (i = 0; i < screen_num_monitors; ++i)
- add_choice(choice, i);
+ if (h1->flags & HEAD_GROUP_DESK) --i;
+ if (h2->flags & HEAD_GROUP_DESK) ++i;
+ if (i) return i;
- for (i = 0; i < screen_num_monitors; ++i)
- area[i] = screen_area(c->desktop, choice[i], NULL);
+ if (h1->flags & HEAD_GROUP) --i;
+ if (h2->flags & HEAD_GROUP) ++i;
+ if (i) return i;
- g_free(choice);
-
- return area;
+ return h1->monitor - h2->monitor;
}
-static gboolean place_random(ObClient *client, gint *x, gint *y)
+gint cmp_background(const void *a, const void *b)
{
- gint l, r, t, b;
- Rect **areas;
- guint i;
-
- areas = pick_head(client);
- i = (config_place_monitor != OB_PLACE_MONITOR_ANY) ?
- 0 : g_random_int_range(0, screen_num_monitors);
-
- l = areas[i]->x;
- t = areas[i]->y;
- r = areas[i]->x + areas[i]->width - client->frame->area.width;
- b = areas[i]->y + areas[i]->height - client->frame->area.height;
-
- if (r > l) *x = g_random_int_range(l, r + 1);
- else *x = areas[i]->x;
- if (b > t) *y = g_random_int_range(t, b + 1);
- else *y = areas[i]->y;
+ const ObPlaceHead *h1 = a;
+ const ObPlaceHead *h2 = b;
+ gint i = 0;
+
+ if (h1->monitor == h2->monitor) return 0;
+
+ if (h1->flags & HEAD_PERAPP) --i;
+ if (h2->flags & HEAD_PERAPP) ++i;
+ if (i) return i;
+
+ if (h1->flags & HEAD_PARENT) --i;
+ if (h2->flags & HEAD_PARENT) ++i;
+ if (i) return i;
+
+ if (h1->flags & HEAD_GROUP_DESK || h2->flags & HEAD_GROUP_DESK) {
+ if (h1->flags & HEAD_GROUP_DESK) --i;
+ if (h2->flags & HEAD_GROUP_DESK) ++i;
+ if (i) return i;
+ if (h1->flags & HEAD_PRIMARY) --i;
+ if (h2->flags & HEAD_PRIMARY) ++i;
+ if (i) return i;
+ }
- for (i = 0; i < screen_num_monitors; ++i)
- g_free(areas[i]);
- g_free(areas);
+ if (h1->flags & HEAD_GROUP || h2->flags & HEAD_GROUP) {
+ if (h1->flags & HEAD_GROUP) --i;
+ if (h2->flags & HEAD_GROUP) ++i;
+ if (i) return i;
+ if (h1->flags & HEAD_PRIMARY) --i;
+ if (h2->flags & HEAD_PRIMARY) ++i;
+ if (i) return i;
+ }
- return TRUE;
-}
+ if (h1->flags & HEAD_PRIMARY) --i;
+ if (h2->flags & HEAD_PRIMARY) ++i;
+ if (i) return i;
-static GSList* area_add(GSList *list, Rect *a)
-{
- Rect *r = g_new(Rect, 1);
- *r = *a;
- return g_slist_prepend(list, r);
+ return h1->monitor - h2->monitor;
}
-static GSList* area_remove(GSList *list, Rect *a)
+/*! Pick a monitor to place a window on. */
+static Rect* choose_monitor(ObClient *c, gboolean client_to_be_foregrounded,
+ ObAppSettings *settings)
{
- GSList *sit;
- GSList *result = NULL;
-
- for (sit = list; sit; sit = g_slist_next(sit)) {
- Rect *r = sit->data;
-
- if (!RECT_INTERSECTS_RECT(*r, *a)) {
- result = g_slist_prepend(result, r);
- /* dont free r, it's moved to the result list */
- } else {
- Rect isect, extra;
-
- /* Use an intersection of a and r to determine the space
- around r that we can use.
-
- NOTE: the spaces calculated can overlap.
- */
-
- RECT_SET_INTERSECTION(isect, *r, *a);
-
- if (RECT_LEFT(isect) > RECT_LEFT(*r)) {
- RECT_SET(extra, r->x, r->y,
- RECT_LEFT(isect) - r->x, r->height);
- result = area_add(result, &extra);
- }
+ Rect *area;
+ ObPlaceHead *choice;
+ guint i;
+ ObClient *p;
+ GSList *it;
- if (RECT_TOP(isect) > RECT_TOP(*r)) {
- RECT_SET(extra, r->x, r->y,
- r->width, RECT_TOP(isect) - r->y + 1);
- result = area_add(result, &extra);
- }
+ choice = g_new(ObPlaceHead, screen_num_monitors);
+ for (i = 0; i < screen_num_monitors; ++i) {
+ choice[i].monitor = i;
+ choice[i].flags = 0;
+ }
- if (RECT_RIGHT(isect) < RECT_RIGHT(*r)) {
- RECT_SET(extra, RECT_RIGHT(isect) + 1, r->y,
- RECT_RIGHT(*r) - RECT_RIGHT(isect), r->height);
- result = area_add(result, &extra);
- }
+ /* find monitors with group members */
+ if (c->group) {
+ for (it = c->group->members; it; it = g_slist_next(it)) {
+ ObClient *itc = it->data;
+ if (itc != c) {
+ guint m = client_monitor(itc);
- if (RECT_BOTTOM(isect) < RECT_BOTTOM(*r)) {
- RECT_SET(extra, r->x, RECT_BOTTOM(isect) + 1,
- r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
- result = area_add(result, &extra);
+ if (m < screen_num_monitors) {
+ if (screen_compare_desktops(itc->desktop, c->desktop))
+ choice[m].flags |= HEAD_GROUP_DESK;
+ else
+ choice[m].flags |= HEAD_GROUP;
+ }
}
-
- /* 'r' is not being added to the result list, so free it */
- g_free(r);
}
}
- g_slist_free(list);
- return result;
-}
-enum {
- IGNORE_FULLSCREEN = 1,
- IGNORE_MAXIMIZED = 2,
- IGNORE_MENUTOOL = 3,
- /*IGNORE_SHADED = 3,*/
- IGNORE_NONGROUP = 4,
- IGNORE_BELOW = 5,
- /*IGNORE_NONFOCUS = 1 << 5,*/
- IGNORE_DOCK = 6,
- IGNORE_END = 7
-};
+ i = screen_monitor_primary(FALSE);
+ if (i < screen_num_monitors) {
+ choice[i].flags |= HEAD_PRIMARY;
+ if (config_place_monitor == OB_PLACE_MONITOR_PRIMARY)
+ choice[i].flags |= HEAD_PLACED;
+ if (settings &&
+ settings->monitor_type == OB_PLACE_MONITOR_PRIMARY)
+ choice[i].flags |= HEAD_PERAPP;
+ }
-static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
-{
- Rect **areas;
- gint ignore;
- gboolean ret;
- gint maxsize;
- GSList *spaces = NULL, *sit, *maxit;
- guint i;
+ i = screen_monitor_active();
+ if (i < screen_num_monitors) {
+ if (config_place_monitor == OB_PLACE_MONITOR_ACTIVE)
+ choice[i].flags |= HEAD_PLACED;
+ if (settings &&
+ settings->monitor_type == OB_PLACE_MONITOR_ACTIVE)
+ choice[i].flags |= HEAD_PERAPP;
+ }
- areas = pick_head(c);
- ret = FALSE;
- maxsize = 0;
- maxit = NULL;
-
- /* try ignoring different things to find empty space */
- for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
- /* try all monitors in order of preference, but only the first one
- if config_place_monitor is MOUSE or ACTIVE */
- for (i = 0; (i < (config_place_monitor != OB_PLACE_MONITOR_ANY ?
- 1 : screen_num_monitors) && !ret); ++i)
- {
- GList *it;
-
- /* add the whole monitor */
- spaces = area_add(spaces, areas[i]);
-
- /* go thru all the windows */
- for (it = client_list; it; it = g_list_next(it)) {
- ObClient *test = it->data;
-
- /* should we ignore this client? */
- if (screen_showing_desktop) continue;
- if (c == test) continue;
- if (test->iconic) continue;
- if (c->desktop != DESKTOP_ALL) {
- if (test->desktop != c->desktop &&
- test->desktop != DESKTOP_ALL) continue;
- } else {
- if (test->desktop != screen_desktop &&
- test->desktop != DESKTOP_ALL) continue;
- }
- if (test->type == OB_CLIENT_TYPE_SPLASH ||
- test->type == OB_CLIENT_TYPE_DESKTOP) continue;
-
-
- if ((ignore >= IGNORE_FULLSCREEN) &&
- test->fullscreen) continue;
- if ((ignore >= IGNORE_MAXIMIZED) &&
- test->max_horz && test->max_vert) continue;
- if ((ignore >= IGNORE_MENUTOOL) &&
- (test->type == OB_CLIENT_TYPE_MENU ||
- test->type == OB_CLIENT_TYPE_TOOLBAR) &&
- client_has_parent(c)) continue;
- /*
- if ((ignore >= IGNORE_SHADED) &&
- test->shaded) continue;
- */
- if ((ignore >= IGNORE_NONGROUP) &&
- client_has_group_siblings(c) &&
- test->group != c->group) continue;
- if ((ignore >= IGNORE_BELOW) &&
- test->layer < c->layer) continue;
- /*
- if ((ignore >= IGNORE_NONFOCUS) &&
- focus_client != test) continue;
- */
- /* don't ignore this window, so remove it from the available
- area */
- spaces = area_remove(spaces, &test->frame->area);
- }
+ i = screen_monitor_pointer();
+ if (i < screen_num_monitors) {
+ if (config_place_monitor == OB_PLACE_MONITOR_MOUSE)
+ choice[i].flags |= HEAD_PLACED;
+ if (settings &&
+ settings->monitor_type == OB_PLACE_MONITOR_MOUSE)
+ choice[i].flags |= HEAD_PERAPP;
+ }
- if (ignore < IGNORE_DOCK) {
- Rect a;
- dock_get_area(&a);
- spaces = area_remove(spaces, &a);
- }
+ if (settings) {
+ i = settings->monitor - 1;
+ if (i < screen_num_monitors)
+ choice[i].flags |= HEAD_PERAPP;
+ }
- for (sit = spaces; sit; sit = g_slist_next(sit)) {
- Rect *r = sit->data;
+ /* direct parent takes highest precedence */
+ if ((p = client_direct_parent(c))) {
+ i = client_monitor(p);
+ if (i < screen_num_monitors)
+ choice[i].flags |= HEAD_PARENT;
+ }
- if (r->width >= c->frame->area.width &&
- r->height >= c->frame->area.height &&
- r->width * r->height > maxsize)
- {
- maxsize = r->width * r->height;
- maxit = sit;
- }
- }
+ qsort(choice, screen_num_monitors, sizeof(ObPlaceHead),
+ client_to_be_foregrounded ? cmp_foreground : cmp_background);
- if (maxit) {
- Rect *r = maxit->data;
+ /* save the areas of the monitors in order of their being chosen */
+ for (i = 0; i < screen_num_monitors; ++i)
+ {
+ ob_debug("placement choice %d is monitor %d", i, choice[i].monitor);
+ if (choice[i].flags & HEAD_PARENT)
+ ob_debug(" - parent on monitor");
+ if (choice[i].flags & HEAD_PLACED)
+ ob_debug(" - placement choice");
+ if (choice[i].flags & HEAD_PRIMARY)
+ ob_debug(" - primary monitor");
+ if (choice[i].flags & HEAD_GROUP_DESK)
+ ob_debug(" - group on same desktop");
+ if (choice[i].flags & HEAD_GROUP)
+ ob_debug(" - group on other desktop");
+ }
- /* center it in the area */
- *x = r->x;
- *y = r->y;
- if (config_place_center) {
- *x += (r->width - c->frame->area.width) / 2;
- *y += (r->height - c->frame->area.height) / 2;
- }
- ret = TRUE;
- }
+ area = screen_area(c->desktop, choice[0].monitor, NULL);
- while (spaces) {
- g_free(spaces->data);
- spaces = g_slist_delete_link(spaces, spaces);
- }
- }
- }
+ g_free(choice);
- for (i = 0; i < screen_num_monitors; ++i)
- g_free(areas[i]);
- g_free(areas);
- return ret;
+ /* return the area for the chosen monitor */
+ return area;
}
-static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
+static gboolean place_under_mouse(ObClient *client, gint *x, gint *y,
+ Size frame_size)
{
+ if (config_place_policy != OB_PLACE_POLICY_MOUSE)
+ return FALSE;
+
gint l, r, t, b;
gint px, py;
Rect *area;
+ ob_debug("placing under mouse");
+
if (!screen_pointer_pos(&px, &py))
return FALSE;
- area = pick_pointer_head(client);
+ area = choose_pointer_monitor(client);
l = area->x;
t = area->y;
- r = area->x + area->width - client->frame->area.width;
- b = area->y + area->height - client->frame->area.height;
+ r = area->x + area->width - frame_size.width;
+ b = area->y + area->height - frame_size.height;
- *x = px - client->area.width / 2 - client->frame->size.left;
+ *x = px - frame_size.width / 2;
*x = MIN(MAX(*x, l), r);
- *y = py - client->area.height / 2 - client->frame->size.top;
+ *y = py - frame_size.height / 2;
*y = MIN(MAX(*y, t), b);
+ g_slice_free(Rect, area);
+
return TRUE;
}
-static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
- ObAppSettings *settings)
+static gboolean place_per_app_setting_position(ObClient *client, Rect *screen,
+ gint *x, gint *y,
+ ObAppSettings *settings,
+ Size frame_size)
{
- Rect *screen = NULL;
-
- if (!settings || (settings && !settings->pos_given))
+ if (!settings || !settings->pos_given)
return FALSE;
- /* Find which head the pointer is on */
- if (settings->monitor == 0)
- /* this can return NULL */
- screen = pick_pointer_head(client);
- else if (settings->monitor > 0 &&
- (guint)settings->monitor <= screen_num_monitors)
- screen = screen_area(client->desktop, (guint)settings->monitor - 1,
- NULL);
-
- /* if we have't found a screen yet.. */
- if (!screen) {
- Rect **areas;
- guint i;
-
- areas = pick_head(client);
- screen = areas[0];
-
- /* don't free the first one, it's being set as "screen" */
- for (i = 1; i < screen_num_monitors; ++i)
- g_free(areas[i]);
- g_free(areas);
- }
+ ob_debug("placing by per-app settings");
if (settings->position.x.center)
*x = screen->x + screen->width / 2 - client->area.width / 2;
else if (settings->position.x.opposite)
- *x = screen->x + screen->width - client->frame->area.width -
+ *x = screen->x + screen->width - frame_size.width -
settings->position.x.pos;
else
*x = screen->x + settings->position.x.pos;
+ if (settings->position.x.denom)
+ *x = (*x * screen->width) / settings->position.x.denom;
if (settings->position.y.center)
*y = screen->y + screen->height / 2 - client->area.height / 2;
else if (settings->position.y.opposite)
- *y = screen->y + screen->height - client->frame->area.height -
+ *y = screen->y + screen->height - frame_size.height -
settings->position.y.pos;
else
*y = screen->y + settings->position.y.pos;
+ if (settings->position.y.denom)
+ *y = (*y * screen->height) / settings->position.y.denom;
- g_free(screen);
return TRUE;
}
-static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
+static void place_per_app_setting_size(ObClient *client, Rect *screen,
+ gint *w, gint *h,
+ ObAppSettings *settings)
+{
+ if (!settings || !settings->size_given)
+ return;
+
+ ob_debug("sizing by per-app settings");
+
+ g_assert(settings->width_num > 0);
+ g_assert(settings->width_denom >= 0);
+ g_assert(settings->height_num > 0);
+ g_assert(settings->height_denom >= 0);
+
+ if (!settings->width_denom)
+ *w = settings->width_num;
+ else {
+ *w = screen->width * settings->width_num / settings->width_denom;
+ *w = MIN(*w, screen->width);
+ }
+
+ if (!settings->height_denom)
+ *h = settings->height_num;
+ else {
+ *h = screen->height * settings->height_num / settings->height_denom;
+ *h = MIN(*h, screen->height);
+ }
+}
+
+static gboolean place_transient_splash(ObClient *client, Rect *area,
+ gint *x, gint *y, Size frame_size)
{
if (client->type == OB_CLIENT_TYPE_DIALOG) {
GSList *it;
gboolean first = TRUE;
gint l, r, t, b;
+
+ ob_debug("placing dialog");
+
for (it = client->parents; it; it = g_slist_next(it)) {
ObClient *m = it->data;
if (!m->iconic) {
}
}
if (!first) {
- *x = ((r + 1 - l) - client->frame->area.width) / 2 + l;
- *y = ((b + 1 - t) - client->frame->area.height) / 2 + t;
+ *x = ((r + 1 - l) - frame_size.width) / 2 + l;
+ *y = ((b + 1 - t) - frame_size.height) / 2 + t;
return TRUE;
}
}
if (client->type == OB_CLIENT_TYPE_DIALOG ||
client->type == OB_CLIENT_TYPE_SPLASH)
{
- Rect **areas;
- guint i;
-
- 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;
+ ob_debug("placing dialog or splash");
- for (i = 0; i < screen_num_monitors; ++i)
- g_free(areas[i]);
- g_free(areas);
+ *x = (area->width - frame_size.width) / 2 + area->x;
+ *y = (area->height - frame_size.height) / 2 + area->y;
return TRUE;
}
return FALSE;
}
-/* Return TRUE if we want client.c to enforce on-screen-keeping */
-gboolean place_client(ObClient *client, gint *x, gint *y,
- ObAppSettings *settings)
+static gboolean place_least_overlap(ObClient *c, Rect *head, int *x, int *y,
+ Size frame_size)
+{
+ /* Assemble the list of windows that could overlap with @c in the user's
+ current view. */
+ GSList* potential_overlap_clients = NULL;
+ gint n_client_rects = 0;
+
+ /* if we're "showing desktop", ignore all existing windows */
+ if (!screen_showing_desktop) {
+ GList* it;
+ for (it = client_list; it != NULL; it = g_list_next(it)) {
+ ObClient* maybe_client = (ObClient*)it->data;
+ if (maybe_client == c)
+ continue;
+ if (maybe_client->iconic)
+ continue;
+ if (!client_occupies_space(maybe_client))
+ continue;
+ if (c->desktop != DESKTOP_ALL) {
+ if (maybe_client->desktop != c->desktop &&
+ maybe_client->desktop != DESKTOP_ALL)
+ continue;
+ } else {
+ if (maybe_client->desktop != screen_desktop &&
+ maybe_client->desktop != DESKTOP_ALL)
+ continue;
+ }
+
+ potential_overlap_clients = g_slist_prepend(
+ potential_overlap_clients, maybe_client);
+ n_client_rects += 1;
+ }
+ }
+ Rect client_rects[n_client_rects];
+
+ GSList* it;
+ guint i = 0;
+ for (it = potential_overlap_clients; it != NULL; it = g_slist_next(it)) {
+ ObClient* potential_overlap_client = (ObClient*)it->data;
+ client_rects[i] = potential_overlap_client->frame->area;
+ i += 1;
+ }
+ g_slist_free(potential_overlap_clients);
+
+ Point result;
+ place_overlap_find_least_placement(client_rects, n_client_rects, head,
+ &frame_size, &result);
+ *x = result.x;
+ *y = result.y;
+
+ return TRUE;
+}
+
+static gboolean should_set_client_position(ObClient *client,
+ ObAppSettings *settings)
+{
+ gboolean has_position = settings && settings->pos_given;
+ gboolean has_forced_position = has_position && settings->pos_force;
+
+ gboolean user_positioned = client->positioned & USPosition;
+ if (user_positioned && !has_forced_position)
+ return FALSE;
+
+ gboolean program_positioned = client->positioned & PPosition;
+ if (program_positioned && !has_position)
+ return FALSE;
+
+ return TRUE;
+}
+
+gboolean place_client(ObClient *client, gboolean client_to_be_foregrounded,
+ Rect* client_area, ObAppSettings *settings)
{
gboolean ret;
- gboolean userplaced = FALSE;
-
- /* per-app settings override program specified position
- * but not user specified, unless pos_force is enabled */
- if (((client->positioned & USPosition) &&
- !(settings && settings->pos_given && settings->pos_force)) ||
- ((client->positioned & PPosition) &&
- !(settings && settings->pos_given)))
+ Rect *monitor_area;
+ int *x, *y, *w, *h;
+ Size frame_size;
+
+ monitor_area = choose_monitor(client, client_to_be_foregrounded, settings);
+
+ w = &client_area->width;
+ h = &client_area->height;
+ place_per_app_setting_size(client, monitor_area, w, h, settings);
+
+ if (!should_set_client_position(client, settings))
return FALSE;
- /* try a number of methods */
- ret = place_transient_splash(client, x, y) ||
- (userplaced = place_per_app_setting(client, x, y, settings)) ||
- (config_place_policy == OB_PLACE_POLICY_MOUSE &&
- place_under_mouse(client, x, y)) ||
- place_nooverlap(client, x, y) ||
- place_random(client, x, y);
+ x = &client_area->x;
+ y = &client_area->y;
+
+ SIZE_SET(frame_size,
+ *w + client->frame->size.left + client->frame->size.right,
+ *h + client->frame->size.top + client->frame->size.bottom);
+
+ ret =
+ place_per_app_setting_position(client, monitor_area, x, y, settings,
+ frame_size) ||
+ place_transient_splash(client, monitor_area, x, y, frame_size) ||
+ place_under_mouse(client, x, y, frame_size) ||
+ place_least_overlap(client, monitor_area, x, y, frame_size);
g_assert(ret);
+ g_slice_free(Rect, monitor_area);
+
/* get where the client should be */
frame_frame_gravity(client->frame, x, y);
- return !userplaced;
+ return TRUE;
}