X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=a4c2f588659067260c8ebaa2312028a05fbc66e3;hb=d3d4aa29871111737a4f6985da695c8688a05270;hp=545355ce737766662093dca81757fc6964fd8c98;hpb=a9ae2f481ab444010dc34e1fde24839ff37d4fd3;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 545355ce..a4c2f588 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   place.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   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"
@@ -14,7 +33,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 */
@@ -39,10 +58,9 @@ 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;
+    gint l, r, t, b;
     Rect *area;
 
     area = pick_head(client);
@@ -62,7 +80,6 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
 
     return TRUE;
 }
-#endif
 
 static GSList* area_add(GSList *list, Rect *a)
 {
@@ -71,7 +88,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;
@@ -86,8 +102,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.
             */
@@ -125,39 +141,142 @@ 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;
 
-    ret = RECT_BOTTOM(*a1) - RECT_BOTTOM(*a2);
-    if (!ret)
-        ret = RECT_LEFT(*a1) - RECT_LEFT(*a2);
-    return ret;
+    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;
+        }
+    }
+
+    /* has to be more than me in the group */
+    if (diffhead && client_has_group_siblings(c)) {
+        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;
+
+        g_free(num);
+
+        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;
+    /* stay out from under windows in higher layers */
+    for (it = stacking_list; it; it = g_list_next(it)) {
+        ObClient *c;
 
-        if (c == client || c->shaded || !client_normal(c))
+        if (WINDOW_IS_CLIENT(it->data)) {
+            c = it->data;
+            if (c->fullscreen)
+                continue;
+        } else
             continue;
-        spaces = area_remove(spaces, &c->frame->area);
+
+        if (c->layer > client->layer) {
+            if (!SMART_IGNORE(client, c))
+                spaces = area_remove(spaces, &c->frame->area);
+        } else
+            break;
     }
 
-    spaces = g_slist_sort(spaces, area_cmp);
+    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 (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);
+            }
+        } 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;
@@ -166,8 +285,15 @@ 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 (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 {
+                    *x = r->x;
+                    *y = r->y;
+                }
             }
         }
 
@@ -208,6 +334,44 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     return TRUE;
 }
 
+static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
+                                      ObAppSettings *settings)
+{
+    gint px, py, i;
+    Rect *screen;
+
+    if (!settings || (settings && !settings->pos_given))
+        return FALSE;
+
+    /* Find which head the pointer is on */
+    if (settings->head == -1 && screen_num_monitors > 1) {
+        screen_pointer_pos(&px, &py);
+
+        for (i = 0; i < screen_num_monitors; i++) {
+            screen = screen_area_monitor(client->desktop, i);
+            if (RECT_CONTAINS(*screen, px, py))
+                break;
+        }
+
+        if (i == screen_num_monitors)
+            screen = screen_area_monitor(client->desktop, 0);
+    }
+    else
+        screen = screen_area_monitor(client->desktop, settings->head);
+
+    if (settings->center_x)
+        *x = screen->x + screen->width / 2 - client->area.width / 2;
+    else
+        *x = screen->x + settings->position.x;
+
+    if (settings->center_y)
+        *y = screen->y + screen->height / 2 - client->area.height / 2;
+    else
+        *y = screen->y + settings->position.y;
+
+    return TRUE;
+}
+
 static gboolean place_transient(ObClient *client, gint *x, gint *y)
 {
     if (client->transient_for) {
@@ -222,8 +386,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) {
@@ -250,34 +414,25 @@ 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)
+/* Return TRUE if we want client.c to enforce on-screen-keeping */
+gboolean place_client(ObClient *client, gint *x, gint *y,
+                      ObAppSettings *settings)
 {
+    gboolean ret = FALSE;
     if (client->positioned)
-        return;
-    if (place_transient(client, x, y) ||
-        place_dialog(client, x, y)    ||
-        place_smart(client, x, y)     ||
-        place_under_mouse(client, x, y))
-    {
-        /* get where the client should be */
-        frame_frame_gravity(client->frame, x, y);
-    } else
+        return FALSE;
+    if (place_transient(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_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);
+    return ret;
 }