X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=7cc5ecf488d44ce710b1e8bbce38af490217bc9f;hb=78d1a22d4e847d0e596af59d7707da1bbfe9583a;hp=6d84a77a4d4335f56ab5c438bf0a2d2b81c2e491;hpb=10d13f01ff764ba0e875adf5d2b83c49aa08d148;p=dwm.git diff --git a/main.c b/main.c index 6d84a77..7cc5ecf 100644 --- a/main.c +++ b/main.c @@ -20,8 +20,8 @@ int screen, sx, sy, sw, sh, wax, way, waw, wah; unsigned int bh, ntags; unsigned int bpos = BARPOS; unsigned int numlockmask = 0; -Atom dwmconfig, wmatom[WMLast], netatom[NetLast]; -Bool *seltag; +Atom dwmprops, wmatom[WMLast], netatom[NetLast]; +Bool *seltags; Bool selscreen = True; Client *clients = NULL; Client *sel = NULL; @@ -57,7 +57,7 @@ cleanup(void) { XFreeCursor(dpy, cursor[CurMove]); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); XSync(dpy, False); - free(seltag); + free(seltags); } static unsigned long @@ -140,7 +140,7 @@ setup(void) { XSetWindowAttributes wa; /* init atoms */ - dwmconfig = XInternAtom(dpy, "_DWM_CONFIG", False); + dwmprops = XInternAtom(dpy, "_DWM_PROPERTIES", False); wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); @@ -170,8 +170,8 @@ setup(void) { grabkeys(); compileregs(); for(ntags = 0; tags[ntags]; ntags++); - seltag = emallocz(sizeof(Bool) * ntags); - seltag[0] = True; + seltags = emallocz(sizeof(Bool) * ntags); + seltags[0] = True; /* style */ dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR); dc.norm[ColBG] = initcolor(NORMBGCOLOR); @@ -205,6 +205,7 @@ setup(void) { XSetFont(dpy, dc.gc, dc.font.xfont->fid); /* multihead support */ selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); + loaddwmprops(); } /*