X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fwindowplacement.py;h=505993c5bf22e7e82ce967956f693db0bab2b276;hb=8c8c40e270fa2e2ecc423e59191c99f5b97d8d75;hp=070cc0ee2699f890a0e7d97141d2086bb2404c80;hpb=e1e5293ae354ab7b1c8459aab85e60e1a801924d;p=chaz%2Fopenbox

diff --git a/scripts/windowplacement.py b/scripts/windowplacement.py
index 070cc0ee..505993c5 100644
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -3,28 +3,48 @@
 ### ob.EventAction.PlaceWindow event.                                    ###
 ###                                                                      ###
 ### Also see historyplacement.py for the history placement module which  ###
-### provides an algorithm that can be used in place of, or alongside     ###
+### provides an algorithm that can be used in place of, or alongside,    ###
 ### these.                                                               ###
 ############################################################################
 
-import otk
-import ob
-import random
+import otk, ob, random
 
 _rand = random.Random()
 
 def random(data):
+    """Place windows randomly around the screen."""
     if not data.client: 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)
     data.client.move(x, y)
 
+_cascade_x = 0
+_cascade_y = 0
+
+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.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
+
+export_functions = random, cascade
+
 print "Loaded windowplacement.py"