use the new global display var

[chaz/openbox] / scripts / builtins.py

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 44dcbdd5e4327a6f7d51d0fb56d482c7e41f9d69..c9e1d34707f65e5f9be000910e5d45a5ad61d5e8 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(OBDisplay_screenInfo(data.screen).rootWindow(),
-                    OBProperty.net_wm_state, data.client.window(), add,
-                    openbox.property().atom(OBProperty.net_wm_state_above))
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property.net_wm_state, data.client.window(), add,
+                    openbox.property().atom(Property.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(OBDisplay_screenInfo(data.screen).rootWindow(),
-                    OBProperty.net_wm_state, data.client.window(), add,
-                    openbox.property().atom(OBProperty.net_wm_state_below))
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property.net_wm_state, data.client.window(), add,
+                    openbox.property().atom(Property.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(OBDisplay_screenInfo(data.screen).rootWindow(),
-                    OBProperty.net_wm_state, data.client.window(), add,
-                    openbox.property().atom(OBProperty.net_wm_state_shaded))
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property.net_wm_state, data.client.window(), add,
+                    openbox.property().atom(Property.net_wm_state_shaded))
     
 def close(data):
     """Closes the window on which the event occured"""
     if not data.client: return
-    send_client_msg(OBDisplay_screenInfo(data.screen).rootWindow(),
-                    OBProperty.net_close_window, data.client.window(), 0)
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property.net_close_window, data.client.window(), 0)
 
 def focus(data):
     """Focuses the window on which the event occured"""
@@ -64,23 +64,23 @@ def resize(data):
 
     # pick a corner to anchor
     if not (resize_nearest or data.context == MC_Grip):
-        corner = OBClient.TopLeft
+        corner = Client.TopLeft
     else:
         x = px - data.press_clientx
         y = py - data.press_clienty
         if y < data.press_clientheight / 2:
             if x < data.press_clientwidth / 2:
-                corner = OBClient.BottomRight
+                corner = Client.BottomRight
                 dx *= -1
             else:
-                corner = OBClient.BottomLeft
+                corner = Client.BottomLeft
             dy *= -1
         else:
             if x < data.press_clientwidth / 2:
-                corner = OBClient.TopRight
+                corner = Client.TopRight
                 dx *= -1
             else:
-                corner = OBClient.TopLeft
+                corner = Client.TopLeft
 
     data.client.resize(corner,
                        data.press_clientwidth + dx,
@@ -114,8 +114,8 @@ def unshade(data):
 
 def change_desktop(data, num):
     """Switches to a specified desktop"""
-    root = OBDisplay_screenInfo(data.screen).rootWindow()
-    send_client_msg(root, OBProperty.net_current_desktop, root, num)
+    root = display.screenInfo(data.screen).rootWindow()
+    send_client_msg(root, Property.net_current_desktop, root, num)
 
 def next_desktop(data, no_wrap=0):
     """Switches to the next desktop, optionally (by default) cycling around to
@@ -141,11 +141,17 @@ def prev_desktop(data, no_wrap=0):
         d = n - 1
     change_desktop(data, d)
 
+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)
+    
 def send_to_desktop(data, num):
     """Sends a client to a specified desktop"""
     if not data.client: return
-    send_client_msg(OBDisplay_screenInfo(data.screen).rootWindow(),
-                    OBProperty.net_wm_desktop, data.client.window(), num)
+    send_client_msg(display.screenInfo(data.screen).rootWindow(),
+                    Property.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
@@ -241,8 +247,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)
 
@@ -311,7 +317,7 @@ import random
 def placewindows_random(data):
     if not data.client: return
     client_area = data.client.area()
-    screen = OBDisplay_screenInfo(data.screen)
+    screen = display.screenInfo(data.screen)
     width = screen.width() - client_area.width()
     height = screen.height() - client_area.height()
     global ob_rand