make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 440ddfb28011d2688191e1bb916dfb6994de2052..3bfba7fbbdb9cb7083e8023e30d4598cdc9fa029 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -3,6 +3,7 @@
 #include "screen.h"
 #include "frame.h"
 #include "focus.h"
+#include "config.h"
 
 static Rect* pick_head(ObClient *c)
 {
@@ -58,9 +59,6 @@ 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;
 }
 
@@ -71,7 +69,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 +83,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,22 +122,21 @@ 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;
+    Rect *carea = data;
     const Rect *a1 = p1, *a2 = p2;
 
-    ret = RECT_BOTTOM(*a1) - RECT_BOTTOM(*a2);
-    if (!ret)
-        ret = RECT_LEFT(*a1) - RECT_LEFT(*a2);
-    return ret;
+    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)
+static gboolean place_smart(ObClient *client, gint *x, gint *y,
+                            gboolean only_focused)
 {
     guint i;
     gboolean ret = FALSE;
-    GSList *spaces, *sit;
+    GSList *spaces = NULL, *sit;
     GList *it, *list;
 
     list = focus_order[client->desktop == DESKTOP_ALL ?
@@ -152,12 +148,14 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
     for (it = list; it; it = g_list_next(it)) {
         ObClient *c = it->data;
 
-        if (c == client || c->shaded)
-            continue;
-        spaces = area_remove(spaces, &c->frame->area);
+        if (c != client && !c->shaded && client_normal(c)) {
+            spaces = area_remove(spaces, &c->frame->area);
+            if (only_focused)
+                break;
+        }
     }
 
-    spaces = g_slist_sort(spaces, area_cmp);
+    spaces = g_slist_sort_with_data(spaces, area_cmp, &client->frame->area);
 
     for (sit = spaces; sit; sit = g_slist_next(sit)) {
         Rect *r = sit->data;
@@ -166,8 +164,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 (only_focused) {
+                    *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;
+                }
             }
         }
 
@@ -178,6 +181,36 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y)
     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;
+
+    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;
+}
+
 static gboolean place_transient(ObClient *client, gint *x, gint *y)
 {
     if (client->transient_for) {
@@ -241,13 +274,16 @@ 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_random(client, x, y))
-        return;
-    g_assert_not_reached(); /* the last one better succeed */
+    if (place_transient(client, x, y)    ||
+        place_dialog(client, x, y)       ||
+        place_smart(client, x, y, FALSE) ||
+        place_smart(client, x, y, TRUE)  ||
+        (config_focus_follow ?
+         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
+        g_assert_not_reached(); /* the last one better succeed */
 }