#include "frame.h"
#include "focus.h"
#include "config.h"
+#include "dock.h"
#include "debug.h"
-static void add_choice(guint *choice, guint mychoice)
+extern ObDock *dock;
+
+static Rect *pick_pointer_head(ObClient *c)
{
- 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;
- }
- }
+ return screen_area(c->desktop, screen_monitor_pointer(), NULL);
}
-static Rect *pick_pointer_head(ObClient *c)
+/* use the following priority lists for pick_head()
+
+ When a window is being placed in the FOREGROUND, use a monitor chosen in
+ the following order:
+ 1. same monitor as parent
+ 2. primary monitor if placement=PRIMARY
+ active monitor if placement=ACTIVE
+ pointer monitor if placement=MOUSE
+ 3. primary monitor
+ 4. other monitors where the window has group members on the same desktop
+ 5. other monitors where the window has group members on other desktops
+ 6. other monitors
+
+ When a window is being placed in the BACKGROUND, use a monitor chosen in the
+ following order:
+ 1. same monitor as parent
+ 2. other monitors where the window has group members on the same desktop
+ 2a. primary monitor in this set
+ 2b. other monitors in this set
+ 3. other monitors where the window has group members on other desktops
+ 3a. primary monitor in this set
+ 3b. other monitors in this set
+ 4. other monitors
+ 4a. primary monitor in this set
+ 4b. other monitors in this set
+*/
+
+/*! One for each possible head, used to sort them in order of precedence. */
+typedef struct {
+ guint monitor;
+ guint flags;
+} ObPlaceHead;
+
+/*! 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 */
+};
+
+gint cmp_foreground(const void *a, const void *b)
{
- guint i;
- gint px, py;
+ const ObPlaceHead *h1 = a;
+ const ObPlaceHead *h2 = b;
+ gint i = 0;
- screen_pointer_pos(&px, &py);
-
- for (i = 0; i < screen_num_monitors; ++i) {
- if (RECT_CONTAINS(*screen_physical_area_monitor(i), px, py)) {
- return screen_area_monitor(c->desktop, i);
- }
- }
- g_assert_not_reached();
+ if (h1->monitor == h2->monitor) return 0;
+
+ if (h1->flags & HEAD_PARENT) --i;
+ if (h2->flags & HEAD_PARENT) ++i;
+ if (i) return i;
+
+ if (h1->flags & HEAD_PLACED) --i;
+ if (h2->flags & HEAD_PLACED) ++i;
+ if (i) return i;
+
+ if (h1->flags & HEAD_PRIMARY) --i;
+ if (h2->flags & HEAD_PRIMARY) ++i;
+ if (i) return i;
+
+ if (h1->flags & HEAD_GROUP_DESK) --i;
+ if (h2->flags & HEAD_GROUP_DESK) ++i;
+ if (i) return i;
+
+ if (h1->flags & HEAD_GROUP) --i;
+ if (h2->flags & HEAD_GROUP) ++i;
+ if (i) return i;
+
+ return h1->monitor - h2->monitor;
}
-/*! 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)
+gint cmp_background(const void *a, const void *b)
{
- Rect **area;
- guint *choice;
- guint i;
- gint px, py;
-
- 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 */
+ const ObPlaceHead *h1 = a;
+ const ObPlaceHead *h2 = b;
+ gint i = 0;
+
+ if (h1->monitor == h2->monitor) return 0;
+
+ 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;
+ }
- /* 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));
+ 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;
}
- /* more than one window in its group (more than just this window) */
- if (client_has_group_siblings(c)) {
- GSList *it;
+ if (h1->flags & HEAD_PRIMARY) --i;
+ if (h2->flags & HEAD_PRIMARY) ++i;
+ if (i) return i;
- /* 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\n",
- client_monitor(it->data));
- }
- }
+ return h1->monitor - h2->monitor;
+}
- /* try on all desktops */
+/*! Pick a monitor to place a window on. */
+static Rect *pick_head(ObClient *c, gboolean foreground)
+{
+ Rect *area;
+ ObPlaceHead *choice;
+ guint i;
+ ObClient *p;
+ GSList *it;
+
+ choice = g_new(ObPlaceHead, screen_num_monitors);
+ for (i = 0; i < screen_num_monitors; ++i) {
+ choice[i].monitor = i;
+ choice[i].flags = 0;
+ }
+
+ /* find monitors with group members */
+ if (c->group) {
for (it = c->group->members; it; it = g_slist_next(it)) {
- ObClient *itc = it->data;
+ 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\n", client_monitor(it->data));
+ guint m = client_monitor(itc);
+
+ 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;
+ }
}
}
}
- if (focus_client) {
- add_choice(choice, client_monitor(focus_client));
- ob_debug("placement adding choice %d for focused window\n",
- client_monitor(focus_client));
+ 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;
}
- screen_pointer_pos(&px, &py);
+ /* 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;
+ }
- 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;
- }
+ qsort(choice, screen_num_monitors, sizeof(ObPlaceHead),
+ foreground ? cmp_foreground : cmp_background);
- /* add any leftover choices */
+ /* save the areas of the monitors in order of their being chosen */
for (i = 0; i < screen_num_monitors; ++i)
- add_choice(choice, 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");
+ }
- for (i = 0; i < screen_num_monitors; ++i)
- area[i] = screen_area_monitor(c->desktop, choice[i]);
+ area = screen_area(c->desktop, choice[0].monitor, NULL);
+ g_free(choice);
+
+ /* return the area for the chosen monitor */
return area;
}
-static gboolean place_random(ObClient *client, gint *x, gint *y)
+static gboolean place_random(ObClient *client, Rect *area, gint *x, gint *y)
{
gint l, r, t, b;
- Rect **areas;
- guint i;
- areas = pick_head(client);
- i = g_random_int_range(0, screen_num_monitors);
+ ob_debug("placing randomly");
- 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;
+ l = area->x;
+ t = area->y;
+ r = area->x + area->width - client->frame->area.width;
+ b = area->y + area->height - client->frame->area.height;
if (r > l) *x = g_random_int_range(l, r + 1);
- else *x = areas[i]->x;
+ else *x = area->x;
if (b > t) *y = g_random_int_range(t, b + 1);
- else *y = areas[i]->y;
-
- g_free(areas);
+ else *y = area->y;
return TRUE;
}
static GSList* area_add(GSList *list, Rect *a)
{
- Rect *r = g_new(Rect, 1);
+ Rect *r = g_slice_new(Rect);
*r = *a;
return g_slist_prepend(list, r);
}
if (!RECT_INTERSECTS_RECT(*r, *a)) {
result = g_slist_prepend(result, r);
- r = NULL; /* dont free it */
+ /* dont free r, it's moved to the result list */
} else {
Rect isect, extra;
r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
result = area_add(result, &extra);
}
- }
- g_free(r);
+ /* 'r' is not being added to the result list, so free it */
+ g_slice_free(Rect, r);
+ }
}
g_slist_free(list);
return result;
}
-static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
+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
+};
+
+static gboolean place_nooverlap(ObClient *c, Rect *area, gint *x, gint *y)
{
- ObClient *c = data;
- Rect *carea = &c->frame->area;
- const Rect *a1 = p1, *a2 = p2;
- gboolean diffhead = FALSE;
- guint i;
- Rect *a;
-
- for (i = 0; i < screen_num_monitors; ++i) {
- a = screen_physical_area_monitor(i);
- if (RECT_CONTAINS(*a, a1->x, a1->y) &&
- !RECT_CONTAINS(*a, a2->x, a2->y))
- {
- diffhead = TRUE;
- break;
+ gint ignore;
+ gboolean ret;
+ gint maxsize;
+ GSList *spaces = NULL, *sit, *maxit;
+
+ ob_debug("placing nonoverlap");
+
+ ret = FALSE;
+ maxsize = 0;
+ maxit = NULL;
+
+ /* try ignoring different things to find empty space */
+ for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
+ GList *it;
+
+ /* add the whole monitor */
+ spaces = area_add(spaces, area);
+
+ /* 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);
}
- }
-
- /* has to be more than me in the group */
- if (diffhead && client_has_group_siblings(c)) {
- guint *num, most;
- GSList *it;
-
- /* find how many clients in the group are on each monitor, use the
- monitor with the most in it */
- num = g_new0(guint, screen_num_monitors);
- for (it = c->group->members; it; it = g_slist_next(it))
- if (it->data != c)
- ++num[client_monitor(it->data)];
- most = 0;
- for (i = 1; i < screen_num_monitors; ++i)
- if (num[i] > num[most])
- most = i;
-
- g_free(num);
-
- a = screen_physical_area_monitor(most);
- if (RECT_CONTAINS(*a, a1->x, a1->y))
- return -1;
- if (RECT_CONTAINS(*a, a2->x, a2->y))
- return 1;
- }
-
- return MIN((a1->width - carea->width), (a1->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->frame->visible || \
- (c->desktop != DESKTOP_ALL && \
- c->desktop != (placer->desktop == DESKTOP_ALL ? \
- screen_desktop : placer->desktop)))
-
-static gboolean place_smart(ObClient *client, gint *x, gint *y,
- ObSmartType type)
-{
- gboolean ret = FALSE;
- GSList *spaces = NULL, *sit;
- GList *it;
- Rect **areas;
- guint i;
-
- if (type == SMART_GROUP) {
- /* has to be more than me in the group */
- if (!client_has_group_siblings(client))
- return FALSE;
- }
-
- areas = pick_head(client);
-
- for (i = 0; i < screen_num_monitors && !ret; ++i) {
- spaces = area_add(spaces, areas[i]);
-
- /* stay out from under windows in higher layers */
- for (it = stacking_list; it; it = g_list_next(it)) {
- ObClient *c;
-
- if (WINDOW_IS_CLIENT(it->data)) {
- c = it->data;
- if (c->fullscreen || (c->max_vert && c->max_horz))
- continue;
- } else
- continue;
-
- if (c->layer > client->layer) {
- if (!SMART_IGNORE(client, c))
- spaces = area_remove(spaces, &c->frame->area);
- } else
- break;
+ if (ignore < IGNORE_DOCK) {
+ Rect a;
+ dock_get_area(&a);
+ spaces = area_remove(spaces, &a);
}
- if (type == SMART_FULL || type == SMART_FOCUSED) {
- gboolean found_foc = FALSE, stop = FALSE;
- ObClient *foc;
-
- 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 || (c->max_vert && c->max_horz))
- continue;
- } else
- continue;
-
- if (!SMART_IGNORE(client, c)) {
- if (type == SMART_FOCUSED)
- if (found_foc)
- stop = TRUE;
- if (!stop)
- spaces = area_remove(spaces, &c->frame->area);
- }
+ for (sit = spaces; sit; sit = g_slist_next(sit)) {
+ Rect *r = sit->data;
- if (c == foc)
- found_foc = TRUE;
- }
- } else if (type == SMART_GROUP) {
- 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);
+ 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;
}
- } else
- g_assert_not_reached();
+ }
- spaces = g_slist_sort_with_data(spaces, area_cmp, client);
+ if (maxit) {
+ Rect *r = maxit->data;
- for (sit = spaces; sit; sit = g_slist_next(sit)) {
- Rect *r = sit->data;
-
- if (!ret) {
- if (r->width >= client->frame->area.width &&
- r->height >= client->frame->area.height) {
- ret = TRUE;
- if (client->type == OB_CLIENT_TYPE_DIALOG ||
- type != SMART_FULL)
- {
- *x = r->x + (r->width - client->frame->area.width)/2;
- *y = r->y + (r->height - client->frame->area.height)/2;
- } else {
- *x = r->x;
- *y = r->y;
- }
- }
+ /* 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;
+ }
- g_free(r);
+ while (spaces) {
+ g_slice_free(Rect, spaces->data);
+ spaces = g_slist_delete_link(spaces, spaces);
}
- g_slist_free(spaces);
- spaces = NULL;
}
- g_free(areas);
-
return ret;
}
gint px, py;
Rect *area;
+ ob_debug("placing under mouse");
+
+ if (!screen_pointer_pos(&px, &py))
+ return FALSE;
area = pick_pointer_head(client);
- screen_pointer_pos(&px, &py);
l = area->x;
t = area->y;
*y = py - client->area.height / 2 - client->frame->size.top;
*y = MIN(MAX(*y, t), b);
+ g_slice_free(Rect, area);
+
return TRUE;
}
if (!settings || (settings && !settings->pos_given))
return FALSE;
+ ob_debug("placing by per-app settings");
+
/* 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_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 */
+ guint m = settings->monitor;
+ if (m < 1 || m > screen_num_monitors)
+ m = screen_monitor_primary(TRUE) + 1;
+ screen = screen_area(client->desktop, m - 1, NULL);
}
- if (settings->center_x)
+ 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 -
+ settings->position.x.pos;
else
- *x = screen->x + settings->position.x;
+ *x = screen->x + settings->position.x.pos;
+ if (settings->position.x.denom)
+ *x = (*x * screen->width) / settings->position.x.denom;
- if (settings->center_y)
+ 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 -
+ settings->position.y.pos;
else
- *y = screen->y + settings->position.y;
+ *y = screen->y + settings->position.y.pos;
+ if (settings->position.y.denom)
+ *y = (*y * screen->height) / settings->position.y.denom;
+ g_slice_free(Rect, screen);
return TRUE;
}
-static gboolean place_transient(ObClient *client, gint *x, gint *y)
+static gboolean place_transient_splash(ObClient *client, Rect *area,
+ gint *x, gint *y)
{
- 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;
-
- 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) && client_normal(m)) {
- if (first) {
- l = RECT_LEFT(m->frame->area);
- t = RECT_TOP(m->frame->area);
- r = RECT_RIGHT(m->frame->area);
- b = RECT_BOTTOM(m->frame->area);
- first = FALSE;
- } else {
- l = MIN(l, RECT_LEFT(m->frame->area));
- t = MIN(t, RECT_TOP(m->frame->area));
- r = MAX(r, RECT_RIGHT(m->frame->area));
- b = MAX(b, RECT_BOTTOM(m->frame->area));
- }
+ 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) {
+ l = RECT_LEFT(m->frame->area);
+ t = RECT_TOP(m->frame->area);
+ r = RECT_RIGHT(m->frame->area);
+ b = RECT_BOTTOM(m->frame->area);
+ first = FALSE;
+ } else {
+ l = MIN(l, RECT_LEFT(m->frame->area));
+ t = MIN(t, RECT_TOP(m->frame->area));
+ r = MAX(r, RECT_RIGHT(m->frame->area));
+ b = MAX(b, RECT_BOTTOM(m->frame->area));
}
}
if (!first) {
- *x = ((r + 1 - l) - client->frame->area.width) / 2 + l;
+ *x = ((r + 1 - l) - client->frame->area.width) / 2 + l;
*y = ((b + 1 - t) - client->frame->area.height) / 2 + t;
return TRUE;
}
}
}
- if (client->transient) {
- Rect **areas;
+ if (client->type == OB_CLIENT_TYPE_DIALOG ||
+ client->type == OB_CLIENT_TYPE_SPLASH)
+ {
+ ob_debug("placing dialog or splash");
- 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);
+ *x = (area->width - client->frame->area.width) / 2 + area->x;
+ *y = (area->height - client->frame->area.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,
+/*! Return TRUE if openbox chose the position for the window, and FALSE if
+ the application chose it */
+gboolean place_client(ObClient *client, gboolean foreground, gint *x, gint *y,
ObAppSettings *settings)
{
- gboolean ret = FALSE;
- if (client->positioned)
+ Rect *area;
+ gboolean ret;
+
+ /* 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)))
return FALSE;
- if (place_transient(client, x, y))
- ret = TRUE;
- else if (!(
- place_per_app_setting(client, x, y, settings) ||
- ((config_place_policy == OB_PLACE_POLICY_MOUSE) ?
- place_under_mouse(client, x, y) :
- place_smart(client, x, y, SMART_FULL) ||
- place_smart(client, x, y, SMART_GROUP) ||
- place_smart(client, x, y, SMART_FOCUSED) ||
- place_random(client, x, y))))
- g_assert_not_reached(); /* the last one better succeed */
+
+ area = pick_head(client, foreground);
+
+ /* try a number of methods */
+ ret = place_per_app_setting(client, x, y, settings) ||
+ place_transient_splash(client, area, x, y) ||
+ (config_place_policy == OB_PLACE_POLICY_MOUSE &&
+ place_under_mouse(client, x, y)) ||
+ place_nooverlap(client, area, x, y) ||
+ place_random(client, area, x, y);
+ g_assert(ret);
+
+ g_slice_free(Rect, area);
+
/* get where the client should be */
- frame_frame_gravity(client->frame, x, y,
- client->area.width, client->area.height);
- return ret;
+ frame_frame_gravity(client->frame, x, y);
+ return TRUE;
}