X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=534402c02c5f105529ec0e375a9dd45d704caab8;hb=4b0328f2097dedd70bbb36ea2b5159ac55b7cbcb;hp=b1372d0c846b6a11fee8d400564898d2fe452cf0;hpb=86d12249dd3b63c9312f3a938b20985abc2a3364;p=dwm.git diff --git a/main.c b/main.c index b1372d0..534402c 100644 --- 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; } @@ -216,7 +217,6 @@ main(int argc, char *argv[]) /* style */ dc.bg = getcolor(BGCOLOR); dc.fg = getcolor(FGCOLOR); - dc.border = getcolor(BORDERCOLOR); setfont(FONT); sx = sy = 0; @@ -239,6 +239,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 +249,9 @@ 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 */ while(running) { FD_ZERO(&rd); if(readin)