make ignoring optional only for history placement

diff --git a/scripts/historyplacement.py b/scripts/historyplacement.py
index 9bee5a6b856743a95c329cfbf24f38e176efc8b4..5e761483a1ba99663f29ba5293f33389a1a41a01 100644 (file)
--- a/scripts/historyplacement.py
+++ b/scripts/historyplacement.py
@@ -9,6 +9,13 @@ import windowplacement # fallback routines
 ### Options for the historyplacement module (Options in the                ###
 ### windowplacement module also apply!):                                   ###
 ###                                                                        ###
+# ignore_requested_positions - When true, the placement algorithm will     ###
+###                            attempt to place windows even when they     ###
+###                            request a position (like XMMS).             ###
+###                            Note this only applies to normal windows,   ###
+###                            not to special cases like desktops and      ###
+###                            docks.                                      ###
+ignore_requested_positions = 0                                             ###
 # fallback - The window placement algorithm that will be used when history ###
 ###          placement does not have a place for the window.               ###
 fallback = windowplacement.random                                          ###
@@ -104,8 +111,7 @@ def _find(screen, state):
 def place(data):
     global _data
     if data.client:
-        if not (windowplacement.ignore_requested_positions and
-                data.client.normal()):
+        if not (ignore_requested_positions and data.client.normal()):
             if data.client.positionRequested(): return
         state = _create_state(data)
         try:

diff --git a/scripts/windowplacement.py b/scripts/windowplacement.py
index d01fe71b2834b1395934b6cf8b87ef59a6c947c0..e7ba187ded2741ddb230748e5ce71b899227a55a 100644 (file)
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -10,13 +10,6 @@
 ##############################################################################
 ### Options for the windowplacement module:                                ###
 ###                                                                        ###
-# ignore_requested_positions - When true, the placement algorithm will     ###
-###                            attempt to place windows even when they     ###
-###                            request a position (like XMMS).             ###
-###                            Note this only applies to normal windows,   ###
-###                            not to special cases like desktops and      ###
-###                            docks.                                      ###
-ignore_requested_positions = 0                                             ###
 ###                                                                        ###
 ##############################################################################
 
@@ -29,8 +22,7 @@ _rand = random.Random()
 def random(data):
     """Place windows randomly around the screen."""
     if not data.client: return
-    if not (ignore_requested_positions and data.client.normal()):
-        if data.client.positionRequested(): return
+    if data.client.positionRequested(): return
     client_area = data.client.area()
     frame_size = data.client.frame.size()
     screen_area = ob.openbox.screen(data.screen).area()
@@ -49,8 +41,7 @@ _cascade_y = 0
 def cascade(data):
     """Place windows in a cascading order from top-left to bottom-right."""
     if not data.client: return
-    if not (ignore_requested_positions and data.client.normal()):
-        if data.client.positionRequested(): return
+    if data.client.positionRequested(): return
     client_area = data.client.area()
     frame_size = data.client.frame.size()
     screen_area = ob.openbox.screen(data.screen).area()