reverting last patch, that sucks, I don't care about retarded apps like gvim

[dwm.git] / main.c

diff --git a/main.c b/main.c
index b1372d0..52c0347 100644 (file)
--- a/main.c
+++ b/main.c
@@ -102,9 +102,10 @@ getproto(Window w)
        int protos = 0;
        int i;
        long res;
-       unsigned char *protocols;
+       Atom *protocols;
 
-       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
+       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+                       ((unsigned char **)&protocols));
        if(res <= 0) {
                return protos;
        }
@@ -239,6 +240,8 @@ main(int argc, char *argv[])
 
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
+
+       strcpy(stext, "dwm-"VERSION);
        drawstatus();
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
@@ -247,10 +250,10 @@ main(int argc, char *argv[])
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
-       strcpy(stext, "dwm-"VERSION);
        scan();
 
-       /* main event loop, reads status text from stdin as well */
+       /* main event loop, also reads status text from stdin */
+       XSync(dpy, False);
        while(running) {
                FD_ZERO(&rd);
                if(readin)