use the frame's area

[chaz/openbox] / scripts / builtins.py

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 3d06a6945118cefca83963c5e6741f41c8b07ce5..ecc70fd68d33435a9d9a7e65186e26a38f64adfb 100644 (file)
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -93,12 +93,12 @@ def restart(data, other = ""):
 def raise_win(data):
     """Raises the window on which the event occured"""
     if not data.client: return
-    openbox.screen(data.screen).restack(1, data.client)
+    openbox.screen(data.screen).raiseWindow(data.client)
 
 def lower_win(data):
     """Lowers the window on which the event occured"""
     if not data.client: return
-    openbox.screen(data.screen).restack(0, data.client)
+    openbox.screen(data.screen).lowerWindow(data.client)
 
 def toggle_shade(data):
     """Toggles the shade status of the window on which the event occured"""
@@ -317,10 +317,11 @@ ob_rand = None
 import random
 def placewindows_random(data):
     if not data.client: return
-    client_area = data.client.area()
+    frame_area = data.client.frame.area()
     screen = display.screenInfo(data.screen)
-    width = screen.width() - client_area.width()
-    height = screen.height() - client_area.height()
+    # XXX - USE THE FRAME'S SIZE!!
+    width = screen.width() - frame_area.width()
+    height = screen.height() - frame_area.height()
     global ob_rand
     if not ob_rand: ob_rand = random.Random()
     x = ob_rand.randrange(0, width-1)