X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/c8e57332d1a5167d213af0fc9438ff2b56c74fbb..71b84c21149adb7adff6140a1f471c4a294edd4b:/draw.c
diff --git a/draw.c b/draw.c
index bbcfadb..178770b 100644
--- a/draw.c
+++ b/draw.c
@@ -1,14 +1,22 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
#include <stdio.h>
#include <string.h>
-#include <X11/Xlocale.h>
/* static */
+static Bool
+isoccupied(unsigned int t)
+{
+ Client *c;
+ for(c = clients; c; c = c->next)
+ if(c->tags[t])
+ return True;
+ return False;
+}
+
static unsigned int
textnw(const char *text, unsigned int len) {
XRectangle r;
@@ -21,30 +29,27 @@ textnw(const char *text, unsigned int len) {
}
static void
-drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
+drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) {
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ XPoint pt[5];
XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
if(!text)
return;
-
w = 0;
olen = len = strlen(text);
- if(len >= sizeof(buf))
- len = sizeof(buf) - 1;
+ if(len >= sizeof buf)
+ len = sizeof buf - 1;
memcpy(buf, text, len);
buf[len] = 0;
-
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
-
/* shorten text if necessary */
while(len && (w = textnw(buf, len)) > dc.w - h)
buf[--len] = 0;
@@ -56,7 +61,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
if(len > 3)
buf[len - 3] = '.';
}
-
if(w > dc.w)
return; /* too long */
gcv.foreground = col[ColFG];
@@ -69,80 +73,58 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
- if(highlight) {
- r.x = dc.x + 2;
- r.y = dc.y + 2;
- r.width = r.height = (h + 2) / 4;
+ x = (h + 2) / 4;
+ if(filledsquare) {
+ r.x = dc.x + 1;
+ r.y = dc.y + 1;
+ r.width = r.height = x + 1;
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
}
+ else if(emptysquare) {
+ pt[0].x = dc.x + 1;
+ pt[0].y = dc.y + 1;
+ pt[1].x = x;
+ pt[1].y = 0;
+ pt[2].x = 0;
+ pt[2].y = x;
+ pt[3].x = -x;
+ pt[3].y = 0;
+ pt[4].x = 0;
+ pt[4].y = -x;
+ XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
+ }
}
/* extern */
-void
-drawall(void) {
- Client *c;
-
- for(c = clients; c; c = getnext(c->next))
- drawtitle(c);
- drawstatus();
-}
-
void
drawstatus(void) {
int i, x;
dc.x = dc.y = 0;
-
for(i = 0; i < ntags; i++) {
dc.w = textw(tags[i]);
if(seltag[i])
- drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+ drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));
else
- drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+ drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));
dc.x += dc.w;
}
-
dc.w = bmw;
- drawtext(arrange == dofloat ?
- FLOATSYMBOL : stackpos == StackBottom ?
- BSTACKSYMBOL : VSTACKSYMBOL, dc.status, False);
-
+ drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
x = dc.x + dc.w;
dc.w = textw(stext);
- dc.x = bx + bw - dc.w;
+ dc.x = sw - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = bw - x;
+ dc.w = sw - x;
}
- drawtext(stext, dc.status, False);
-
+ drawtext(stext, dc.norm, False, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(sel)
- drawtext(sel->name, dc.sel, False);
- else
- drawtext(NULL, dc.norm, False);
- }
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
- XSync(dpy, False);
-}
-
-void
-drawtitle(Client *c) {
- if(c == sel && issel) {
- drawstatus();
- XUnmapWindow(dpy, c->twin);
- XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
- return;
+ drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
}
-
- 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);
- XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
XSync(dpy, False);
}
@@ -158,11 +140,10 @@ getcolor(const char *colstr) {
void
setfont(const char *fontstr) {
- char **missing, *def;
+ char *def, **missing;
int i, n;
missing = NULL;
- setlocale(LC_ALL, "");
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
@@ -170,16 +151,11 @@ setfont(const char *fontstr) {
while(n--)
fprintf(stderr, "missing fontset: %s\n", missing[n]);
XFreeStringList(missing);
- if(dc.font.set) {
- XFreeFontSet(dpy, dc.font.set);
- dc.font.set = NULL;
- }
}
if(dc.font.set) {
XFontSetExtents *font_extents;
XFontStruct **xfonts;
char **font_names;
-
dc.font.ascent = dc.font.descent = 0;
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
@@ -195,11 +171,8 @@ setfont(const char *fontstr) {
if(dc.font.xfont)
XFreeFont(dpy, dc.font.xfont);
dc.font.xfont = NULL;
- dc.font.xfont = XLoadQueryFont(dpy, fontstr);
- if (!dc.font.xfont)
- dc.font.xfont = XLoadQueryFont(dpy, "fixed");
- if (!dc.font.xfont)
- eprint("error, cannot init 'fixed' font\n");
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+ eprint("error, cannot load font: '%s'\n", fontstr);
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
}