Mercurial > dwm-meillo

comparison draw.c @ 748:61821891835c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
statusbar: removed squares, removed modesymbols, normcolor for client title
author meillo@marmaro.de
date Sun, 11 Feb 2007 12:20:54 +0100
parents 295c8ca7a27a
children 6692d7e7e156
comparison
equal deleted inserted replaced
747:f0e6c8860014 748:61821891835c
70 else { 70 else {
71 gcv.font = dc.font.xfont->fid; 71 gcv.font = dc.font.xfont->fid;
72 XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); 72 XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
73 XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); 73 XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
74 } 74 }
75 x = (h + 2) / 4;
76 r.x = dc.x + 1;
77 r.y = dc.y + 1;
78 if(filledsquare) {
79 r.width = r.height = x + 1;
80 XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
81 }
82 else if(emptysquare) {
83 r.width = r.height = x;
84 XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
85 }
86 } 75 }
87 76
88 /* extern */ 77 /* extern */
89 78
90 void 79 void
96 dc.w = textw(tags[i]); 85 dc.w = textw(tags[i]);
97 if(seltag[i]) 86 if(seltag[i])
98 drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i)); 87 drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));
99 else 88 else
100 drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i)); 89 drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));
101 dc.x += dc.w; 90 dc.x += dc.w + 1;
102 } 91 }
103 dc.w = bmw; 92 dc.w = bmw;
104 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False); 93 drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
105 x = dc.x + dc.w; 94 x = dc.x + dc.w;
106 dc.w = textw(stext); 95 dc.w = textw(stext);
110 dc.w = sw - x; 99 dc.w = sw - x;
111 } 100 }
112 drawtext(stext, dc.norm, False, False); 101 drawtext(stext, dc.norm, False, False);
113 if((dc.w = dc.x - x) > bh) { 102 if((dc.w = dc.x - x) > bh) {
114 dc.x = x; 103 dc.x = x;
115 drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); 104 drawtext(sel ? sel->name : NULL, dc.norm, False, False);
116 } 105 }
117 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); 106 XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
118 XSync(dpy, False); 107 XSync(dpy, False);
119 } 108 }
120 109