X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=214bb59c01e77718c5c50902cface0a503bde02c;hb=c23741290c139dbdd492705fa420ddb2cb5db867;hp=ada0d7c305c567c846dacd27e487b3e9f211aab6;hpb=c80b496bf407d73bea169058abfcda44effad0dd;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index ada0d7c3..214bb59c 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -2,7 +2,7 @@
 
    place.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -52,6 +52,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;
@@ -126,9 +129,9 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
     b = areas[i]->y + areas[i]->height - client->frame->area.height;
 
     if (r > l) *x = g_random_int_range(l, r + 1);
-    else       *x = 0;
+    else       *x = areas[i]->x;
     if (b > t) *y = g_random_int_range(t, b + 1);
-    else       *y = 0;
+    else       *y = areas[i]->y;
 
     g_free(areas);
 
@@ -251,7 +254,7 @@ typedef enum
 } ObSmartType;
 
 #define SMART_IGNORE(placer, c) \
-    (placer == c || !c->frame->visible || c->shaded || !client_normal(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)))
@@ -282,7 +285,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
             if (WINDOW_IS_CLIENT(it->data)) {
                 c = it->data;
-                if (c->fullscreen)
+                if (c->fullscreen || (c->max_vert && c->max_horz))
                     continue;
             } else
                 continue;
@@ -306,7 +309,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
                 if (WINDOW_IS_CLIENT(it->data)) {
                     c = it->data;
-                    if (c->fullscreen)
+                    if (c->fullscreen || (c->max_vert && c->max_horz))
                         continue;
                 } else
                     continue;
@@ -370,6 +373,7 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     Rect *area;
 
     area = pick_pointer_head(client);
+    screen_pointer_pos(&px, &py);
 
     l = area->x;
     t = area->y;
@@ -387,16 +391,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;
@@ -413,22 +425,25 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
 
 static gboolean place_transient(ObClient *client, gint *x, gint *y)
 {
-    if (client->transient_for) {
+    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;
-            *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;
+
+            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)) {
+                if (!(m == client || m->transient_for) && client_normal(m)) {
                     if (first) {
                         l = RECT_LEFT(m->frame->area);
                         t = RECT_TOP(m->frame->area);
@@ -450,6 +465,19 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
             }
         }
     }
+
+    if (client->transient) {
+        Rect **areas;
+
+        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);
+        return TRUE;
+    }
+
     return FALSE;
 }
 
@@ -472,6 +500,7 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
          place_random(client, x, y))))
         g_assert_not_reached(); /* the last one better succeed */
     /* get where the client should be */
-    frame_frame_gravity(client->frame, x, y);
+    frame_frame_gravity(client->frame, x, y,
+                        client->area.width, client->area.height);
     return ret;
 }