X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=d87bf3d84dae560f7fb6f42daea57f36f16f26c6;hb=889df8a74da733c849cb52c3a76ae59956755882;hp=3b91248c57768f30b8d00d4f36b4e252c6db35f1;hpb=ee1130f8ecd9ddc94eca535fa129809d840b8219;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 3b91248c..d87bf3d8 100644
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -12,11 +12,9 @@ def focus(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     type = OBClient_type(client)
-    # these types of windows dont get focus from window enter events
-    if data.action() == EventEnterWindow:
-        if (type == OBClient_Type_Dock or \
-            type == OBClient_Type_Desktop):
-            return
+    # !normal windows dont get focus from window enter events
+    if data.action() == EventEnterWindow and not OBClient_normal(client):
+        return
     OBClient_focus(client)
 
 def move(data):
@@ -25,11 +23,8 @@ def move(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
 
-    type = OBClient_type(client)
-    # these types of windows dont get moved
-    if type == OBClient_Type_Dock or \
-       type == OBClient_Type_Desktop:
-        return
+    # !normal windows dont get moved
+    if not OBClient_normal(client): return
 
     dx = data.xroot() - data.pressx()
     dy = data.yroot() - data.pressy()
@@ -41,11 +36,8 @@ def resize(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
 
-    type = OBClient_type(client)
-    # these types of windows dont get resized
-    if type == OBClient_Type_Dock or \
-       type == OBClient_Type_Desktop:
-        return
+    # !normal windows dont get moved
+    if not OBClient_normal(client): return
 
     px = data.pressx()
     py = data.pressy()
@@ -77,44 +69,121 @@ def resize(data):
                     data.press_clientheight() + dy);
 
 def restart(data):
+    """Restarts openbox"""
     Openbox_restart(openbox, "")
 
-def toggle_shade(data):
-    print "toggle_shade"
-
 def raise_win(data):
+    """Raises the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     screen = Openbox_screen(openbox, OBClient_screen(client))
     OBScreen_restack(screen, 1, client)
 
 def lower_win(data):
+    """Lowers the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     screen = Openbox_screen(openbox, OBClient_screen(client))
     OBScreen_restack(screen, 0, client)
 
 def toggle_shade(data):
+    """Toggles the shade status of the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     print "toggle_shade"
     OBClient_shade(client, not OBClient_shaded(client))
 
 def shade(data):
+    """Shades the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     OBClient_shade(client, 1)
 
 def unshade(data):
+    """Unshades the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     OBClient_shade(client, 0)
+
+def change_desktop(data, num):
+    """Switches to a specified desktop"""
+    root = ScreenInfo_rootWindow(OBDisplay_screenInfo(data.screen()))
+    send_client_msg(root, OBProperty_net_current_desktop, root, num)
+
+def next_desktop(data, no_wrap=0):
+    """Switches to the next desktop, optionally (by default) cycling around to
+       the first when going past the last."""
+    screen = Openbox_screen(openbox, data.screen())
+    d = OBScreen_desktop(screen)
+    n = OBScreen_numDesktops(screen)
+    if (d < (n-1)):
+        d = d + 1
+    elif not no_wrap:
+        d = 0
+    change_desktop(data, d)
+    
+def prev_desktop(data, no_wrap=0):
+    """Switches to the previous desktop, optionally (by default) cycling around
+       to the last when going past the first."""
+    screen = Openbox_screen(openbox, data.screen())
+    d = OBScreen_desktop(screen)
+    n = OBScreen_numDesktops(screen)
+    if (d > 0):
+        d = d - 1
+    elif not no_wrap:
+        d = n - 1
+    change_desktop(data, d)
+
+def send_to_desktop(data, num):
+    """Sends a client to a specified desktop"""
+    root = ScreenInfo_rootWindow(OBDisplay_screenInfo(data.screen()))
+    client = Openbox_findClient(openbox, data.window())
+    if client:
+        window = OBClient_window(client)
+        send_client_msg(root, OBProperty_net_wm_desktop, window, num)
+
+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
+       the new desktop after sending the window."""
+    client = Openbox_findClient(openbox, data.window())
+    if not client: return
+    screen = Openbox_screen(openbox, data.screen())
+    d = OBScreen_desktop(screen)
+    n = OBScreen_numDesktops(screen)
+    if (d < (n-1)):
+        d = d + 1
+    elif not no_wrap:
+        d = 0
+    send_to_desktop(data, d)
+    if follow:
+        change_desktop(data, d)
+    
+def send_to_prev_desktop(data, no_wrap=0, follow=1):
+    """Sends a window to the previous desktop, optionally (by default) cycling
+       around to the last when going past the first. Also optionally moving to
+       the new desktop after sending the window."""
+    client = Openbox_findClient(openbox, data.window())
+    if not client: return
+    screen = Openbox_screen(openbox, data.screen())
+    d = OBScreen_desktop(screen)
+    n = OBScreen_numDesktops(screen)
+    if (d > 0):
+        d = d - 1
+    elif not no_wrap:
+        d = n - 1
+    send_to_desktop(data, d)
+    if follow:
+        change_desktop(data, d)
     
 #########################################
 ### Convenience functions for scripts ###
 #########################################
 
 def execute(bin, screen = 0):
+    """Executes a command on the specified screen. It is recommended that you
+       use this call instead of a python system call. If the specified screen
+       is beyond your range of screens, the default is used instead."""
     Openbox_execute(openbox, screen, bin)
 
 print "Loaded builtins.py"