X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fbuiltins.py;h=3571e0178114a09b6c10e82bacbc4dce0f35a1e1;hb=cc39863363f6c424a1d5f3790ef182b52b69a53e;hp=5427773211731bc27566b3689e6bf29f950ab5b9;hpb=abd445719b29a78e2ce8f848afd50d9dcde40df4;p=chaz%2Fopenbox

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 54277732..3571e017 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,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)
@@ -35,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
@@ -65,35 +69,43 @@ 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 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())
     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)
@@ -103,6 +115,9 @@ def unshade(data):
 #########################################
 
 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"