X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=4c7a1a4336c1b37be3b88e81db614f76d2602c70;hb=82064af2d7076045980c694241cf0326aea7e7e2;hp=9ea09bff66f6787ae91b06c24655bf472af4e06d;hpb=b35575574be53a1b3be42d7037d2f432a19a3890;p=dwm.git diff --git a/main.c b/main.c index 9ea09bf..4c7a1a4 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; } @@ -178,15 +179,14 @@ main(int argc, char *argv[]) dpy = XOpenDisplay(0); if(!dpy) - eprint("dwm: cannot connect X server\n"); + eprint("dwm: cannot open display\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); - /* check if another WM is already running */ otherwm = False; XSetErrorHandler(xerrorstart); - /* this causes an error if some other WM is running */ + /* this causes an error if some other window manager is running */ XSelectInput(dpy, root, SubstructureRedirectMask); XSync(dpy, False); @@ -210,6 +210,7 @@ main(int argc, char *argv[]) cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); grabkeys(); + initrregs(); for(ntags = 0; tags[ntags]; ntags++);