X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=cf03b72d6874690977f9f5e2a5d1ce2cb5d8f204;hb=380af80a136214e15ff8efa9f5c8ad6dd511872a;hp=d28d47c3e281d1223d7ce830a84d70b4221714de;hpb=617bd951d6a78cb838504605e19b37f9d11dd5c0;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index d28d47c3..cf03b72d 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -32,7 +32,7 @@ static Rect* pick_head(ObClient *c)
     }
 
     /* more than one guy in his group (more than just him) */
-    if (c->group && c->group->members->next) {
+    if (client_has_group_siblings(c)) {
         GSList *it;
 
         /* try on the client's desktop */
@@ -160,7 +160,7 @@ static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
     }
 
     /* has to be more than me in the group */
-    if (diffhead && c->group && c->group->members->next) {
+    if (diffhead && client_has_group_siblings(c)) {
         guint *num, most;
         GSList *it;
 
@@ -193,10 +193,10 @@ typedef enum
     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,
@@ -211,23 +211,37 @@ 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->group || !client->group->members->next)
+        if (!client_has_group_siblings(client))
             return FALSE;
 
         for (sit = client->group->members; sit; sit = g_slist_next(sit)) {
@@ -235,6 +249,22 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
             if (!SMART_IGNORE(client, c))
                 spaces = area_remove(spaces, &c->frame->area);
         }
+
+        /* 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;
+            else
+                continue;
+
+            if (c->layer > client->layer) {
+                if (!SMART_IGNORE(client, c))
+                    spaces = area_remove(spaces, &c->frame->area);
+            } else
+                break;
+        }
     } else
         g_assert_not_reached();
 
@@ -357,13 +387,13 @@ void place_client(ObClient *client, gint *x, gint *y)
 {
     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 */