X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=ea131bea3e1e73de60d99e05633436f144c77c4f;hb=8772b46b56172e35506f21d626aa89bd649615c6;hp=1ac295c0779b2758a27ae93230be1536758e3996;hpb=55d2916c1e24e021d9b9692d2373dc4afff4c5c2;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 1ac295c0..ea131bea 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -23,6 +23,7 @@
 #include "frame.h"
 #include "focus.h"
 #include "config.h"
+#include "debug.h"
 
 static void add_choice(guint *choice, guint mychoice)
 {
@@ -52,6 +53,9 @@ static Rect *pick_pointer_head(ObClient *c)
     g_assert_not_reached();
 }
 
+/*! 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)
 {
     Rect **area;
@@ -67,6 +71,8 @@ static Rect **pick_head(ObClient *c)
     /* 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));
     }
 
     /* more than one window in its group (more than just this window) */
@@ -79,25 +85,36 @@ static Rect **pick_head(ObClient *c)
             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));
+            }
         }
 
         /* try on all desktops */
         for (it = c->group->members; it; it = g_slist_next(it)) {
             ObClient *itc = it->data;            
-            if (itc != c)
+            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));
+            }
         }
     }
 
-    if (focus_client)
+    if (focus_client) {
         add_choice(choice, client_monitor(focus_client));
+        ob_debug("placement adding choice %d for focused window\n",
+                 client_monitor(focus_client));
+    }
 
     screen_pointer_pos(&px, &py);
 
     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;
         }
 
@@ -251,13 +268,16 @@ typedef enum
 } ObSmartType;
 
 #define SMART_IGNORE(placer, c) \
-    (placer == c || !c->frame->visible || c->shaded || !client_normal(c) || \
+    (placer == c || c->shaded || !c->frame->visible || \
+     c->type == OB_CLIENT_TYPE_SPLASH || c->type == OB_CLIENT_TYPE_DESKTOP || \
+     ((c->type == OB_CLIENT_TYPE_MENU || c->type == OB_CLIENT_TYPE_TOOLBAR) &&\
+      client_has_parent(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,
-                            ObSmartType type)
+                            ObSmartType type, gboolean ignore_max)
 {
     gboolean ret = FALSE;
     GSList *spaces = NULL, *sit;
@@ -273,7 +293,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
     areas = pick_head(client);
 
-    for (i = 0; i < screen_num_monitors; ++i) {
+    for (i = 0; i < screen_num_monitors && !ret; ++i) {
         spaces = area_add(spaces, areas[i]);
 
         /* stay out from under windows in higher layers */
@@ -282,7 +302,8 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
             if (WINDOW_IS_CLIENT(it->data)) {
                 c = it->data;
-                if (c->fullscreen)
+                if (ignore_max &&
+                    (c->fullscreen || (c->max_vert && c->max_horz)))
                     continue;
             } else
                 continue;
@@ -306,7 +327,8 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
                 if (WINDOW_IS_CLIENT(it->data)) {
                     c = it->data;
-                    if (c->fullscreen)
+                    if (ignore_max &&
+                        (c->fullscreen || (c->max_vert && c->max_horz)))
                         continue;
                 } else
                     continue;
@@ -388,16 +410,24 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
 static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
                                       ObAppSettings *settings)
 {
-    Rect *screen;
+    Rect *screen = NULL;
 
     if (!settings || (settings && !settings->pos_given))
         return FALSE;
 
     /* Find which head the pointer is on */
-    if (settings->head == -1)
+    if (settings->monitor == 0)
         screen = pick_pointer_head(client);
-    else
-        screen = screen_area_monitor(client->desktop, settings->head);
+    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 */
+    }
 
     if (settings->center_x)
         *x = screen->x + screen->width / 2 - client->area.width / 2;
@@ -412,10 +442,10 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
     return TRUE;
 }
 
-static gboolean place_transient(ObClient *client, gint *x, gint *y)
+static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
 {
-    if (client->transient_for) {
-        if (client->transient_for != OB_TRAN_GROUP) {
+    if (client->transient_for && client->type == OB_CLIENT_TYPE_DIALOG) {
+        if (client->transient_for != OB_TRAN_GROUP && !client->iconic) {
             ObClient *c = client;
             ObClient *p = client->transient_for;
 
@@ -432,7 +462,9 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
             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 (!(m == client || m->transient_for) && client_normal(m) &&
+                    !m->iconic)
+                {
                     if (first) {
                         l = RECT_LEFT(m->frame->area);
                         t = RECT_TOP(m->frame->area);
@@ -455,7 +487,9 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
         }
     }
 
-    if (client->transient) {
+    if ((client->transient && client->type == OB_CLIENT_TYPE_DIALOG)
+        || client->type == OB_CLIENT_TYPE_SPLASH)
+    {
         Rect **areas;
 
         areas = pick_head(client);
@@ -477,15 +511,17 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
     gboolean ret = FALSE;
     if (client->positioned)
         return FALSE;
-    if (place_transient(client, x, y))
+    if (place_transient_splash(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_smart(client, x, y, SMART_FULL, FALSE)   ||
+         place_smart(client, x, y, SMART_FULL, TRUE)    ||
+         place_smart(client, x, y, SMART_GROUP, FALSE)  ||
+         place_smart(client, x, y, SMART_GROUP, TRUE)   ||
+         place_smart(client, x, y, SMART_FOCUSED, TRUE) ||
          place_random(client, x, y))))
         g_assert_not_reached(); /* the last one better succeed */
     /* get where the client should be */