X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=906505cc6e1a0c341a7c1b7d5a01a068ead9eb5d;hb=292ccc4c43d9529cb6db0973fcab6e24c73607a5;hp=b1372d0c846b6a11fee8d400564898d2fe452cf0;hpb=86d12249dd3b63c9312f3a938b20985abc2a3364;p=dwm.git diff --git a/main.c b/main.c index b1372d0..906505c 100644 --- a/main.c +++ b/main.c @@ -83,7 +83,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee) /* extern */ char stext[1024]; -int tsel = DEFTAG; +Bool *seltag; int screen, sx, sy, sw, sh, bx, by, bw, bh, mw; unsigned int ntags; Atom wmatom[WMLast], netatom[NetLast]; @@ -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; } @@ -212,6 +213,8 @@ main(int argc, char *argv[]) initrregs(); for(ntags = 0; tags[ntags]; ntags++); + seltag = emallocz(sizeof(Bool) * ntags); + seltag[DEFTAG] = True; /* style */ dc.bg = getcolor(BGCOLOR); @@ -239,6 +242,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 +252,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)