X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fwindowplacement.py;h=493e526b671539d7cc3e5735ae303f3443f5cec8;hb=50002f2ceb4234145f3977bb14752dc930ada26c;hp=127cd2ad1203cc70b0990e32c75977f761f07330;hpb=5168a8add5ed46f74b615ecc60738c1113606734;p=chaz%2Fopenbox

diff --git a/scripts/windowplacement.py b/scripts/windowplacement.py
index 127cd2ad..493e526b 100644
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -1,25 +1,56 @@
 ############################################################################
 ### Window placement algorithms, choose one of these and ebind it to the ###
 ### 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,    ###
+### these.                                                               ###
 ############################################################################
 
+##############################################################################
+### Options for the windowplacement module:                                ###
+###                                                                        ###
+###                                                                        ###
+##############################################################################
+
+import otk
 import ob
 import 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
+
 print "Loaded windowplacement.py"