very cool struts. partial struts actually are partial struts now. possibly way broken...

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 5d848cb9126130f31f738fe97b6135c7a46377b1..661226aeec05aaf71f9ea6d42b0cc7a312d5117d 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -47,15 +47,13 @@ static Rect *pick_pointer_head(ObClient *c)
      
     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);
+            return screen_area_monitor(c->desktop, i, NULL);
         }
     }
     g_assert_not_reached();
 }
 
-/*! Pick a monitor to place a window on.
-  The returned array value should be freed with g_free. The areas within the
-  array should not be freed. */
+/*! Pick a monitor to place a window on. */
 static Rect **pick_head(ObClient *c)
 {
     Rect **area;
@@ -124,7 +122,7 @@ static Rect **pick_head(ObClient *c)
         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_monitor(c->desktop, choice[i], NULL);
 
     return area;
 }
@@ -148,6 +146,8 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
     if (b > t) *y = g_random_int_range(t, b + 1);
     else       *y = areas[i]->y;
 
+    for (i = 0; i < screen_num_monitors; ++i)
+        g_free(areas[i]);
     g_free(areas);
 
     return TRUE;
@@ -217,9 +217,10 @@ enum {
     IGNORE_FULLSCREEN = 1 << 0,
     IGNORE_MAXIMIZED  = 1 << 1,
     IGNORE_MENUTOOL   = 1 << 2,
-    IGNORE_SHADED     = 1 << 3,
-    IGNORE_NONGROUP   = 1 << 4,
-    IGNORE_BELOW      = 1 << 5,
+    /*IGNORE_SHADED     = 1 << 3,*/
+    IGNORE_NONGROUP   = 1 << 3,
+    IGNORE_BELOW      = 1 << 4,
+    IGNORE_NONFOCUS   = 1 << 5,
     IGNORE_END        = 1 << 6
 };
 
@@ -230,6 +231,7 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
     gboolean ret;
     gint maxsize;
     GSList *spaces = NULL, *sit, *maxit;
+    guint i;
 
     areas = pick_head(c);
     ret = FALSE;
@@ -242,12 +244,14 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
 
         /* try all monitors in order of preference */
         for (i = 0; i < screen_num_monitors && !ret; ++i) {
+            GList *it;
+
             /* add the whole monitor */
             spaces = area_add(spaces, areas[i]);
 
             /* go thru all the windows */
-            for (sit = client_list; sit; sit = g_slist_next(sit)) {
-                ObClient *test = sit->data;
+            for (it = client_list; it; it = g_list_next(it)) {
+                ObClient *test = it->data;
 
                 /* should we ignore this client? */
                 if (screen_showing_desktop) continue;
@@ -272,13 +276,17 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
                     (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(test) &&
+                    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 */
@@ -313,6 +321,8 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
         }
     }
 
+    for (i = 0; i < screen_num_monitors; ++i)
+        g_free(areas[i]);
     g_free(areas);
     return ret;
 }
@@ -323,8 +333,9 @@ 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);
-    screen_pointer_pos(&px, &py);
 
     l = area->x;
     t = area->y;
@@ -353,12 +364,17 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
     else if (settings->monitor > 0 &&
              (guint)settings->monitor <= screen_num_monitors)
         screen = screen_area_monitor(client->desktop,
-                                     (guint)settings->monitor - 1);
+                                     (guint)settings->monitor - 1, NULL);
     else {
-        Rect **all = NULL;
-        all = pick_head(client);
-        screen = all[0];
-        g_free(all); /* the areas themselves don't need to be freed */
+        Rect **areas;
+        guint i;
+
+        areas = pick_head(client);
+        screen = areas[0];
+
+        for (i = 0; i < screen_num_monitors; ++i)
+            g_free(areas[i]);
+        g_free(areas);
     }
 
     if (settings->center_x)
@@ -414,12 +430,15 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
         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;
     }
@@ -442,6 +461,7 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
         (config_place_policy == OB_PLACE_POLICY_MOUSE &&
          place_under_mouse(client, x, y)) ||
         place_nooverlap(client, x, y) ||
+        place_under_mouse(client, x, y) ||
         place_random(client, x, y);
     g_assert(ret);