X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=6669a28e4c5fa42723c064e3acb527ed2c8f5ffc;hb=1c9a69e1df14f9dc571d739b2acfd9c09b5b7fd7;hp=967b32d380b949dc6461c5da9850e87608eed960;hpb=6675b28dede3e0581a1b1bfb73fb0dd3b5dd1863;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 967b32d3..6669a28e 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 */
@@ -59,7 +59,7 @@ static Rect* pick_head(ObClient *c)
 
 static gboolean place_random(ObClient *client, gint *x, gint *y)
 {
-    int l, r, t, b;
+    gint l, r, t, b;
     Rect *area;
 
     area = pick_head(client);
@@ -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,
@@ -210,48 +210,68 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
     for (i = 0; i < screen_num_monitors; ++i)
         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 = stacking_list; it && !stop; it = g_list_next(it))
-        {
-            ObClient *c;
+    /* 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
+        if (WINDOW_IS_CLIENT(it->data)) {
+            c = it->data;
+            if (c->fullscreen)
                 continue;
+        } else
+            continue;
 
-            if (!SMART_IGNORE(client, c)) {
-                if (type == SMART_FOCUSED) {
-                    if (c->layer <= client->layer && found_foc)
-                        stop = TRUE;
+        if (c->layer > client->layer) {
+            if (!SMART_IGNORE(client, c))
+                spaces = area_remove(spaces, &c->frame->area);
+        } else
+            break;
+    }
+
+    if (client->type == OB_CLIENT_TYPE_NORMAL) {
+        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 && !stop; it = g_list_next(it)) {
+                ObClient *c;
+
+                if (WINDOW_IS_CLIENT(it->data)) {
+                    c = it->data;
+                    if (c->fullscreen)
+                        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);
                 }
-                if (!stop)
+
+                if (c == foc)
+                    found_foc = TRUE;
+            }
+        } else if (type == SMART_GROUP) {
+            /* has to be more than me in the group */
+            if (!client_has_group_siblings(client))
+                return FALSE;
+
+            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 (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)
-            return FALSE;
-
-        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);
-        }
-    } else
-        g_assert_not_reached();
+        } else
+            g_assert_not_reached();
+    }
 
     spaces = g_slist_sort_with_data(spaces, area_cmp, client);
 
@@ -262,7 +282,9 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
             if (r->width >= client->frame->area.width &&
                 r->height >= client->frame->area.height) {
                 ret = TRUE;
-                if (type != SMART_FULL) {
+                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 {
@@ -323,8 +345,8 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
         } else {
             GSList *it;
             gboolean first = TRUE;
-            int l, r, t, b;
-            for (it = client->group->members; it; it = it->next) {
+            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)) {
                     if (first) {
@@ -351,34 +373,16 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
     return FALSE;
 }
 
-static gboolean place_dialog(ObClient *client, gint *x, gint *y)
-{
-    /* center parentless dialogs on the screen */
-    if (client->type == OB_CLIENT_TYPE_DIALOG) {
-        Rect *area;
-
-        area = pick_head(client);
-        if (!area)
-            area = screen_area_monitor(client->desktop, 0);
-
-        *x = (area->width - client->frame->area.width) / 2 + area->x;
-        *y = (area->height - client->frame->area.height) / 2 + area->y;
-        return TRUE;
-    }
-    return FALSE;
-}
-
 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)             ||
+        ((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 */