raise barwin in restack, that's the most elegant solution I think

layout.c

@@ -189,6 +189,7 @@ restack(void) {
 			XLowerWindow(dpy, c->win);
 		}
 	}
+	XRaiseWindow(dpy, barwin);
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }