X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=2602122882d0183a200f7135dd63b78b27b56a37;hb=01570a6a82a8576baa52e38d044787a105bcf102;hp=664c094d6b220d8d82c4db0fb925361b85316016;hpb=4185168f9df50c724cd3e68af6740572c187b1ae;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 664c094d..26021228 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,197 +1,272 @@
+/* -*- 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-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
+   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"
 #include "frame.h"
 #include "focus.h"
 #include "config.h"
+#include "dock.h"
+#include "debug.h"
+#include "place_overlap.h"
 
-static Rect* pick_head(ObClient *c)
-{
-    /* try direct parent first */
-    if (c->transient_for && c->transient_for != OB_TRAN_GROUP) {
-        return screen_area_monitor(c->desktop,
-                                   client_monitor(c->transient_for));
-    }
-
-    /* more than one guy in his group (more than just him) */
-    if (c->group && c->group->members->next) {
-        GSList *it;
-
-        /* try on the client's desktop */
-        for (it = c->group->members; it; it = g_slist_next(it)) {
-            ObClient *itc = it->data;            
-            if (itc != c &&
-                (itc->desktop == c->desktop ||
-                 itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL))
-                return screen_area_monitor(c->desktop,
-                                           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)
-                return screen_area_monitor(c->desktop,
-                                           client_monitor(it->data));
-        }
-    }
-
-    return NULL;
-}
+extern ObDock *dock;
 
-#if 0
-static gboolean place_random(ObClient *client, gint *x, gint *y)
+static Rect *pick_pointer_head(ObClient *c)
 {
-    int l, r, t, b;
-    Rect *area;
-
-    area = pick_head(client);
-    if (!area)
-        area = screen_area_monitor(client->desktop,
-                                   g_random_int_range(0, screen_num_monitors));
-
-    l = area->x;
-    t = area->y;
-    r = area->x + area->width - client->frame->area.width;
-    b = area->y + area->height - client->frame->area.height;
-
-    if (r > l) *x = g_random_int_range(l, r + 1);
-    else       *x = 0;
-    if (b > t) *y = g_random_int_range(t, b + 1);
-    else       *y = 0;
-
-    return TRUE;
-}
-#endif
-
-static GSList* area_add(GSList *list, Rect *a)
-{
-    Rect *r = g_new(Rect, 1);
-    *r = *a;
-    return g_slist_prepend(list, r);
+    return screen_area(c->desktop, screen_monitor_pointer(), NULL);
 }
 
