X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fplace.c;h=1ac295c0779b2758a27ae93230be1536758e3996;hb=564b727966ef1a38309d45b2ab040c3deeb658a4;hp=3edb82c9b4681419bb89c3faf39bedb2332800f5;hpb=27eb1a773609fe472d17611c7886c0da04e88d4d;p=chaz%2Fopenbox

diff --git a/openbox/place.c b/openbox/place.c
index 3edb82c9..1ac295c0 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    place.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   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
@@ -23,16 +24,53 @@
 #include "focus.h"
 #include "config.h"
 
-static Rect* pick_head(ObClient *c)
+static void add_choice(guint *choice, guint mychoice)
 {
+    guint i;
+    for (i = 0; i < screen_num_monitors; ++i) {
+        if (choice[i] == mychoice)
+            return;
+        else if (choice[i] == screen_num_monitors) {
+            choice[i] = mychoice;
+            return;
+        }
+    }
+}
+
+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();
+}
+
+static Rect **pick_head(ObClient *c)
+{
+    Rect **area;
+    guint *choice;
+    guint i;
+    gint px, py;
+
+    area = g_new(Rect*, screen_num_monitors);
+    choice = g_new(guint, screen_num_monitors);
+    for (i = 0; i < screen_num_monitors; ++i)
+        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) {
-        return screen_area_monitor(c->desktop,
-                                   client_monitor(c->transient_for));
+        add_choice(choice, client_monitor(c->transient_for));
     }
 
-    /* more than one guy in his group (more than just him) */
-    if (c->group && c->group->members->next) {
+    /* more than one window in its group (more than just this window) */
+    if (client_has_group_siblings(c)) {
         GSList *it;
 
         /* try on the client's desktop */
@@ -41,41 +79,58 @@ static Rect* pick_head(ObClient *c)
             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));
+                add_choice(choice, 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));
+                add_choice(choice, client_monitor(it->data));
         }
     }
 
-    return NULL;
+    if (focus_client)
+        add_choice(choice, 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)) {
+            add_choice(choice, 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]);
+
+    return area;
 }
 
 static gboolean place_random(ObClient *client, gint *x, gint *y)
 {
-    int l, r, t, b;
-    Rect *area;
+    gint l, r, t, b;
+    Rect **areas;
+    guint i;
 
-    area = pick_head(client);
-    if (!area)
-        area = screen_area_monitor(client->desktop,
-                                   g_random_int_range(0, screen_num_monitors));
+    areas = pick_head(client);
+    i = 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;
+    l = areas[i]->x;
+    t = areas[i]->y;
+    r = areas[i]->x + areas[i]->width - client->frame->area.width;
+    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);
 
     return TRUE;
 }
@@ -160,7 +215,7 @@ static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
     }
 
     /* has to be more than me in the group */
-    if (diffhead && c->group && c->group->members->next) {
+    if (diffhead && client_has_group_siblings(c)) {
         guint *num, most;
         GSList *it;
 
@@ -175,6 +230,8 @@ static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
             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;
@@ -194,7 +251,7 @@ typedef enum
 } ObSmartType;
 
 #define SMART_IGNORE(placer, c) \
-    (placer == c || !c->visible || c->shaded || !client_normal(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)))
@@ -202,100 +259,119 @@ typedef enum
 static gboolean place_smart(ObClient *client, gint *x, gint *y,
                             ObSmartType type)
 {
-    guint i;
     gboolean ret = FALSE;
     GSList *spaces = NULL, *sit;
     GList *it;
+    Rect **areas;
+    guint i;
 
-    for (i = 0; i < screen_num_monitors; ++i)
-        spaces = area_add(spaces, screen_area_monitor(client->desktop, i));
+    if (type == SMART_GROUP) {
+        /* has to be more than me in the group */
+        if (!client_has_group_siblings(client))
+            return FALSE;
+    }
 
-    if (type == SMART_FULL || type == SMART_FOCUSED) {
-        gboolean found_foc = FALSE, stop = FALSE;
-        ObClient *foc;
-        GList *list;
+    areas = pick_head(client);
 
-        list = focus_order[client->desktop == DESKTOP_ALL ?
-                           screen_desktop : client->desktop];
-        foc = list ? list->data : NULL;
+    for (i = 0; i < screen_num_monitors; ++i) {
+        spaces = area_add(spaces, areas[i]);
 
-        for (it = stacking_list; it && !stop; it = g_list_next(it))
-        {
+        /* 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))
+            if (WINDOW_IS_CLIENT(it->data)) {
                 c = it->data;
-            else
+                if (c->fullscreen)
+                    continue;
+            } else
                 continue;
 
-            if (!SMART_IGNORE(client, c)) {
-                if (type == SMART_FOCUSED) {
-                    if (c->layer <= client->layer && found_foc)
-                        stop = TRUE;
-                }
-                if (!stop)
+            if (c->layer > client->layer) {
+                if (!SMART_IGNORE(client, c))
                     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
+                break;
         }
-    } 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 (type == SMART_FULL || type == SMART_FOCUSED) {
+            gboolean found_foc = FALSE, stop = FALSE;
+            ObClient *foc;
+
+            foc = focus_order_find_first(client->desktop == DESKTOP_ALL ?
+                                         screen_desktop : client->desktop);
+
+            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 (!ret) {
-            if (r->width >= client->frame->area.width &&
-                r->height >= client->frame->area.height) {
-                ret = TRUE;
-                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;
+                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;
+                    }
                 }
             }
-        }
 
-        g_free(r);
+            g_free(r);
+        }
+        g_slist_free(spaces);
+        spaces = NULL;
     }
-    g_slist_free(spaces);
+
+    g_free(areas);
 
     return ret;
 }
 
 static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
 {
-    guint i;
     gint l, r, t, b;
     gint px, py;
     Rect *area;
 
+    area = pick_pointer_head(client);
     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;
@@ -309,24 +385,54 @@ 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)
+{
+    Rect *screen;
+
+    if (!settings || (settings && !settings->pos_given))
+        return FALSE;
+
+    /* Find which head the pointer is on */
+    if (settings->head == -1)
+        screen = pick_pointer_head(client);
+    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) {
         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;
-            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 (!(m == client || m->transient_for) && client_normal(m)) {
                     if (first) {
                         l = RECT_LEFT(m->frame->area);
                         t = RECT_TOP(m->frame->area);
@@ -348,41 +454,42 @@ 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;
+    if (client->transient) {
+        Rect **areas;
+
+        areas = pick_head(client);
 
-        area = pick_head(client);
-        if (!area)
-            area = screen_area_monitor(client->desktop, 0);
+        *x = (areas[0]->width - client->frame->area.width) / 2 + areas[0]->x;
+        *y = (areas[0]->height - client->frame->area.height) / 2 + areas[0]->y;
 
-        *x = (area->width - client->frame->area.width) / 2 + area->x;
-        *y = (area->height - client->frame->area.height) / 2 + area->y;
+        g_free(areas);
         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, SMART_FULL)    ||
-        place_smart(client, x, y, SMART_GROUP)   ||
-        place_smart(client, x, y, SMART_FOCUSED) ||
-        (config_focus_follow ?
+        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_random(client, x, y)))
-    {
-        /* get where the client should be */
-        frame_frame_gravity(client->frame, x, y);
-    } else
+         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,
+                        client->area.width, client->area.height);
+    return ret;
 }