X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=ee8bf7ebc1d139241e51097b19c571297469cabe;hb=acafa38c8ea210b12ed92fc16281b915ab61542c;hp=260299b38242dfe5d7f94c72e1a6a3ab84b36c9f;hpb=895554765dcf85e577966f75d351e84774a339a4;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 260299b3..ee8bf7eb 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
@@ -23,6 +23,10 @@
 #include "frame.h"
 #include "focus.h"
 #include "config.h"
+#include "dock.h"
+#include "debug.h"
+
+extern ObDock *dock;
 
 static void add_choice(guint *choice, guint mychoice)
 {
@@ -39,25 +43,17 @@ static void add_choice(guint *choice, guint mychoice)
 
 static Rect *pick_pointer_head(ObClient *c)
 {
-    guint i;
-    gint px, py;
-
-    screen_pointer_pos(&px, &py);
-     
-    for (i = 0; i < screen_num_monitors; ++i) {  
-        if (RECT_CONTAINS(*screen_physical_area_monitor(i), px, py)) {
-            return screen_area_monitor(c->desktop, i);
-        }
-    }
-    g_assert_not_reached();
+    return screen_area(c->desktop, screen_monitor_pointer(), NULL);
 }
 
+/*! Pick a monitor to place a window on. */
 static Rect **pick_head(ObClient *c)
 {
     Rect **area;
     guint *choice;
     guint i;
     gint px, py;
+    ObClient *p;
 
     area = g_new(Rect*, screen_num_monitors);
     choice = g_new(guint, screen_num_monitors);
@@ -65,8 +61,10 @@ static Rect **pick_head(ObClient *c)
         choice[i] = screen_num_monitors; /* make them all invalid to start */
 
     /* try direct parent first */
-    if (c->transient_for && c->transient_for != OB_TRAN_GROUP) {
-        add_choice(choice, client_monitor(c->transient_for));
+    if ((p = client_direct_parent(c))) {
+        add_choice(choice, client_monitor(p));
+        ob_debug("placement adding choice %d for parent",
+                 client_monitor(p));
     }
 
     /* more than one window in its group (more than just this window) */
@@ -75,38 +73,58 @@ static Rect **pick_head(ObClient *c)
 
         /* try on the client's desktop */
         for (it = c->group->members; it; it = g_slist_next(it)) {
-            ObClient *itc = it->data;            
+            ObClient *itc = it->data;
             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",
+                         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)
+            ObClient *itc = it->data;
+            if (itc != c) {
                 add_choice(choice, client_monitor(it->data));
+                ob_debug("placement adding choice %d for group sibling on "
+                         "another desktop", client_monitor(it->data));
+            }
         }
     }
 
-    if (focus_client)
+    /* skip this if placing by the mouse position */
+    if (focus_client && client_normal(focus_client) &&
+        config_place_monitor != OB_PLACE_MONITOR_MOUSE)
+    {
         add_choice(choice, client_monitor(focus_client));
+        ob_debug("placement adding choice %d for normal focused window",
+                 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)) {
+    for (i = 0; i < screen_num_monitors; i++) {
+        Rect *monitor = screen_physical_area_monitor(i);
+        gboolean contain = RECT_CONTAINS(*monitor, px, py);
+        g_free(monitor);
+        if (contain) {
             add_choice(choice, i);
+            ob_debug("placement adding choice %d for mouse pointer", i);
             break;
         }
+    }
 
     /* add any leftover choices */
     for (i = 0; i < screen_num_monitors; ++i)
         add_choice(choice, i);
 
     for (i = 0; i < screen_num_monitors; ++i)
-        area[i] = screen_area_monitor(c->desktop, choice[i]);
+        area[i] = screen_area(c->desktop, choice[i], NULL);
+
+    g_free(choice);
 
     return area;
 }
@@ -118,7 +136,8 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
     guint i;
 
     areas = pick_head(client);
-    i = g_random_int_range(0, screen_num_monitors);
+    i = (config_place_monitor != OB_PLACE_MONITOR_ANY) ?
+        0 : g_random_int_range(0, screen_num_monitors);
 
     l = areas[i]->x;
     t = areas[i]->y;
@@ -126,10 +145,12 @@ 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;
 
+    for (i = 0; i < screen_num_monitors; ++i)
+        g_free(areas[i]);
     g_free(areas);
 
     return TRUE;
@@ -152,7 +173,7 @@ static GSList* area_remove(GSList *list, Rect *a)
 
         if (!RECT_INTERSECTS_RECT(*r, *a)) {
             result = g_slist_prepend(result, r);
-            r = NULL; /* dont free it */
+            /* dont free r, it's moved to the result list */
         } else {
             Rect isect, extra;
 
@@ -187,181 +208,139 @@ static GSList* area_remove(GSList *list, Rect *a)
                          r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
                 result = area_add(result, &extra);
             }
-        }
 
-        g_free(r);
+            /* 'r' is not being added to the result list, so free it */
+            g_free(r);
+        }
     }
     g_slist_free(list);
     return result;
 }
 
-static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
-{
-    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;
-        }
-    }
-
-    /* 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));
-}
-
-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)
+enum {
+    IGNORE_FULLSCREEN = 1,
+    IGNORE_MAXIMIZED  = 2,
+    IGNORE_MENUTOOL   = 3,
+    /*IGNORE_SHADED     = 3,*/
+    IGNORE_NONGROUP   = 4,
+    IGNORE_BELOW      = 5,
+    /*IGNORE_NONFOCUS   = 1 << 5,*/
+    IGNORE_DOCK       = 6,
+    IGNORE_END        = 7
+};
+
+static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
 {
-    gboolean ret = FALSE;
-    GSList *spaces = NULL, *sit;
-    GList *it;
     Rect **areas;
+    gint ignore;
+    gboolean ret;
+    gint maxsize;
+    GSList *spaces = NULL, *sit, *maxit;
     guint i;
 
-    if (type == SMART_GROUP) {
-        /* has to be more than me in the group */
-        if (!client_has_group_siblings(client))
-            return FALSE;
-    }
+    areas = pick_head(c);
+    ret = FALSE;
+    maxsize = 0;
+    maxit = NULL;
+
+    /* try ignoring different things to find empty space */
+    for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
+        /* try all monitors in order of preference, but only the first one
+           if config_place_monitor is MOUSE or ACTIVE */
+        for (i = 0; (i < (config_place_monitor != OB_PLACE_MONITOR_ANY ?
+                          1 : screen_num_monitors) && !ret); ++i)
+        {
+            GList *it;
+
+            /* add the whole monitor */
+            spaces = area_add(spaces, areas[i]);
+
+            /* go thru all the windows */
+            for (it = client_list; it; it = g_list_next(it)) {
+                ObClient *test = it->data;
+
+                /* should we ignore this client? */
+                if (screen_showing_desktop) continue;
+                if (c == test) continue;
+                if (test->iconic) continue;
+                if (c->desktop != DESKTOP_ALL) {
+                    if (test->desktop != c->desktop &&
+                        test->desktop != DESKTOP_ALL) continue;
+                } else {
+                    if (test->desktop != screen_desktop &&
+                        test->desktop != DESKTOP_ALL) continue;
+                }
+                if (test->type == OB_CLIENT_TYPE_SPLASH ||
+                    test->type == OB_CLIENT_TYPE_DESKTOP) continue;
+
+
+                if ((ignore >= IGNORE_FULLSCREEN) &&
+                    test->fullscreen) continue;
+                if ((ignore >= IGNORE_MAXIMIZED) &&
+                    test->max_horz && test->max_vert) continue;
+                if ((ignore >= IGNORE_MENUTOOL) &&
+                    (test->type == OB_CLIENT_TYPE_MENU ||
+                     test->type == OB_CLIENT_TYPE_TOOLBAR) &&
+                    client_has_parent(c)) continue;
+                /*
+                if ((ignore >= IGNORE_SHADED) &&
+                    test->shaded) continue;
+                */
+                if ((ignore >= IGNORE_NONGROUP) &&
+                    client_has_group_siblings(c) &&
+                    test->group != c->group) continue;
+                if ((ignore >= IGNORE_BELOW) &&
+                    test->layer < c->layer) continue;
+                /*
+                if ((ignore >= IGNORE_NONFOCUS) &&
+                    focus_client != test) continue;
+                */
+                /* don't ignore this window, so remove it from the available
+                   area */
+                spaces = area_remove(spaces, &test->frame->area);
+            }
 
-    areas = pick_head(client);
+            if (ignore < IGNORE_DOCK) {
+                Rect a;
+                dock_get_area(&a);
+                spaces = area_remove(spaces, &a);
+            }
 
-    for (i = 0; i < screen_num_monitors; ++i) {
-        spaces = area_add(spaces, areas[i]);
-
-        /* 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;
-                if (c->fullscreen)
-                    continue;
-            } else
-                continue;
-
-            if (c->layer > client->layer) {
-                if (!SMART_IGNORE(client, c))
-                    spaces = area_remove(spaces, &c->frame->area);
-            } else
-                break;
-        }
+            for (sit = spaces; sit; sit = g_slist_next(sit)) {
+                Rect *r = sit->data;
 
-        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 (r->width >= c->frame->area.width &&
+                    r->height >= c->frame->area.height &&
+                    r->width * r->height > maxsize)
+                {
+                    maxsize = r->width * r->height;
+                    maxit = sit;
                 }
-
-                if (c == foc)
-                    found_foc = TRUE;
             }
-        } else if (type == SMART_GROUP) {
-            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;
-
-            if (!ret) {
-                if (r->width >= client->frame->area.width &&
-                    r->height >= client->frame->area.height) {
-                    ret = TRUE;
-                    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;
-                    }
+
+            if (maxit) {
+                Rect *r = maxit->data;
+
+                /* center it in the area */
+                *x = r->x;
+                *y = r->y;
+                if (config_place_center) {
+                    *x += (r->width - c->frame->area.width) / 2;
+                    *y += (r->height - c->frame->area.height) / 2;
                 }
+                ret = TRUE;
             }
 
-            g_free(r);
+            while (spaces) {
+                g_free(spaces->data);
+                spaces = g_slist_delete_link(spaces, spaces);
+            }
         }
-        g_slist_free(spaces);
-        spaces = NULL;
     }
 
