fix the stupid spelling

[chaz/openbox] / scripts / builtins.py

diff --git a/scripts/builtins.py b/scripts/builtins.py
index acf6615346c214ff2070946fa0896aea21457ed2..9b759e7ba12b5efc69260e85a9bc6f900d589672 100644 (file)
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -5,29 +5,29 @@
 def state_above(data, add=2):
     """Toggles, adds or removes the 'above' state on a window."""
     if not data.client: return
-    send_client_msg(Display_screenInfo(data.screen).rootWindow(),
-                    Property.net_wm_state, data.client.window(), add,
-                    openbox.property().atom(Property.net_wm_state_above))
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property_atoms().net_wm_state, data.client.window(), add,
+                    Property_atoms().net_wm_state_above)
     
 def state_below(data, add=2):
     """Toggles, adds or removes the 'below' state on a window."""
     if not data.client: return
-    send_client_msg(Display_screenInfo(data.screen).rootWindow(),
-                    Property.net_wm_state, data.client.window(), add,
-                    openbox.property().atom(Property.net_wm_state_below))
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property_atoms().net_wm_state, data.client.window(), add,
+                    Property_atoms().net_wm_state_below)
     
 def state_shaded(data, add=2):
     """Toggles, adds or removes the 'shaded' state on a window."""
     if not data.client: return
-    send_client_msg(Display_screenInfo(data.screen).rootWindow(),
-                    Property.net_wm_state, data.client.window(), add,
-                    openbox.property().atom(Property.net_wm_state_shaded))
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property_atoms().net_wm_state, data.client.window(), add,
+                    Property_atoms().net_wm_state_shaded)
     
 def close(data):
     """Closes the window on which the event occured"""
     if not data.client: return
-    send_client_msg(Display_screenInfo(data.screen).rootWindow(),
-                    Property.net_close_window, data.client.window(), 0)
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property_atoms().net_close_window, data.client.window(), 0)
 
 def focus(data):
     """Focuses the window on which the event occured"""
@@ -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"""
@@ -114,8 +114,8 @@ def unshade(data):
 
 def change_desktop(data, num):
     """Switches to a specified desktop"""
-    root = Display_screenInfo(data.screen).rootWindow()
-    send_client_msg(root, Property.net_current_desktop, root, num)
+    root = display.screenInfo(data.screen).rootWindow()
+    send_client_msg(root, Property_atoms().net_current_desktop, root, num)
 
 def next_desktop(data, no_wrap=0):
     """Switches to the next desktop, optionally (by default) cycling around to
@@ -144,14 +144,15 @@ def prev_desktop(data, no_wrap=0):
 def send_to_all_desktops(data):
     """Sends a client to all desktops"""
     if not data.client: return
-    send_client_msg(Display_screenInfo(data.screen).rootWindow(),
-                    Property.net_wm_desktop, data.client.window(), 0xffffffff)
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property_atoms().net_wm_desktop, data.client.window(),
+                    0xffffffff)
     
 def send_to_desktop(data, num):
     """Sends a client to a specified desktop"""
     if not data.client: return
-    send_client_msg(Display_screenInfo(data.screen).rootWindow(),
-                    Property.net_wm_desktop, data.client.window(), num)
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property_atoms().net_wm_desktop, data.client.window(), num)
 
 def send_to_next_desktop(data, no_wrap=0, follow=1):
     """Sends a window to the next desktop, optionally (by default) cycling
@@ -247,8 +248,8 @@ def setup_window_clicks():
     mbind("Left", MC_Handle, MousePress, raise_win)
     mbind("A-Left", MC_Frame, MousePress, raise_win)
     mbind("A-Middle", MC_Frame, MouseClick, lower_win)
-    mbind("Right", MC_Titlebar, MouseClick, lower_win)
-    mbind("Right", MC_Handle, MouseClick, lower_win)
+    mbind("Middle", MC_Titlebar, MouseClick, lower_win)
+    mbind("Middle", MC_Handle, MouseClick, lower_win)
 
     mbind("Left", MC_Titlebar, MouseDoubleClick, toggle_shade)
 
@@ -317,9 +318,12 @@ import random
 def placewindows_random(data):
     if not data.client: return
     client_area = data.client.area()
-    screen = Display_screenInfo(data.screen)
-    width = screen.width() - client_area.width()
-    height = screen.height() - client_area.height()
+    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)
     global ob_rand
     if not ob_rand: ob_rand = random.Random()
     x = ob_rand.randrange(0, width-1)