comment the new desktop functions

[chaz/openbox] / scripts / builtins.py

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 3571e0178114a09b6c10e82bacbc4dce0f35a1e1..e180c7b5f022207d74b45f16c8b2473edf757424 100644 (file)
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -86,11 +86,6 @@ def lower_win(data):
     screen = Openbox_screen(openbox, OBClient_screen(client))
     OBScreen_restack(screen, 0, client)
 
-def focusraise(data):
-    """Focuses and raises the window on which the event occured"""
-    focus(data)
-    raise_win(data)
-
 def toggle_shade(data):
     """Toggles the shade status of the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
@@ -109,6 +104,35 @@ def unshade(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     OBClient_shade(client, 0)
+
+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
+    OBScreen_changeDesktop(screen, 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
+    OBScreen_changeDesktop(screen, d)
+
+def change_desktop(data, num):
+    """Switches to a specified desktop"""
+    screen = Openbox_screen(openbox, data.screen())
+    OBScreen_changeDesktop(screen, num)
     
 #########################################
 ### Convenience functions for scripts ###