X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fwindowplacement.py;h=493e526b671539d7cc3e5735ae303f3443f5cec8;hb=1e47e17d08d72d181edc2bde598ad246055655ad;hp=e7ba187ded2741ddb230748e5ce71b899227a55a;hpb=f1c0beee3e785800a5cb7766afc0a40e50adfb03;p=chaz%2Fopenbox

diff --git a/scripts/windowplacement.py b/scripts/windowplacement.py
index e7ba187d..493e526b 100644
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -23,13 +23,10 @@ def random(data):
     """Place windows randomly around the screen."""
     if not data.client: 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()
-    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)
+    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)
@@ -42,19 +39,17 @@ def cascade(data):
     """Place windows in a cascading order from top-left to bottom-right."""
     if not data.client: 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()
-    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)
+    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