X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=9b6eead26fc8a2d95a20c7209ddc7b8f0b666d7b;hb=3443454f33f88e10f187b78594ecfb5c09e1448d;hp=58e9bcca2b970fa5435c3aa73517cc5231618a34;hpb=8428becfde4040d1043f6f1a84bfd99f45813e9c;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 58e9bcca..9b6eead2 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,8 +1,10 @@
+#include "event.h"
 #include "openbox.h"
 #include "client.h"
 #include "screen.h"
 #include "prop.h"
 #include "dispatch.h"
+#include "focus.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -13,8 +15,6 @@ GList **focus_order = NULL; /* these lists are created when screen_startup
 
 Window focus_backup = None;
 
-void focus_set_client(Client *client);
-
 void focus_startup()
 {
     /* create the window which gets focus when no clients get it. Have to
@@ -22,6 +22,8 @@ void focus_startup()
        mapped. */
     XSetWindowAttributes attrib;
 
+    focus_client = NULL;
+
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
 				 -100, -100, 1, 1, 0, 0, InputOnly,
@@ -39,6 +41,9 @@ 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);
@@ -57,7 +62,7 @@ void focus_set_client(Client *client)
 
     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, RevertToNone, event_lasttime);
     }
 
     old = focus_client;