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 aa9271ba512012bc3a1c17f7baffc72156bf8fb8..a319c7b1b78c5c10e45c7e434b3b2ec8ce8b4d28 100644 (file)
--- a/scripts/windowplacement.py
+++ b/scripts/windowplacement.py
@@ -7,6 +7,12 @@
 ### these.                                                               ###
 ############################################################################
 
+##############################################################################
+### Options for the windowplacement module:                                ###
+###                                                                        ###
+###                                                                        ###
+##############################################################################
+
 import otk
 import ob
 import random
@@ -14,11 +20,12 @@ import random
 _rand = random.Random()
 
 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()
+    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() + 
@@ -28,4 +35,27 @@ def random(data):
     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.area()
+    frame_size = data.client.frame.size()
+    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() + 
+                                     frame_size.top + frame_size.bottom)
+    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)
+    _cascade_x += frame_size.top
+    _cascade_y += frame_size.top
+
 print "Loaded windowplacement.py"