80 cols

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 29d58734c6601ada8d9814755779aa320770ae06..a4c2f588659067260c8ebaa2312028a05fbc66e3 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,6 +1,7 @@
 /* -*- 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        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -175,6 +176,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;
@@ -324,9 +327,47 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     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);
+    *x = MIN(MAX(*x, l), r);
     *y = py - client->area.height / 2 - client->frame->size.top;
-//    *y = MIN(MAX(*y, t), b);
+    *y = MIN(MAX(*y, t), b);
+
+    return TRUE;
+}
+
+static gboolean place_per_app_setting(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;
 }
@@ -373,29 +414,25 @@ static gboolean place_transient(ObClient *client, gint *x, gint *y)
     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)
 {
-   /* non-normal clients has less rules, and windows that are being restored
-    * from a session do also. we can assume you want it back where you
-    * saved it */
-    gint rude = client_normal(client) && !client->session;
+    gboolean ret = FALSE;
     if (client->positioned)
-        rude = 0;
-    else if (place_transient(client, x, y)             ||
+        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_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)))
-    {
-        /* get where the client should be */
-        frame_frame_gravity(client->frame, x, y);
-    } else
+         place_random(client, x, y))))
         g_assert_not_reached(); /* the last one better succeed */
-    /* make sure the window is visible. */
-    client_find_onscreen(client, x, y,
-                         client->frame->area.width,
-                         client->frame->area.height,
-                         rude);
+    /* get where the client should be */
+    frame_frame_gravity(client->frame, x, y);
+    return ret;
 }