dont let you ignore requested positions for !normal windows

diff --git a/scripts/historyplacement.py b/scripts/historyplacement.py
index 8386e581043d1d8cd2ef49b4e4561ea69cec2766..b39043cc487e0e56d7c8783866ac2ca6a461666b 100644 (file)
--- a/scripts/historyplacement.py
+++ b/scripts/historyplacement.py
@@ -104,7 +104,8 @@ def _find(screen, state):
 def place(data):
     global _data
     if data.client:
-        if not windowplacement.ignore_requested_positions:
+    if not (windowplacement.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 0fe29fcc2eb272466ed22b383c83af50dad45f13..d01fe71b2834b1395934b6cf8b87ef59a6c947c0 100644 (file)
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -13,6 +13,9 @@
 # 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                                             ###
 ###                                                                        ###
 ##############################################################################
@@ -26,7 +29,7 @@ _rand = random.Random()
 def random(data):
     """Place windows randomly around the screen."""
     if not data.client: return
-    if not ignore_requested_positions:
+    if not (ignore_requested_positions and data.client.normal()):
         if data.client.positionRequested(): return
     client_area = data.client.area()
     frame_size = data.client.frame.size()
@@ -46,7 +49,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:
+    if not (ignore_requested_positions and data.client.normal()):
         if data.client.positionRequested(): return
     client_area = data.client.area()
     frame_size = data.client.frame.size()