From 86e2c481f56ad0ea549838666d9fda03519fe1ef Mon Sep 17 00:00:00 2001
From: okan
Date: Fri, 16 Sep 2016 14:32:02 +0000
Subject: During init, query screen for _NET_ACTIVE_WINDOW and set that client
 as active; while we already look at what's under the pointer, use this
 information first, then look under the pointer (saving that round-trip). This
 restores the active state to a client after restart even if the pointer is
 not above it (and of course the pointer is not above another client).

---
 screen.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'screen.c')

diff --git a/screen.c b/screen.c
index e1f5fe8..9f3eb47 100644
--- a/screen.c
+++ b/screen.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: screen.c,v 1.79 2015/11/11 14:22:01 okan Exp $
+ * $OpenBSD: screen.c,v 1.80 2016/09/16 14:32:02 okan Exp $
  */
 
 #include <sys/types.h>
@@ -35,7 +35,7 @@ void
 screen_init(int which)
 {
 	struct screen_ctx	*sc;
-	Window			*wins, w0, w1;
+	Window			*wins, w0, w1, active = None;
 	XSetWindowAttributes	 rootattr;
 	unsigned int		 nwins, i;
 
@@ -65,6 +65,7 @@ screen_init(int which)
 	xu_ewmh_net_wm_number_of_desktops(sc);
 	xu_ewmh_net_showing_desktop(sc);
 	xu_ewmh_net_virtual_roots(sc);
+	active = xu_ewmh_get_net_active_window(sc);
 
 	rootattr.cursor = Conf.cursor[CF_NORMAL];
 	rootattr.event_mask = SubstructureRedirectMask |
@@ -77,7 +78,7 @@ screen_init(int which)
 	/* Deal with existing clients. */
 	if (XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins)) {
 		for (i = 0; i < nwins; i++)
-			(void)client_init(wins[i], sc);
+			(void)client_init(wins[i], sc, (active == wins[i]));
 
 		XFree(wins);
 	}
-- 
cgit v1.2.3-2-gb3c3