X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=4ff85c5d4ae74cb2afea62196b1faedfd4518602;hb=ee2368044dd077207962f71194158265c74fe74e;hp=98f81800f4de7092372542d836ed8fa96b07d49a;hpb=ad4062833dc36c50bdd601fd8016a0feb743c2a5;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 98f81800..4ff85c5d 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,5 +1,4 @@
 #include "event.h"
-#include "config.h"
 #include "openbox.h"
 #include "client.h"
 #include "frame.h"
@@ -7,6 +6,7 @@
 #include "prop.h"
 #include "dispatch.h"
 #include "focus.h"
+#include "parse.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -16,6 +16,28 @@ 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;
+int focus_ignore_in = 0;
+
+static void parse_assign(char *name, ParseToken *value)
+{
+    if (!g_ascii_strcasecmp(name, "focusnew")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            focus_new = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "followmouse")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            focus_follow = value->data.bool;
+        }
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
+}
 
 void focus_startup()
 {
@@ -25,6 +47,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,
@@ -35,6 +59,8 @@ void focus_startup()
 
     /* start with nothing focused */
     focus_set_client(NULL);
+
+    parse_reg_section("focus", NULL, parse_assign);
 }
 
 void focus_shutdown()
@@ -74,7 +100,10 @@ void focus_set_client(Client *client)
     focus_client = client;
 
     /* move to the top of the list */
-    if (client != NULL) {
+    if (focus_ignore_in) {
+        g_assert(focus_ignore_in > 0);
+        --focus_ignore_in;
+    } else if (client != NULL) {
         desktop = client->desktop;
         if (desktop == DESKTOP_ALL) desktop = screen_desktop;
         focus_order[desktop] = g_list_remove(focus_order[desktop], client);
@@ -113,23 +142,29 @@ 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 */
-        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)
-            if (it->data != focus_client && client_normal(it->data))
+            if (it->data != old && client_normal(it->data))
                 if (client_focus(it->data))
                     break;
         if (it == NULL) /* nothing to focus */