not using CurrentTime anywhere

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index d09494bfdb66e3fa348743d7de55caf0d1b1df73..d9ed80bcbbfdbcb267fc344b0959658aff63f100 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,38 +1,35 @@
+#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>
 
 Client *focus_client = NULL;
-GList **focus_order = NULL;
+GList **focus_order = NULL; /* these lists are created when screen_startup
+                               sets the number of desktops */
 
 Window focus_backup = None;
 
-void focus_set_client(Client *client);
-
 void focus_startup()
 {
-    guint i;
-
     /* create the window which gets focus when no clients get it. Have to
        make it override-redirect so we don't try manage it, since it is
        mapped. */
     XSetWindowAttributes attrib;
 
+    focus_client = NULL;
+
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
                                 -100, -100, 1, 1, 0, 0, InputOnly,
                                 CopyFromParent, CWOverrideRedirect, &attrib);
     XMapRaised(ob_display, focus_backup);
 
-    focus_order = g_new(GList*, screen_num_desktops);
-    for (i = 0; i < screen_num_desktops; ++i)
-        focus_order[i] = NULL;
-
     /* start with nothing focused */
     focus_set_client(NULL);
 }
@@ -44,9 +41,12 @@ 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, RevertToNone, event_lasttime);
 }
 
 void focus_set_client(Client *client)
@@ -62,7 +62,8 @@ 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_unfocustime);
     }
 
     old = focus_client;