]> Dogcows Code - chaz/openbox/blobdiff - openbox/focus.c
change how rc parsing will work. a=b will be parsed in any [section] and given to...
[chaz/openbox] / openbox / focus.c
index 5c5130f6958a3f1d584ae2f4c3db85f0fe435aed..b676c1279956e42ac87b3d015d82c19fec74f8b6 100644 (file)
@@ -1,5 +1,4 @@
 #include "event.h"
-#include "config.h"
 #include "openbox.h"
 #include "client.h"
 #include "frame.h"
@@ -16,6 +15,8 @@ GList **focus_order = NULL; /* these lists are created when screen_startup
                                sets the number of desktops */
 
 Window focus_backup = None;
+gboolean focus_new = TRUE;
+gboolean focus_follow = TRUE;
 
 void focus_startup()
 {
@@ -25,6 +26,8 @@ void focus_startup()
     XSetWindowAttributes attrib;
 
     focus_client = NULL;
+    focus_new = TRUE;
+    focus_follow = TRUE;
 
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
@@ -113,36 +116,31 @@ static gboolean focus_under_pointer()
 
 void focus_fallback(gboolean switching_desks)
 {
-    ConfigValue focus_follow;
     GList *it;
     gboolean under = FALSE;
     Client *old = NULL;
 
+    old = focus_client;
+
+    /* unfocus any focused clients.. they can be focused by Pointer events
+       and such, and then when I try focus them, I won't get a FocusIn event
+       at all for them.
+    */
+    focus_set_client(NULL);
+
     if (switching_desks) {
         /* don't skip any windows when switching desktops */
-        old = focus_client;
-        focus_client = NULL;
+        old = NULL;
     } else {
-        if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
-            g_assert_not_reached();
-        if (focus_follow.bool)
+        if (focus_follow)
             under = focus_under_pointer();
     }
 
     if (!under) {
-        for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
-            g_message("fallback trying 0x%lx", ((Client*)it->data)->window);
-            if (it->data != focus_client && client_normal(it->data)) {
-                /* if we're switching desktops, and we get the already focused
-                   window, then we wont get a FocusIn for it, so just restore
-                   the focus_client so that we know it is focused */
-                if (it->data == old) {
-                    focus_client = old;
-                    break;
-                } else if (client_focus(it->data))
+        for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+            if (it->data != old && client_normal(it->data))
+                if (client_focus(it->data))
                     break;
-            }
-        }
         if (it == NULL) /* nothing to focus */
             focus_set_client(NULL);
     }
This page took 0.021719 seconds and 4 git commands to generate.