use the proper screen area, which excludes area taken up by struts

[chaz/openbox] / scripts / builtins.py

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 9b3c07de44f49d9ae9ada28f10a24bcbc27d4990..8bf3cd1df659c8c84c0e08868333c295b2271683 100644 (file)
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -241,15 +241,7 @@ def setup_sloppy_focus(click_focus = 1, click_raise = 0):
        in a window can raise the window to the front of its stacking layer."""
     ebind(EventEnterWindow, focus)
     if click_focus:
-        mbind("Left", MC_Titlebar, MousePress, focus)
-        mbind("Left", MC_Handle, MousePress, focus)
-        mbind("Left", MC_Grip, MousePress, focus)
-        mbind("Left", MC_Window, MousePress, focus)
-        if click_raise:
-            mbind("Left", MC_Titlebar, MousePress, raise_win)
-            mbind("Left", MC_Handle, MousePress, raise_win)
-            mbind("Left", MC_Grip, MousePress, raise_win)
-            mbind("Left", MC_Window, MousePress, raise_win)
+        setup_click_focus(click_raise)
 
 def setup_window_clicks():
     """Sets up the default bindings for various mouse buttons for various
@@ -327,15 +319,15 @@ 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)
-    width = screen.width() - (client_area.width() +
-                              frame_size.left + frame_size.right)
-    height = screen.height() - (client_area.height() + 
-                                frame_size.top + frame_size.bottom)
+    screen_area = 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)
     global ob_rand
     if not ob_rand: ob_rand = random.Random()
-    x = ob_rand.randrange(0, width-1)
-    y = ob_rand.randrange(0, height-1)
+    x = ob_rand.randrange(screen_area.x(), width-1)
+    y = ob_rand.randrange(screen_area.y(), height-1)
     data.client.move(x, y)