X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=5d31054e556771d39e7d0be238e0b7807900b184;hb=711a7d8c5623814c374ed6f56476bc616cb9391f;hp=eaeaca22b4dcb3afdf9298d2cde580457da0ef55;hpb=5f34069a3c6e9c0ecdf38c9f885438aaa2d8d12c;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index eaeaca22..5d31054e 100644
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -12,12 +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:
-        print "enter window"
-        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):
@@ -26,6 +23,9 @@ def move(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
 
+    # !normal windows dont get moved
+    if not OBClient_normal(client): return
+
     dx = data.xroot() - data.pressx()
     dy = data.yroot() - data.pressy()
     OBClient_move(client, data.press_clientx() + dx, data.press_clienty() + dy)
@@ -36,6 +36,9 @@ def resize(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
 
+    # !normal windows dont get moved
+    if not OBClient_normal(client): return
+
     px = data.pressx()
     py = data.pressy()
     dx = data.xroot() - px
@@ -66,44 +69,70 @@ 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 next_desktop(data):
+    screen = Openbox_screen(openbox, data.screen())
+    d = OBScreen_desktop(screen)
+    n = OBScreen_numDesktops(screen)
+    if (d == (n-1)):
+        d = 0
+    else:
+        d = d + 1
+    OBScreen_changeDesktop(screen, d)
+    
+def prev_desktop(data):
+    screen = Openbox_screen(openbox, data.screen())
+    d = OBScreen_desktop(screen)
+    n = OBScreen_numDesktops(screen)
+    if (d > 0):
+        d = d - 1
+    else:
+        d = n - 1
+    OBScreen_changeDesktop(screen, 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"