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

diff --git a/scripts/builtins.py b/scripts/builtins.py
index 54277732..45f73d56 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