oops... I'm combining two different things in this commit... so I'll try be clear

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index ff45a4dccb858673a98359023a6ec170119fe613..f9da57629a39722db7c6d9a7e881ff3ec4809acc 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -27,7 +27,8 @@
 static Rect *pick_head(ObClient *c)
 {
     Rect *area = NULL;
-    gint i;
+    guint i;
+    gint px, py;
 
     /* try direct parent first */
     if (c->transient_for && c->transient_for != OB_TRAN_GROUP) {
@@ -61,16 +62,16 @@ static Rect *pick_head(ObClient *c)
     screen_pointer_pos(&px, &py);
 
     for (i = 0; i < screen_num_monitors; i++) {
-        area = screen_area_monitor(client->desktop, i);
+        area = screen_area_monitor(c->desktop, i);
         if (RECT_CONTAINS(*area, px, py))
             break;
     }
     if (i == screen_num_monitors)
-        area = screen_area_monitor(client->desktop, 0);    
+        area = screen_area_monitor(c->desktop, 0);    
 
     /* Last resort */
     if (!area)
-        area = screen_area_monitor(client->desktop,
+        area = screen_area_monitor(c->desktop,
                                    g_random_int_range(0, screen_num_monitors));
 
     return area;
@@ -220,7 +221,6 @@ 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;
@@ -320,12 +320,12 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
 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_head(client);
+    screen_pointer_pos(&px, &py);
 
     l = area->x;
     t = area->y;
@@ -343,7 +343,6 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
 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))