respect the active/mouse options for monitor placement, and use ObMonitorPlace for...

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index a73a8bfbd60838bd2a610c53e78a94bc69ca9376..2cd21bb0379778c3c9a9b947a996b798944c0d93 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -193,21 +193,25 @@ static Rect *pick_head(ObClient *c, gboolean foreground,
         if (config_place_monitor == OB_PLACE_MONITOR_PRIMARY)
             choice[i].flags |= HEAD_PLACED;
         if (settings &&
-            settings->monitor_type == OB_APP_SETTINGS_MONITOR_PRIMARY)
+            settings->monitor_type == OB_PLACE_MONITOR_PRIMARY)
             choice[i].flags |= HEAD_PERAPP;
     }
 
     i = screen_monitor_active();
     if (i < screen_num_monitors) {
+        if (config_place_monitor == OB_PLACE_MONITOR_ACTIVE)
+            choice[i].flags |= HEAD_PLACED;
         if (settings &&
-            settings->monitor_type == OB_APP_SETTINGS_MONITOR_ACTIVE)
+            settings->monitor_type == OB_PLACE_MONITOR_ACTIVE)
             choice[i].flags |= HEAD_PERAPP;
     }
 
     i = screen_monitor_pointer();
     if (i < screen_num_monitors) {
+        if (config_place_monitor == OB_PLACE_MONITOR_MOUSE)
+            choice[i].flags |= HEAD_PLACED;
         if (settings &&
-            settings->monitor_type == OB_APP_SETTINGS_MONITOR_MOUSE)
+            settings->monitor_type == OB_PLACE_MONITOR_MOUSE)
             choice[i].flags |= HEAD_PERAPP;
     }