X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=e180c7b5f022207d74b45f16c8b2473edf757424;hb=ee0591bf39b252760370cf238961cf9ef5dc7cde;hp=231d5ab5a41e56ce232df0519e7834950f532a7f;hpb=a4a8d09f4b9431d6d831cb7aa220e6c952802c95;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 231d5ab5..e180c7b5 100644
--- a/scripts/builtins.py
+++ b/scripts/builtins.py
@@ -11,6 +11,10 @@ def focus(data):
     """Focuses the window on which the event occured"""
     client = Openbox_findClient(openbox, data.window())
     if not client: return
+    type = OBClient_type(client)
+    # !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):
@@ -19,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)
@@ -29,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
@@ -58,5 +68,80 @@ def resize(data):
                     data.press_clientwidth() + dx,
                     data.press_clientheight() + dy);
 
+def restart(data):
+    """Restarts openbox"""
+    Openbox_restart(openbox, "")
+
+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, 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 ###
+#########################################
+
 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"