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 ? \
+#define SMART_IGNORE(placer, c) \
+ (placer == c || !c->frame->visible || 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,
spaces = area_add(spaces, screen_area_monitor(client->desktop, i));
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;
- for (it = list; it; it = g_list_next(it)) {
- ObClient *c = it->data;
+ for (it = stacking_list; it && !stop; it = g_list_next(it))
+ {
+ ObClient *c;
+
+ if (WINDOW_IS_CLIENT(it->data))
+ c = it->data;
+ else
+ continue;
if (!SMART_IGNORE(client, c)) {
- spaces = area_remove(spaces, &c->frame->area);
- if (type == SMART_FOCUSED)
- break;
+ if (type == SMART_FOCUSED) {
+ if (c->layer <= client->layer && found_foc)
+ stop = TRUE;
+ }
+ if (!stop)
+ spaces = area_remove(spaces, &c->frame->area);
}
+
+ if (c == foc)
+ found_foc = TRUE;
}
} else if (type == SMART_GROUP) {
/* has to be more than me in the group */
{
if (client->positioned)
return;
- if (place_transient(client, x, y) ||
- place_dialog(client, x, y) ||
- place_smart(client, x, y, SMART_FULL) ||
- place_smart(client, x, y, SMART_GROUP) ||
- place_smart(client, x, y, SMART_FOCUSED) ||
- (config_focus_follow ?
+ if (place_transient(client, x, y) ||
+ place_dialog(client, x, y) ||
+ ((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)))
{
/* get where the client should be */