make this focus shit not buggy again..

diff --git a/scripts/focus.py b/scripts/focus.py
index e766f1344f7ace90ebab8b4c43533d09b389e64b..4ac22183aa03ebee0f59e25e3f728dad214b16ea 100644 (file)
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -102,7 +102,7 @@ def _focused(data):
         else: # if we are cycling, then update our pointer
             _cyc_w = data.client.window()
             _hilite_popup_list(data)
-    elif fallback: 
+    elif fallback:
         # pass around focus
         desktop = ob.openbox.screen(_cyc_screen).desktop()
         for w in _clients:
@@ -158,7 +158,7 @@ def _focus_stacked_ungrab(data):
             client = ob.openbox.findClient(_cyc_w)
             if client:
                 data.client = client
-                _focused(data) # resort the list as appropriate
+                #_focused(data) # resort the list as appropriate
                 if cycle_raise:
                     ob.openbox.screen(data.screen).raiseWindow(client)
 

diff --git a/src/openbox.cc b/src/openbox.cc
index 50146e270dad245e0a025535aab917cba032c75c..29f9ea9424612556460a4b6843665bc2f77d7b6b 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -360,7 +360,11 @@ Client *Openbox::findClient(Window window)
 
 void Openbox::setFocusedClient(Client *c)
 {
-  if (c == _focused_client) return;
+  // sometimes this is called with the already-focused window, this is
+  // important for the python scripts to work (eg, c = 0 twice, or for the
+  // cycling list, it relies on this behavior. don't just return if its already
+  // set as focused
+  
   assert(_focused_screen);
 
   // uninstall the old colormap