revert my commit of d3th, it fucked up focus badly

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 0d9ecf54947849eb7c5efa964c270f1402013c20..a79049106a85ceb0efc1d6282cab7bdc2f1d4811 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -162,11 +162,8 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!(type == OB_FOCUS_FALLBACK_DESKTOP ?
-          config_focus_last_on_desktop : config_focus_last)) {
-        if (config_focus_follow) focus_under_pointer();
+    if (config_focus_follow && focus_under_pointer())
         return;
-    }
 
     if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         /* try for transient relations */