add otk::MessageDialog

[chaz/openbox] / scripts / windowplacement.py

diff --git a/scripts/windowplacement.py b/scripts/windowplacement.py
index 0fe29fcc2eb272466ed22b383c83af50dad45f13..493e526b671539d7cc3e5735ae303f3443f5cec8 100644 (file)
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -10,10 +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).             ###
-ignore_requested_positions = 0                                             ###
 ###                                                                        ###
 ##############################################################################
 
@@ -26,15 +22,11 @@ _rand = random.Random()
 def random(data):
     """Place windows randomly around the screen."""
     if not data.client: return
-    if not ignore_requested_positions:
-        if data.client.positionRequested(): return
-    client_area = data.client.area()
-    frame_size = data.client.frame.size()
-    screen_area = ob.openbox.screen(data.screen).area()
-    width = screen_area.width() - (client_area.width() +
-                                   frame_size.left + frame_size.right)
-    height = screen_area.height() - (client_area.height() + 
-                                     frame_size.top + frame_size.bottom)
+    if data.client.positionRequested(): return
+    client_area = data.client.frame.area()
+    screen_area = ob.openbox.screen(data.screen).area(data.client.desktop())
+    width = screen_area.width() - client_area.width()
+    height = screen_area.height() - client_area.height()
     global _rand
     x = _rand.randrange(screen_area.x(), width-1)
     y = _rand.randrange(screen_area.y(), height-1)
@@ -46,21 +38,18 @@ _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 data.client.positionRequested(): return
-    client_area = data.client.area()
-    frame_size = data.client.frame.size()
-    screen_area = ob.openbox.screen(data.screen).area()
-    width = screen_area.width() - (client_area.width() +
-                                   frame_size.left + frame_size.right)
-    height = screen_area.height() - (client_area.height() + 
-                                     frame_size.top + frame_size.bottom)
+    if data.client.positionRequested(): return
+    client_area = data.client.frame.area()
+    screen_area = ob.openbox.screen(data.screen).area(data.client.desktop())
+    width = screen_area.width() - client_area.width()
+    height = screen_area.height() - client_area.height()
     global _cascade_x, _cascade_y
     if _cascade_x < screen_area.x() or _cascade_y < screen_area.y() or \
            _cascade_x >= width or _cascade_y >= height:
         _cascade_x = screen_area.x()
         _cascade_y = screen_area.y()
     data.client.move(_cascade_x, _cascade_y)
+    frame_size = data.client.frame.size()
     _cascade_x += frame_size.top
     _cascade_y += frame_size.top