X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=9b759e7ba12b5efc69260e85a9bc6f900d589672;hb=f8edbc908370d1b00db027d03ade1566dbb3dd24;hp=fee56e63a0cd7ac1552167112c8557db68f6460b;hpb=50863470923dec831ba1995e393477378fb245d4;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index fee56e63..9b759e7b 100644
--- 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"""
@@ -318,10 +318,12 @@ import random
 def placewindows_random(data):
     if not data.client: return
     client_area = data.client.area()
+    frame_size = data.client.frame.size()
     screen = display.screenInfo(data.screen)
-    # XXX - USE THE FRAME'S SIZE!!
-    width = screen.width() - client_area.width()
-    height = screen.height() - client_area.height()
+    width = screen.width() - (client_area.width() +
+                              frame_size.left + frame_size.right)
+    height = screen.height() - (client_area.height() + 
+                                frame_size.top + frame_size.bottom)
     global ob_rand
     if not ob_rand: ob_rand = random.Random()
     x = ob_rand.randrange(0, width-1)