include the desktop name if cycling on all desktops is enabled

[chaz/openbox] / scripts / windowplacement.py

diff --git a/scripts/windowplacement.py b/scripts/windowplacement.py
index d01fe71b2834b1395934b6cf8b87ef59a6c947c0..a319c7b1b78c5c10e45c7e434b3b2ec8ce8b4d28 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,11 +22,10 @@ _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()
+    screen_area = ob.openbox.screen(data.screen).area(data.client.desktop())
     width = screen_area.width() - (client_area.width() +
                                    frame_size.left + frame_size.right)
     height = screen_area.height() - (client_area.height() + 
@@ -49,11 +41,10 @@ _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()
+    screen_area = ob.openbox.screen(data.screen).area(data.client.desktop())
     width = screen_area.width() - (client_area.width() +
                                    frame_size.left + frame_size.right)
     height = screen_area.height() - (client_area.height() +