move stuff around some more

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 70c3cdd3336b21d5ebd5f706d5c0dfd5e8859373..78e94814fcb6f334510e3592f588d1d9171050a3 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -59,7 +59,7 @@ static Rect* pick_head(ObClient *c)
 
 static gboolean place_random(ObClient *client, gint *x, gint *y)
 {
-    int l, r, t, b;
+    gint l, r, t, b;
     Rect *area;
 
     area = pick_head(client);
@@ -214,9 +214,11 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
     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 (c->layer > client->layer) {
@@ -239,9 +241,11 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
             for (; it && !stop; 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)) {
@@ -327,6 +331,43 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     return TRUE;
 }
 
+void place_window_from_settings(ObClient *client, gint *x, gint *y, ObAppSettings *settings)
+{
+    gint px, py, i;
+    Rect *screen;
+
+    if (!settings || (settings && !settings->pos_given))
+        return FALSE;
+
+    /* Find which head the pointer is on */
+    if (settings->head == -1 && screen_num_monitors > 1) {
+        screen_pointer_pos(&px, &py);
+
+        for (i = 0; i < screen_num_monitors; i++) {
+            screen = screen_area_monitor(client->desktop, i);
+            if (RECT_CONTAINS(*screen, px, py))
+                break;
+        }
+
+        if (i == screen_num_monitors)
+            screen = screen_area_monitor(client->desktop, 0);
+    }
+    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) {
@@ -341,8 +382,8 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
         } 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 (first) {
@@ -369,11 +410,12 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
     return FALSE;
 }
 
-void place_client(ObClient *client, gint *x, gint *y)
+void place_client(ObClient *client, gint *x, gint *y, ObAppSetting *settings)
 {
     if (client->positioned)
         return;
     if (place_transient(client, x, y)             ||
+        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)    ||