X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=e3424001c156c409c8569dd3ce8c46ae297687e6;hb=b45a68cc30121ad2c5cd3b795a6b5e8572425316;hp=c9e1d34707f65e5f9be000910e5d45a5ad61d5e8;hpb=ffb237bf4033df1bcf4a863cbe20970c1a66dcd9;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index c9e1d347..e3424001 100644
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -6,28 +6,28 @@ 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))
+                    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))
+                    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))
+                    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)
+                    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"""
@@ -115,7 +115,7 @@ 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)
+    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
@@ -141,18 +141,26 @@ 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(display.screenInfo(data.screen).rootWindow(),
-                    Property.net_wm_desktop, data.client.window(), num)
+                    Property_atoms().net_wm_desktop, data.client.window(), num)
 
+def toggle_all_desktops(data):
+    """Toggles between sending a client to all desktops and to the current
+       desktop."""
+    if not data.client: return
+    if not data.client.desktop() == 0xffffffff:
+        send_to_desktop(data, 0xffffffff)
+    else:
+        send_to_desktop(data, openbox.screen(data.screen).desktop())
+    
+def send_to_all_desktops(data):
+    """Sends a client to all desktops"""
+    if not data.client: return
+    send_to_desktop(data, 0xffffffff)
+    
 def send_to_next_desktop(data, no_wrap=0, follow=1):
     """Sends a window to the next desktop, optionally (by default) cycling
        around to the first when going past the last. Also optionally moving to
@@ -254,6 +262,7 @@ def setup_window_clicks():
 
 def setup_window_buttons():
     """Sets up the default behaviors for the buttons in the window titlebar."""
+    mbind("Left", MC_AllDesktopsButton, MouseClick, toggle_all_desktops)
     mbind("Left", MC_CloseButton, MouseClick, close)
 
 def setup_scroll():
@@ -317,9 +326,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)
-    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)