add option for under-mouse placement

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 3edb82c9b4681419bb89c3faf39bedb2332800f5..19fa597a6f4a8f44c243f4f79f5dae280768a98c 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -194,7 +194,7 @@ typedef enum
 } ObSmartType;
 
 #define SMART_IGNORE(placer, c) \
-    (placer == c || !c->visible || c->shaded || !client_normal(c) || \
+    (placer == c || !c->frame->visible || c->shaded || !client_normal(c) || \
      (c->desktop != DESKTOP_ALL && \
       c->desktop != (placer->desktop == DESKTOP_ALL ? \
                      screen_desktop : placer->desktop)))
@@ -372,13 +372,13 @@ void place_client(ObClient *client, gint *x, gint *y)
 {
     if (client->positioned)
         return;
-    if (place_transient(client, x, y)            ||
-        place_dialog(client, x, y)               ||
-        place_smart(client, x, y, SMART_FULL)    ||
-        place_smart(client, x, y, SMART_GROUP)   ||
-        place_smart(client, x, y, SMART_FOCUSED) ||
-        (config_focus_follow ?
+    if (place_transient(client, x, y)             ||
+        place_dialog(client, x, y)                ||
+        ((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 */