X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=45f73d56060a52c9c6413ab92bbf11c013f31fa0;hb=97019b8b77f7e6450d87b057bcb6eae43e9f3e2b;hp=8c0421173cd01a615bcacc642585b6540ed2f389;hpb=89e6d5c0e64513d06ac4368981239de969a6fc9d;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 8c042117..45f73d56 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,8 +68,8 @@ def resize(data):
                     data.press_clientwidth() + dx,
                     data.press_clientheight() + dy);
 
-def execute(bin, screen = 0):
-    Openbox_execute(openbox, screen, bin)
+def restart(data):
+    Openbox_restart(openbox, "")
 
 def toggle_shade(data):
     print "toggle_shade"
@@ -68,10 +78,35 @@ def raise_win(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     screen = Openbox_screen(openbox, OBClient_screen(client))
-    OBScreen_raise(screen, client)
+    OBScreen_restack(screen, 1, client)
 
 def lower_win(data):
     client = Openbox_findClient(openbox, data.window())
     if not client: return
     screen = Openbox_screen(openbox, OBClient_screen(client))
-    OBScreen_lower(screen, client)
+    OBScreen_restack(screen, 0, client)
+
+def toggle_shade(data):
+    client = Openbox_findClient(openbox, data.window())
+    if not client: return
+    print "toggle_shade"
+    OBClient_shade(client, not OBClient_shaded(client))
+
+def shade(data):
+    client = Openbox_findClient(openbox, data.window())
+    if not client: return
+    OBClient_shade(client, 1)
+
+def unshade(data):
+    client = Openbox_findClient(openbox, data.window())
+    if not client: return
+    OBClient_shade(client, 0)
+    
+#########################################
+### Convenience functions for scripts ###
+#########################################
+
+def execute(bin, screen = 0):
+    Openbox_execute(openbox, screen, bin)
+
+print "Loaded builtins.py"