+    for (i = 0; i < screen_num_monitors; ++i)
+        g_free(areas[i]);
     g_free(areas);
-
     return ret;
 }
 
@@ -371,6 +350,8 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     gint px, py;
     Rect *area;
 
+    if (!screen_pointer_pos(&px, &py))
+        return FALSE;
     area = pick_pointer_head(client);
 
     l = area->x;
@@ -389,69 +370,101 @@ 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)
+        /* this can return NULL */
         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(client->desktop, (guint)settings->monitor - 1,
+                             NULL);
+
+    /* if we have't found a screen yet.. */
+    if (!screen) {
+        Rect **areas;
+        guint i;
+
+        areas = pick_head(client);
+        screen = areas[0];
 
-    if (settings->center_x)
+        /* don't free the first one, it's being set as "screen" */
+        for (i = 1; i < screen_num_monitors; ++i)
+            g_free(areas[i]);
+        g_free(areas);
+    }
+
+    if (settings->position.x.center)
         *x = screen->x + screen->width / 2 - client->area.width / 2;
+    else if (settings->position.x.opposite)
+        *x = screen->x + screen->width - client->frame->area.width -
+            settings->position.x.pos;
     else
-        *x = screen->x + settings->position.x;
+        *x = screen->x + settings->position.x.pos;
 