-static GSList* area_remove(GSList *list, Rect *a)
+/* use the following priority lists for pick_head()
+
+   When a window is being placed in the FOREGROUND, use a monitor chosen in
+   the following order:
+   1. per-app settings
+   2. same monitor as parent
+   3. primary monitor if placement=PRIMARY
+      active monitor if placement=ACTIVE
+      pointer monitor if placement=MOUSE
+   4. primary monitor
+   5. other monitors where the window has group members on the same desktop
+   6. other monitors where the window has group members on other desktops
+   7. other monitors
+
+   When a window is being placed in the BACKGROUND, use a monitor chosen in the
+   following order:
+   1. per-app settings
+   2. same monitor as parent
+   3. other monitors where the window has group members on the same desktop
+    3a. primary monitor in this set
+    3b. other monitors in this set
+   4. other monitors where the window has group members on other desktops
+    4a. primary monitor in this set
+    4b. other monitors in this set
+   5. other monitors
+    5a. primary monitor in this set
+    5b. other monitors in this set
+*/
+
+/*! One for each possible head, used to sort them in order of precedence. */
+typedef struct {
+    guint monitor;
+    guint flags;
+} ObPlaceHead;
+
+/*! Flags for ObPlaceHead */
+enum {
+    HEAD_PARENT = 1 << 0, /* parent's monitor */
+    HEAD_PLACED = 1 << 1, /* chosen monitor by placement */
+    HEAD_PRIMARY = 1 << 2, /* primary monitor */
+    HEAD_GROUP_DESK = 1 << 3, /* has a group member on the same desktop */
+    HEAD_GROUP = 1 << 4, /* has a group member on another desktop */
+    HEAD_PERAPP = 1 << 5, /* chosen by per-app settings */
+};
+
+gint cmp_foreground(const void *a, const void *b)
 {
-    GSList *sit;
-    GSList *result = NULL;
+    const ObPlaceHead *h1 = a;
+    const ObPlaceHead *h2 = b;
+    gint i = 0;
 
-    for (sit = list; sit; sit = g_slist_next(sit)) {
-        Rect *r = sit->data;
+    if (h1->monitor == h2->monitor) return 0;
 
-        if (!RECT_INTERSECTS_RECT(*r, *a)) {
-            result = g_slist_prepend(result, r);
-            r = NULL; /* dont free it */
-        } else {
-            Rect isect, extra;
+    if (h1->flags & HEAD_PERAPP) --i;
+    if (h2->flags & HEAD_PERAPP) ++i;
+    if (i) return i;
 
-            /* Use an intersection of win and curr to determine the space
-               around curr that we can use.
+    if (h1->flags & HEAD_PARENT) --i;
+    if (h2->flags & HEAD_PARENT) ++i;
+    if (i) return i;
 
-               NOTE: the spaces calculated can overlap.
-            */
+    if (h1->flags & HEAD_PLACED) --i;
+    if (h2->flags & HEAD_PLACED) ++i;
+    if (i) return i;
 
-            RECT_SET_INTERSECTION(isect, *r, *a);
+    if (h1->flags & HEAD_PRIMARY) --i;
+    if (h2->flags & HEAD_PRIMARY) ++i;
+    if (i) return i;
 
-            if (RECT_LEFT(isect) > RECT_LEFT(*r)) {
-                RECT_SET(extra, r->x, r->y,
-                         RECT_LEFT(isect) - r->x, r->height);
-                result = area_add(result, &extra);
-            }
+    if (h1->flags & HEAD_GROUP_DESK) --i;
+    if (h2->flags & HEAD_GROUP_DESK) ++i;
+    if (i) return i;
 
-            if (RECT_TOP(isect) > RECT_TOP(*r)) {
-                RECT_SET(extra, r->x, r->y,
-                         r->width, RECT_TOP(isect) - r->y + 1);
-                result = area_add(result, &extra);
-            }
+    if (h1->flags & HEAD_GROUP) --i;
+    if (h2->flags & HEAD_GROUP) ++i;
+    if (i) return i;
 
-            if (RECT_RIGHT(isect) < RECT_RIGHT(*r)) {
-                RECT_SET(extra, RECT_RIGHT(isect) + 1, r->y,
-                         RECT_RIGHT(*r) - RECT_RIGHT(isect), r->height);
-                result = area_add(result, &extra);
-            }
+    return h1->monitor - h2->monitor;
+}
 
-            if (RECT_BOTTOM(isect) < RECT_BOTTOM(*r)) {
-                RECT_SET(extra, r->x, RECT_BOTTOM(isect) + 1,
-                         r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
-                result = area_add(result, &extra);
-            }
-        }
+gint cmp_background(const void *a, const void *b)
+{
+    const ObPlaceHead *h1 = a;
+    const ObPlaceHead *h2 = b;
+    gint i = 0;
+
+    if (h1->monitor == h2->monitor) return 0;
+
+    if (h1->flags & HEAD_PERAPP) --i;
+    if (h2->flags & HEAD_PERAPP) ++i;
+    if (i) return i;
+
+    if (h1->flags & HEAD_PARENT) --i;
+    if (h2->flags & HEAD_PARENT) ++i;
+    if (i) return i;
+
+    if (h1->flags & HEAD_GROUP_DESK || h2->flags & HEAD_GROUP_DESK) {
+        if (h1->flags & HEAD_GROUP_DESK) --i;
+        if (h2->flags & HEAD_GROUP_DESK) ++i;
+        if (i) return i;
+        if (h1->flags & HEAD_PRIMARY) --i;
+        if (h2->flags & HEAD_PRIMARY) ++i;
+        if (i) return i;
+    }
 
-        g_free(r);
+    if (h1->flags & HEAD_GROUP || h2->flags & HEAD_GROUP) {
+        if (h1->flags & HEAD_GROUP) --i;
+        if (h2->flags & HEAD_GROUP) ++i;
+        if (i) return i;
+        if (h1->flags & HEAD_PRIMARY) --i;
+        if (h2->flags & HEAD_PRIMARY) ++i;
+        if (i) return i;
     }
-    g_slist_free(list);
-    return result;
-}
 
-static gint area_cmp(gconstpointer p1, gconstpointer p2)
-{
-    gint ret;
-    const Rect *a1 = p1, *a2 = p2;
+    if (h1->flags & HEAD_PRIMARY) --i;
+    if (h2->flags & HEAD_PRIMARY) ++i;
+    if (i) return i;
 
-    ret = RECT_BOTTOM(*a1) - RECT_BOTTOM(*a2);
-    if (!ret)
-        ret = RECT_LEFT(*a1) - RECT_LEFT(*a2);
-    return ret;
+    return h1->monitor - h2->monitor;
 }
 
-static gboolean place_smart(ObClient *client, gint *x, gint *y)
+/*! Pick a monitor to place a window on. */
+static Rect *pick_head(ObClient *c, gboolean foreground,
+                       ObAppSettings *settings)
 {
+    Rect *area;
+    ObPlaceHead *choice;
     guint i;
-    gboolean ret = FALSE;
-    GSList *spaces, *sit;
-    GList *it, *list;
+    ObClient *p;
+    GSList *it;
 
-    list = focus_order[client->desktop == DESKTOP_ALL ?
-                       screen_desktop : client->desktop];
+    choice = g_new(ObPlaceHead, screen_num_monitors);
+    for (i = 0; i < screen_num_monitors; ++i) {
+        choice[i].monitor = i;
+        choice[i].flags = 0;
+    }
 
-    for (i = 0; i < screen_num_monitors; ++i)
-        spaces = area_add(spaces, screen_area_monitor(client->desktop, i));
+    /* find monitors with group members */
+    if (c->group) {
+        for (it = c->group->members; it; it = g_slist_next(it)) {
+            ObClient *itc = it->data;
+            if (itc != c) {
+                guint m = client_monitor(itc);
+
+                if (m < screen_num_monitors) {
+                    if (screen_compare_desktops(itc->desktop, c->desktop))
+                        choice[m].flags |= HEAD_GROUP_DESK;
+                    else
+                        choice[m].flags |= HEAD_GROUP;
+                }
+            }
+        }
+    }
 
-    for (it = list; it; it = g_list_next(it)) {
-        ObClient *c = it->data;
+    i = screen_monitor_primary(FALSE);
+    if (i < screen_num_monitors) {
+        choice[i].flags |= HEAD_PRIMARY;
+        if (config_place_monitor == OB_PLACE_MONITOR_PRIMARY)
+            choice[i].flags |= HEAD_PLACED;
+        if (settings &&
+            settings->monitor_type == OB_PLACE_MONITOR_PRIMARY)
+            choice[i].flags |= HEAD_PERAPP;
+    }
+
+    i = screen_monitor_active();
+    if (i < screen_num_monitors) {
+        if (config_place_monitor == OB_PLACE_MONITOR_ACTIVE)
+            choice[i].flags |= HEAD_PLACED;
+        if (settings &&
+            settings->monitor_type == OB_PLACE_MONITOR_ACTIVE)
+            choice[i].flags |= HEAD_PERAPP;
+    }
 
-        if (c != client && !c->shaded && !client_normal(c))
-            spaces = area_remove(spaces, &c->frame->area);
+    i = screen_monitor_pointer();
+    if (i < screen_num_monitors) {
+        if (config_place_monitor == OB_PLACE_MONITOR_MOUSE)
+            choice[i].flags |= HEAD_PLACED;
+        if (settings &&
+            settings->monitor_type == OB_PLACE_MONITOR_MOUSE)
+            choice[i].flags |= HEAD_PERAPP;
     }
 
-    spaces = g_slist_sort(spaces, area_cmp);
+    if (settings) {
+        i = settings->monitor - 1;
+        if (i < screen_num_monitors)
+            choice[i].flags |= HEAD_PERAPP;
+    }
 
-    for (sit = spaces; sit; sit = g_slist_next(sit)) {
-        Rect *r = sit->data;
+    /* direct parent takes highest precedence */
+    if ((p = client_direct_parent(c))) {
+        i = client_monitor(p);
+        if (i < screen_num_monitors)
+            choice[i].flags |= HEAD_PARENT;
+    }
 
-        if (!ret) {
-            if (r->width >= client->frame->area.width &&
-                r->height >= client->frame->area.height) {
-                ret = TRUE;
-                *x = r->x;
-                *y = r->y;
-            }
-        }
+    qsort(choice, screen_num_monitors, sizeof(ObPlaceHead),
+          foreground ? cmp_foreground : cmp_background);
 
-        g_free(r);
+    /* save the areas of the monitors in order of their being chosen */
+    for (i = 0; i < screen_num_monitors; ++i)
+    {
+        ob_debug("placement choice %d is monitor %d", i, choice[i].monitor);
+        if (choice[i].flags & HEAD_PARENT)
+            ob_debug("  - parent on monitor");
+        if (choice[i].flags & HEAD_PLACED)
+            ob_debug("  - placement choice");
+        if (choice[i].flags & HEAD_PRIMARY)
+            ob_debug("  - primary monitor");
+        if (choice[i].flags & HEAD_GROUP_DESK)
+            ob_debug("  - group on same desktop");
+        if (choice[i].flags & HEAD_GROUP)
+            ob_debug("  - group on other desktop");
     }
-    g_slist_free(spaces);
 
-    return ret;
+    area = screen_area(c->desktop, choice[0].monitor, NULL);
+
+    g_free(choice);
+
+    /* return the area for the chosen monitor */
+    return area;
 }
 
 static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
 {
-    guint i;
     gint l, r, t, b;
     gint px, py;
     Rect *area;
 
-    screen_pointer_pos(&px, &py);
+    ob_debug("placing under mouse");
 
-    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);
+    if (!screen_pointer_pos(&px, &py))
+        return FALSE;
+    area = pick_pointer_head(client);
 
     l = area->x;
     t = area->y;
@@ -203,79 +278,174 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     *y = py - client->area.height / 2 - client->frame->size.top;
     *y = MIN(MAX(*y, t), b);
 
+    g_slice_free(Rect, area);
+
+    return TRUE;
+}
+
+static gboolean place_per_app_setting(ObClient *client, Rect *screen,
+                                      gint *x, gint *y,
+                                      ObAppSettings *settings)
+{
+    if (!settings || (settings && !settings->pos_given))
+        return FALSE;
+
+    ob_debug("placing by per-app settings");
+
+    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.pos;
+    if (settings->position.x.denom)
+        *x = (*x * screen->width) / settings->position.x.denom;
+
+    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.pos;
+    if (settings->position.y.denom)
+        *y = (*y * screen->height) / settings->position.y.denom;
+
     return TRUE;
 }
 
-static gboolean place_transient(ObClient *client, gint *x, gint *y)
+static gboolean place_transient_splash(ObClient *client, Rect *area,
+                                       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;
-            int l, r, t, b;
-            for (it = client->group->members; it; it = it->next) {
-                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;
+
+        ob_debug("placing dialog");
+
+        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;
             }
         }
     }
-    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);
+    if (client->type == OB_CLIENT_TYPE_DIALOG ||
+        client->type == OB_CLIENT_TYPE_SPLASH)
+    {
+        ob_debug("placing dialog or splash");
 
         *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)
+static gboolean place_least_overlap(ObClient *c, Rect * const head,
+                                    gint *x, gint *y)
 {
-    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
-        g_assert_not_reached(); /* the last one better succeed */
+    /* Assemble the list of windows that could overlap with @c in the user's
+       current view. */
+    GSList* potential_overlap_clients = NULL;
+    int n_client_rects = 0;
+
+    /* if we're "showing desktop", ignore all existing windows */
+    if (!screen_showing_desktop) {
+        GList* it;
+        for (it = client_list; it != NULL; it = g_list_next(it)) {
+            ObClient* maybe_client = (ObClient*)it->data;
+            if (maybe_client == c)
+                continue;
+            if (maybe_client->iconic)
+                continue;
+            if (!client_occupies_space(maybe_client))
+                continue;
+            if (c->desktop != DESKTOP_ALL) {
+                if (maybe_client->desktop != c->desktop &&
+                    maybe_client->desktop != DESKTOP_ALL)
+                    continue;
+            } else {
+                if (maybe_client->desktop != screen_desktop &&
+                    maybe_client->desktop != DESKTOP_ALL)
+                    continue;
+            }
+
+            potential_overlap_clients = g_slist_prepend(
+                potential_overlap_clients, maybe_client);
+            n_client_rects += 1;
+        }
+    }
+    Rect client_rects[n_client_rects];
+    GSList* it;
+    unsigned int i = 0;
+    for (it = potential_overlap_clients; it != NULL; it = g_slist_next(it)) {
+        ObClient* potential_overlap_client = (ObClient*)it->data;
+        client_rects[i] = potential_overlap_client->frame->area;
+        i += 1;
+    }
+    g_slist_free(potential_overlap_clients);
+
+    Point result;
+    Size req_size;
+    SIZE_SET(req_size, c->frame->area.width, c->frame->area.height);
+    place_overlap_find_least_placement(client_rects, n_client_rects, head,
+                                       &req_size, &result);
+    *x = result.x;
+    *y = result.y;
+
+    return TRUE;
+}
+
+/*! Return TRUE if openbox chose the position for the window, and FALSE if
+  the application chose it */
+gboolean place_client(ObClient *client, gboolean foreground, gint *x, gint *y,
+                      ObAppSettings *settings)
+{
+    Rect *area;
+    gboolean ret;
+
+    /* 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;
+
+    area = pick_head(client, foreground, settings);
+
+    /* try a number of methods */
+    ret = place_per_app_setting(client, area, x, y, settings) ||
+        place_transient_splash(client, area, x, y) ||
+        (config_place_policy == OB_PLACE_POLICY_MOUSE &&
+         place_under_mouse(client, x, y)) ||
+        place_least_overlap(client, area, x, y);
+    g_assert(ret);
+
+    g_slice_free(Rect, area);
+
+    /* get where the client should be */
+    frame_frame_gravity(client->frame, x, y);
+    return TRUE;
 }