X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=4ff85c5d4ae74cb2afea62196b1faedfd4518602;hb=d1913d1d015efae0687f3703ca846f1ace42ded2;hp=58e9bcca2b970fa5435c3aa73517cc5231618a34;hpb=8428becfde4040d1043f6f1a84bfd99f45813e9c;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 58e9bcca..4ff85c5d 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,8 +1,12 @@
+#include "event.h"
 #include "openbox.h"
 #include "client.h"
+#include "frame.h"
 #include "screen.h"
 #include "prop.h"
 #include "dispatch.h"
+#include "focus.h"
+#include "parse.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -12,8 +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;
 
-void focus_set_client(Client *client);
+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()
 {
@@ -22,14 +46,21 @@ void focus_startup()
        mapped. */
     XSetWindowAttributes attrib;
 
+    focus_client = NULL;
+    focus_new = TRUE;
+    focus_follow = TRUE;
+
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
-				 -100, -100, 1, 1, 0, 0, InputOnly,
-				 CopyFromParent, CWOverrideRedirect, &attrib);
+				 -100, -100, 1, 1, 0,
+                                 CopyFromParent, InputOutput, CopyFromParent,
+                                 CWOverrideRedirect, &attrib);
     XMapRaised(ob_display, focus_backup);
 
     /* start with nothing focused */
     focus_set_client(NULL);
+
+    parse_reg_section("focus", NULL, parse_assign);
 }
 
 void focus_shutdown()
@@ -39,9 +70,13 @@ void focus_shutdown()
     for (i = 0; i < screen_num_desktops; ++i)
         g_list_free(focus_order[i]);
     g_free(focus_order);
+    focus_order = NULL;
+
+    XDestroyWindow(ob_display, focus_backup);
 
     /* reset focus to root */
-    XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
+    XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
+                   event_lasttime);
 }
 
 void focus_set_client(Client *client)
@@ -54,17 +89,21 @@ void focus_set_client(Client *client)
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
 
-
     if (client == NULL) {
 	/* when nothing will be focused, send focus to the backup target */
-	XSetInputFocus(ob_display, focus_backup, RevertToNone, CurrentTime);
+	XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot,
+                       event_lasttime);
+        XSync(ob_display, FALSE);
     }
 
     old = focus_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);
@@ -80,3 +119,55 @@ void focus_set_client(Client *client)
     if (old != NULL)
         dispatch_client(Event_Client_Unfocus, old, 0, 0);
 }
+
+static gboolean focus_under_pointer()
+{
+    Window w;
+    int i, x, y;
+    guint u;
+    GList *it;
+
+    if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u)) {
+        for (it = stacking_list; it != NULL; it = it->next) {
+            Client *c = it->data;
+            if (c->desktop == screen_desktop &&
+                RECT_CONTAINS(c->frame->area, x, y))
+                break;
+        }
+        if (it != NULL)
+            return client_normal(it->data) && client_focus(it->data);
+    }
+    return FALSE;
+}
+
+void focus_fallback(gboolean switching_desks)
+{
+    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 = NULL;
+    } else {
+        if (focus_follow)
+            under = focus_under_pointer();
+    }
+
+    if (!under) {
+        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);
+    }
+}