-    if (settings->center_y)
+    if (settings->position.y.center)
         *y = screen->y + screen->height / 2 - client->area.height / 2;
+    else if (settings->position.y.opposite)
+        *y = screen->y + screen->height - client->frame->area.height -
+            settings->position.y.pos;
     else
-        *y = screen->y + settings->position.y;
+        *y = screen->y + settings->position.y.pos;
 
+    g_free(screen);
     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) {
-            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;
-        } 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 (first) {
-                        l = RECT_LEFT(m->frame->area);
-                        t = RECT_TOP(m->frame->area);
-                        r = RECT_RIGHT(m->frame->area);
-                        b = RECT_BOTTOM(m->frame->area);
-                        first = FALSE;
-                    } else {
-                        l = MIN(l, RECT_LEFT(m->frame->area));
-                        t = MIN(t, RECT_TOP(m->frame->area));
-                        r = MAX(r, RECT_RIGHT(m->frame->area));
-                        b = MAX(b, RECT_BOTTOM(m->frame->area));
-                    }
+    if (client->type == OB_CLIENT_TYPE_DIALOG) {
+        GSList *it;
+        gboolean first = TRUE;
+        gint l, r, t, b;
+        for (it = client->parents; it; it = g_slist_next(it)) {
+            ObClient *m = it->data;
+            if (!m->iconic) {
+                if (first) {
+                    l = RECT_LEFT(m->frame->area);
+                    t = RECT_TOP(m->frame->area);
+                    r = RECT_RIGHT(m->frame->area);
+                    b = RECT_BOTTOM(m->frame->area);
+                    first = FALSE;
+                } else {
+                    l = MIN(l, RECT_LEFT(m->frame->area));
+                    t = MIN(t, RECT_TOP(m->frame->area));
+                    r = MAX(r, RECT_RIGHT(m->frame->area));
+                    b = MAX(b, RECT_BOTTOM(m->frame->area));
                 }
             }
             if (!first) {
-                *x = ((r + 1 - l) - client->frame->area.width) / 2 + l; 
+                *x = ((r + 1 - l) - client->frame->area.width) / 2 + l;
                 *y = ((b + 1 - t) - client->frame->area.height) / 2 + t;
                 return TRUE;
             }
         }
     }
+
+    if (client->type == OB_CLIENT_TYPE_DIALOG ||
+        client->type == OB_CLIENT_TYPE_SPLASH)
+    {
+        Rect **areas;
+        guint i;
+
+        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;
+
+        for (i = 0; i < screen_num_monitors; ++i)
+            g_free(areas[i]);
+        g_free(areas);
+        return TRUE;
+    }
+
     return FALSE;
 }
 
@@ -459,21 +472,27 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
 gboolean place_client(ObClient *client, gint *x, gint *y,
                       ObAppSettings *settings)
 {
-    gboolean ret = FALSE;
-    if (client->positioned)
+    gboolean ret;
+    gboolean userplaced = FALSE;
+
+    /* per-app settings override program specified position
+     * but not user specified, unless pos_force is enabled */
+    if (((client->positioned & USPosition) &&
+         !(settings && settings->pos_given && settings->pos_force)) ||
+        ((client->positioned & PPosition) &&
+         !(settings && settings->pos_given)))
         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 */
+
+    /* try a number of methods */
+    ret = place_transient_splash(client, x, y) ||
+        (userplaced = place_per_app_setting(client, x, y, settings)) ||
+        (config_place_policy == OB_PLACE_POLICY_MOUSE &&
+         place_under_mouse(client, x, y)) ||
+        place_nooverlap(client, x, y) ||
+        place_random(client, x, y);
+    g_assert(ret);
+
     /* get where the client should be */
     frame_frame_gravity(client->frame, x, y);
-    return ret;
+    return !userplaced;
 }