add option for under-mouse placement

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 341866c905173b720e970d7a8873246914d94c15..19fa597a6f4a8f44c243f4f79f5dae280768a98c 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -374,13 +374,11 @@ void place_client(ObClient *client, gint *x, gint *y)
         return;
     if (place_transient(client, x, y)             ||
         place_dialog(client, x, y)                ||
-        (!(config_focus_follow && config_focus_new) ?
+        ((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) :
-         FALSE)                                   ||
-        (config_focus_follow ?
-         place_under_mouse(client, x, y) :
+         place_smart(client, x, y, SMART_FOCUSED) ||
          place_random(client, x, y)))
     {
         /* get where the client should be */