X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55..0045ad87dfb32f35fc17b5b8942049cfe84d623c:/draw.c diff --git a/draw.c b/draw.c index c4448db..19604f3 100644 --- a/draw.c +++ b/draw.c @@ -102,7 +102,7 @@ drawall(void) { Client *c; for(c = clients; c; c = getnext(c->next)) - drawtitle(c); + drawclient(c); drawstatus(); } @@ -120,7 +120,7 @@ drawstatus(void) { dc.x += dc.w; } dc.w = bmw; - drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); + drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); x = dc.x + dc.w; dc.w = textw(stext); dc.x = bw - dc.w; @@ -128,7 +128,7 @@ drawstatus(void) { dc.x = x; dc.w = bw - x; } - drawtext(stext, dc.status, False, False); + drawtext(stext, dc.norm, False, False); if((dc.w = dc.x - x) > bh) { dc.x = x; drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); @@ -138,19 +138,13 @@ drawstatus(void) { } void -drawtitle(Client *c) { +drawclient(Client *c) { if(c == sel && issel) { drawstatus(); - XUnmapWindow(dpy, c->twin); - XSetWindowBorder(dpy, c->win, dc.sel[ColBG]); + XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); return; } - XSetWindowBorder(dpy, c->win, dc.norm[ColBG]); - XMapWindow(dpy, c->twin); - dc.x = dc.y = 0; - dc.w = c->tw; - drawtext(c->name, dc.norm, False,False); - XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0); + XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); XSync(dpy, False); }