X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=19fa597a6f4a8f44c243f4f79f5dae280768a98c;hb=8e63ffdabdc3be3ad355dcaddd47d8e71c510739;hp=496357efaebe6c1ed010305cd25446db4efbb4b5;hpb=e8c1967aa21b69582f8679525543bed49007fc58;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 496357ef..19fa597a 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   place.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "client.h"
 #include "group.h"
 #include "screen.h"
@@ -39,7 +57,6 @@ static Rect* pick_head(ObClient *c)
     return NULL;
 }
 
-#if 0
 static gboolean place_random(ObClient *client, gint *x, gint *y)
 {
     int l, r, t, b;
@@ -60,12 +77,8 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
     if (b > t) *y = g_random_int_range(t, b + 1);
     else       *y = 0;
 
-    /* get where the client should be */
-    frame_frame_gravity(client->frame, x, y);
-
     return TRUE;
 }
-#endif
 
 static GSList* area_add(GSList *list, Rect *a)
 {
@@ -74,7 +87,6 @@ static GSList* area_add(GSList *list, Rect *a)
     return g_slist_prepend(list, r);
 }
 
-
 static GSList* area_remove(GSList *list, Rect *a)
 {
     GSList *sit;
@@ -89,8 +101,8 @@ static GSList* area_remove(GSList *list, Rect *a)
         } else {
             Rect isect, extra;
 
-            /* Use an intersection of win and curr to determine the space
-               around curr that we can use.
+            /* Use an intersection of a and r to determine the space
+               around r that we can use.
 
                NOTE: the spaces calculated can overlap.
             */
@@ -128,39 +140,120 @@ static GSList* area_remove(GSList *list, Rect *a)
     return result;
 }
 
-static gint area_cmp(gconstpointer p1, gconstpointer p2)
+static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
 {
-    gint ret;
+    ObClient *c = data;
+    Rect *carea = &c->frame->area;
     const Rect *a1 = p1, *a2 = p2;
+    gboolean diffhead = FALSE;
+    guint i;
+    Rect *a;
+
+    for (i = 0; i < screen_num_monitors; ++i) {
+        a = screen_physical_area_monitor(i);
+        if (RECT_CONTAINS(*a, a1->x, a1->y) &&
+            !RECT_CONTAINS(*a, a2->x, a2->y))
+        {
+            diffhead = TRUE;
+            break;
+        }
+    }
 
-    ret = RECT_BOTTOM(*a1) - RECT_BOTTOM(*a2);
-    if (!ret)
-        ret = RECT_LEFT(*a1) - RECT_LEFT(*a2);
-    return ret;
+    /* has to be more than me in the group */
+    if (diffhead && c->group && c->group->members->next) {
+        guint *num, most;
+        GSList *it;
+
+        /* find how many clients in the group are on each monitor, use the
+           monitor with the most in it */
+        num = g_new0(guint, screen_num_monitors);
+        for (it = c->group->members; it; it = g_slist_next(it))
+            if (it->data != c)
+                ++num[client_monitor(it->data)];
+        most = 0;
+        for (i = 1; i < screen_num_monitors; ++i)
+            if (num[i] > num[most])
+                most = i;
+
+        a = screen_physical_area_monitor(most);
+        if (RECT_CONTAINS(*a, a1->x, a1->y))
+            return -1;
+        if (RECT_CONTAINS(*a, a2->x, a2->y))
+            return 1;
+    }
+
+    return MIN((a1->width - carea->width), (a1->height - carea->height)) -
+        MIN((a2->width - carea->width), (a2->height - carea->height));
 }
 
-static gboolean place_smart(ObClient *client, gint *x, gint *y)
+typedef enum
+{
+    SMART_FULL,
+    SMART_GROUP,
+    SMART_FOCUSED
+} ObSmartType;
+
+#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,
+                            ObSmartType type)
 {
     guint i;
     gboolean ret = FALSE;
-    GSList *spaces, *sit;
-    GList *it, *list;
-
-    list = focus_order[client->desktop == DESKTOP_ALL ?
-                       screen_desktop : client->desktop];
+    GSList *spaces = NULL, *sit;
+    GList *it;
 
     for (i = 0; i < screen_num_monitors; ++i)
         spaces = area_add(spaces, screen_area_monitor(client->desktop, i));
 
-    for (it = list; it; it = g_list_next(it)) {
-        ObClient *c = it->data;
+    if (type == SMART_FULL || type == SMART_FOCUSED) {
+        gboolean found_foc = FALSE, stop = FALSE;
+        ObClient *foc;
+        GList *list;
 
-        if (c == client || c->shaded || !client_normal(c))
-            continue;
-        spaces = area_remove(spaces, &c->frame->area);
-    }
+        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;
+
+            if (WINDOW_IS_CLIENT(it->data))
+                c = it->data;
+            else
+                continue;
 
-    spaces = g_slist_sort(spaces, area_cmp);
+            if (!SMART_IGNORE(client, c)) {
+                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)
+            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();
+
+    spaces = g_slist_sort_with_data(spaces, area_cmp, client);
 
     for (sit = spaces; sit; sit = g_slist_next(sit)) {
         Rect *r = sit->data;
@@ -169,8 +262,13 @@ 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;
-                *x = r->x;
-                *y = r->y;
+                if (type != SMART_FULL) {
+                    *x = r->x + (r->width - client->frame->area.width) / 2;
+                    *y = r->y + (r->height - client->frame->area.height) / 2;
+                } else {
+                    *x = r->x;
+                    *y = r->y;
+                }
             }
         }
 
@@ -183,12 +281,30 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
 
 static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
 {
-    int px, py;
+    guint i;
+    gint l, r, t, b;
+    gint px, py;
+    Rect *area;
 
     screen_pointer_pos(&px, &py);
 
+    for (i = 0; i < screen_num_monitors; ++i) {
+        area = screen_area_monitor(client->desktop, i);
+        if (RECT_CONTAINS(*area, px, py))
+            break;
+    }
+    if (i == screen_num_monitors)
+        area = screen_area_monitor(client->desktop, 0);
+
+    l = area->x;
+    t = area->y;
+    r = area->x + area->width - client->frame->area.width;
+    b = area->y + area->height - client->frame->area.height;
+
     *x = px - client->area.width / 2 - client->frame->size.left;
+    *x = MIN(MAX(*x, l), r);
     *y = py - client->area.height / 2 - client->frame->size.top;
+    *y = MIN(MAX(*y, t), b);
 
     return TRUE;
 }
@@ -256,13 +372,17 @@ void place_client(ObClient *client, gint *x, gint *y)
 {
     if (client->positioned)
         return;
-    if (place_transient(client, x, y))
-        return;
-    if (place_dialog(client, x, y))
-        return;
-    if (place_smart(client, x, y))
-        return;
-    if (place_under_mouse(client, x, y))
-        return;
-    g_assert_not_reached(); /* the last one better succeed */
+    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 */
+        frame_frame_gravity(client->frame, x, y);
+    } else
+        g_assert_not_reached(); /* the last one better succeed */
 }