Browse Source

import new drw from libsl and minor fixes.

- better scaling for occupied tag squares.
- draw statusline first to omitt some complicated calculations.
Markus Teich 6 years ago
parent
commit
7af4d439bd
5 changed files with 209 additions and 208 deletions
  1. 13
    11
      config.def.h
  2. 132
    109
      drw.c
  3. 23
    40
      drw.h
  4. 39
    46
      dwm.c
  5. 2
    2
      util.h

+ 13
- 11
config.def.h View File

@@ -1,20 +1,22 @@
1 1
 /* See LICENSE file for copyright and license details. */
2 2
 
3 3
 /* appearance */
4
-static const char *fonts[] = {
5
-	"monospace:size=10"
6
-};
7
-static const char dmenufont[]       = "monospace:size=10";
8
-static const char normbordercolor[] = "#444444";
9
-static const char normbgcolor[]     = "#222222";
10
-static const char normfgcolor[]     = "#bbbbbb";
11
-static const char selbordercolor[]  = "#005577";
12
-static const char selbgcolor[]      = "#005577";
13
-static const char selfgcolor[]      = "#eeeeee";
14 4
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
15 5
 static const unsigned int snap      = 32;       /* snap pixel */
16 6
 static const int showbar            = 1;        /* 0 means no bar */
17 7
 static const int topbar             = 1;        /* 0 means bottom bar */
8
+static const char *fonts[]          = { "monospace:size=10" };
9
+static const char dmenufont[]       = "monospace:size=10";
10
+static const char col_gray1[]       = "#222222";
11
+static const char col_gray2[]       = "#444444";
12
+static const char col_gray3[]       = "#bbbbbb";
13
+static const char col_gray4[]       = "#eeeeee";
14
+static const char col_cyan[]        = "#005577";
15
+static const char *colors[][3]      = {
16
+	/* fg        bg         border   */
17
+	{ col_gray3, col_gray1, col_gray2}, /* normal */
18
+	{ col_gray4, col_cyan,  col_cyan }, /* selected */
19
+};
18 20
 
19 21
 /* tagging */
20 22
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
@@ -54,7 +56,7 @@ static const Layout layouts[] = {
54 56
 
55 57
 /* commands */
56 58
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
57
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
59
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
58 60
 static const char *termcmd[]  = { "st", NULL };
59 61
 
60 62
 static Key keys[] = {

+ 132
- 109
drw.c View File

@@ -63,9 +63,8 @@ utf8decode(const char *c, long *u, size_t clen)
63 63
 Drw *
64 64
 drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
65 65
 {
66
-	Drw *drw;
66
+	Drw *drw = ecalloc(1, sizeof(Drw));
67 67
 
68
-	drw = ecalloc(1, sizeof(Drw));
69 68
 	drw->dpy = dpy;
70 69
 	drw->screen = screen;
71 70
 	drw->root = root;
@@ -73,7 +72,6 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
73 72
 	drw->h = h;
74 73
 	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
75 74
 	drw->gc = XCreateGC(dpy, root, 0, NULL);
76
-	drw->fontcount = 0;
77 75
 	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
78 76
 
79 77
 	return drw;
@@ -82,6 +80,9 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
82 80
 void
83 81
 drw_resize(Drw *drw, unsigned int w, unsigned int h)
84 82
 {
83
+	if (!drw)
84
+		return;
85
+
85 86
 	drw->w = w;
86 87
 	drw->h = h;
87 88
 	if (drw->drawable)
@@ -92,44 +93,39 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
92 93
 void
93 94
 drw_free(Drw *drw)
94 95
 {
95
-	size_t i;
96
-
97
-	for (i = 0; i < drw->fontcount; i++)
98
-		drw_font_free(drw->fonts[i]);
99 96
 	XFreePixmap(drw->dpy, drw->drawable);
100 97
 	XFreeGC(drw->dpy, drw->gc);
101 98
 	free(drw);
102 99
 }
103 100
 
104 101
 /* This function is an implementation detail. Library users should use
105
- * drw_font_create instead.
102
+ * drw_fontset_create instead.
106 103
  */
107 104
 static Fnt *
108
-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
105
+xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
109 106
 {
110 107
 	Fnt *font;
111 108
 	XftFont *xfont = NULL;
112 109
 	FcPattern *pattern = NULL;
113 110
 
114 111
 	if (fontname) {
115
-		/* Using the pattern found at font->xfont->pattern does not yield same
116
-		 * the same substitution results as using the pattern returned by
112
+		/* Using the pattern found at font->xfont->pattern does not yield the
113
+		 * same substitution results as using the pattern returned by
117 114
 		 * FcNameParse; using the latter results in the desired fallback
118
-		 * behaviour whereas the former just results in
119
-		 * missing-character-rectangles being drawn, at least with some fonts.
120
-		 */
115
+		 * behaviour whereas the former just results in missing-character
116
+		 * rectangles being drawn, at least with some fonts. */
121 117
 		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
122
-			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
118
+			fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
123 119
 			return NULL;
124 120
 		}
125 121
 		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
126
-			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
122
+			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
127 123
 			XftFontClose(drw->dpy, xfont);
128 124
 			return NULL;
129 125
 		}
130 126
 	} else if (fontpattern) {
131 127
 		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
132
-			fprintf(stderr, "error, cannot load font pattern.\n");
128
+			fprintf(stderr, "error, cannot load font from pattern.\n");
133 129
 			return NULL;
134 130
 		}
135 131
 	} else {
@@ -139,95 +135,115 @@ drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
139 135
 	font = ecalloc(1, sizeof(Fnt));
140 136
 	font->xfont = xfont;
141 137
 	font->pattern = pattern;
142
-	font->ascent = xfont->ascent;
143
-	font->descent = xfont->descent;
144
-	font->h = font->ascent + font->descent;
138
+	font->h = xfont->ascent + xfont->descent;
145 139
 	font->dpy = drw->dpy;
146 140
 
147 141
 	return font;
148 142
 }
149 143
 
150
-Fnt*
151
-drw_font_create(Drw *drw, const char *fontname)
144
+static void
145
+xfont_free(Fnt *font)
152 146
 {
153
-	return drw_font_xcreate(drw, fontname, NULL);
147
+	if (!font)
148
+		return;
149
+	if (font->pattern)
150
+		FcPatternDestroy(font->pattern);
151
+	XftFontClose(font->dpy, font->xfont);
152
+	free(font);
154 153
 }
155 154
 
156
-void
157
-drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
155
+Fnt*
156
+drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
158 157
 {
158
+	Fnt *cur, *ret = NULL;
159 159
 	size_t i;
160
-	Fnt *font;
161 160
 
162
-	for (i = 0; i < fontcount; i++) {
163
-		if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
164
-			die("font cache exhausted.\n");
165
-		} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
166
-			drw->fonts[drw->fontcount++] = font;
161
+	if (!drw || !fonts)
162
+		return NULL;
163
+
164
+	for (i = 1; i <= fontcount; i++) {
165
+		if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
166
+			cur->next = ret;
167
+			ret = cur;
167 168
 		}
168 169
 	}
170
+	return (drw->fonts = ret);
169 171
 }
170 172
 
171 173
 void
172
-drw_font_free(Fnt *font)
174
+drw_fontset_free(Fnt *font)
173 175
 {
174
-	if (!font)
175
-		return;
176
-	if (font->pattern)
177
-		FcPatternDestroy(font->pattern);
178
-	XftFontClose(font->dpy, font->xfont);
179
-	free(font);
176
+	if (font) {
177
+		drw_fontset_free(font->next);
178
+		xfont_free(font);
179
+	}
180 180
 }
181 181
 
182
-Clr *
183
-drw_clr_create(Drw *drw, const char *clrname)
182
+void
183
+drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
184 184
 {
185
-	Clr *clr;
185
+	if (!drw || !dest || !clrname)
186
+		return;
186 187
 
187
-	clr = ecalloc(1, sizeof(Clr));
188 188
 	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
189 189
 	                       DefaultColormap(drw->dpy, drw->screen),
190
-	                       clrname, &clr->rgb))
190
+	                       clrname, dest))
191 191
 		die("error, cannot allocate color '%s'\n", clrname);
192
-	clr->pix = clr->rgb.pixel;
192
+}
193
+
194
+/* Wrapper to create color schemes. The caller has to call free(3) on the
195
+ * returned color scheme when done using it. */
196
+Scm
197
+drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
198
+{
199
+	size_t i;
200
+	Scm ret;
201
+
202
+	/* need at least two colors for a scheme */
203
+	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
204
+		return NULL;
193 205
 
194
-	return clr;
206
+	for (i = 0; i < clrcount; i++)
207
+		drw_clr_create(drw, &ret[i], clrnames[i]);
208
+	return ret;
195 209
 }
196 210
 
197 211
 void
198
-drw_clr_free(Clr *clr)
212
+drw_setfontset(Drw *drw, Fnt *set)
199 213
 {
200
-	free(clr);
214
+	if (drw)
215
+		drw->fonts = set;
201 216
 }
202 217
 
203 218
 void
204
-drw_setscheme(Drw *drw, ClrScheme *scheme)
219
+drw_setscheme(Drw *drw, Scm scm)
205 220
 {
206
-	drw->scheme = scheme;
221
+	if (drw)
222
+		drw->scheme = scm;
207 223
 }
208 224
 
209 225
 void
210
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
226
+drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
211 227
 {
212
-	if (!drw->scheme)
228
+	if (!drw || !drw->scheme)
213 229
 		return;
214
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
230
+	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
215 231
 	if (filled)
216
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
217
-	else if (empty)
218
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
232
+		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
233
+	else
234
+		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
219 235
 }
220 236
 
221 237
 int
222
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
238
+drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
223 239
 {
224 240
 	char buf[1024];
225
-	int tx, ty, th;
226
-	Extnts tex;
241
+	int ty;
242
+	unsigned int ew;
227 243
 	XftDraw *d = NULL;
228
-	Fnt *curfont, *nextfont;
244
+	Fnt *usedfont, *curfont, *nextfont;
229 245
 	size_t i, len;
230
-	int utf8strlen, utf8charlen, render;
246
+	int utf8strlen, utf8charlen, render = x || y || w || h;
231 247
 	long utf8codepoint = 0;
232 248
 	const char *utf8str;
233 249
 	FcCharSet *fccharset;
@@ -236,66 +252,67 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
236 252
 	XftResult result;
237 253
 	int charexists = 0;
238 254
 
239
-	if (!drw->scheme || !drw->fontcount)
255
+	if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
240 256
 		return 0;
241 257
 
242
-	if (!(render = x || y || w || h)) {
258
+	if (!render) {
243 259
 		w = ~w;
244 260
 	} else {
245
-		XSetForeground(drw->dpy, drw->gc, invert ?
246
-		               drw->scheme->fg->pix : drw->scheme->bg->pix);
261
+		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
247 262
 		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
248 263
 		d = XftDrawCreate(drw->dpy, drw->drawable,
249 264
 		                  DefaultVisual(drw->dpy, drw->screen),
250 265
 		                  DefaultColormap(drw->dpy, drw->screen));
266
+		x += lpad;
267
+		w -= lpad;
251 268
 	}
252 269
 
253
-	curfont = drw->fonts[0];
270
+	usedfont = drw->fonts;
254 271
 	while (1) {
255 272
 		utf8strlen = 0;
256 273
 		utf8str = text;
257 274
 		nextfont = NULL;
258 275
 		while (*text) {
259 276
 			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
260
-			for (i = 0; i < drw->fontcount; i++) {
261
-				charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint);
277
+			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
278
+				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
262 279
 				if (charexists) {
263
-					if (drw->fonts[i] == curfont) {
280
+					if (curfont == usedfont) {
264 281
 						utf8strlen += utf8charlen;
265 282
 						text += utf8charlen;
266 283
 					} else {
267
-						nextfont = drw->fonts[i];
284
+						nextfont = curfont;
268 285
 					}
269 286
 					break;
270 287
 				}
271 288
 			}
272 289
 
273
-			if (!charexists || (nextfont && nextfont != curfont))
290
+			if (!charexists || nextfont)
274 291
 				break;
275 292
 			else
276 293
 				charexists = 0;
277 294
 		}
278 295
 
279 296
 		if (utf8strlen) {
280
-			drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
297
+			drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
281 298
 			/* shorten text if necessary */
282
-			for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
283
-				drw_font_getexts(curfont, utf8str, len, &tex);
299
+			for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
300
+				drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
284 301
 
285 302
 			if (len) {
286 303
 				memcpy(buf, utf8str, len);
287 304
 				buf[len] = '\0';
288 305
 				if (len < utf8strlen)
289
-					for (i = len; i && i > len - 3; buf[--i] = '.');
306
+					for (i = len; i && i > len - 3; buf[--i] = '.')
307
+						; /* NOP */
290 308
 
291 309
 				if (render) {
292
-					th = curfont->ascent + curfont->descent;
293
-					ty = y + (h / 2) - (th / 2) + curfont->ascent;
294
-					tx = x + (h / 2);
295
-					XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
310
+					ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
311
+					XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
312
+					                  usedfont->xfont, x, ty, (XftChar8 *)buf, len);
296 313
 				}
297
-				x += tex.w;
298
-				w -= tex.w;
314
+				x += ew;
315
+				w -= ew;
299 316
 			}
300 317
 		}
301 318
 
@@ -303,26 +320,21 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
303 320
 			break;
304 321
 		} else if (nextfont) {
305 322
 			charexists = 0;
306
-			curfont = nextfont;
323
+			usedfont = nextfont;
307 324
 		} else {
308 325
 			/* Regardless of whether or not a fallback font is found, the
309
-			 * character must be drawn.
310
-			 */
326
+			 * character must be drawn. */
311 327
 			charexists = 1;
312 328
 
313
-			if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
314
-				continue;
315
-
316 329
 			fccharset = FcCharSetCreate();
317 330
 			FcCharSetAddChar(fccharset, utf8codepoint);
318 331
 
319
-			if (!drw->fonts[0]->pattern) {
320
-				/* Refer to the comment in drw_font_xcreate for more
321
-				 * information. */
332
+			if (!drw->fonts->pattern) {
333
+				/* Refer to the comment in xfont_create for more information. */
322 334
 				die("the first font in the cache must be loaded from a font string.\n");
323 335
 			}
324 336
 
325
-			fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
337
+			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
326 338
 			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
327 339
 			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
328 340
 
@@ -334,12 +346,14 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
334 346
 			FcPatternDestroy(fcpattern);
335 347
 
336 348
 			if (match) {
337
-				curfont = drw_font_xcreate(drw, NULL, match);
338
-				if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
339
-					drw->fonts[drw->fontcount++] = curfont;
349
+				usedfont = xfont_create(drw, NULL, match);
350
+				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
351
+					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
352
+						; /* NOP */
353
+					curfont->next = usedfont;
340 354
 				} else {
341
-					drw_font_free(curfont);
342
-					curfont = drw->fonts[0];
355
+					xfont_free(usedfont);
356
+					usedfont = drw->fonts;
343 357
 				}
344 358
 			}
345 359
 		}
@@ -347,34 +361,40 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
347 361
 	if (d)
348 362
 		XftDrawDestroy(d);
349 363
 
350
-	return x;
364
+	return x + (render ? w : 0);
351 365
 }
352 366
 
353 367
 void
354 368
 drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
355 369
 {
370
+	if (!drw)
371
+		return;
372
+
356 373
 	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
357 374
 	XSync(drw->dpy, False);
358 375
 }
359 376
 
360
-void
361
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
377
+unsigned int
378
+drw_fontset_getwidth(Drw *drw, const char *text)
362 379
 {
363
-	XGlyphInfo ext;
364
-
365
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
366
-	tex->h = font->h;
367
-	tex->w = ext.xOff;
380
+	if (!drw || !drw->fonts || !text)
381
+		return 0;
382
+	return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
368 383
 }
369 384
 
370
-unsigned int
371
-drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
385
+void
386
+drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
372 387
 {
373
-	Extnts tex;
388
+	XGlyphInfo ext;
374 389
 
375
-	drw_font_getexts(font, text, len, &tex);
390
+	if (!font || !text)
391
+		return;
376 392
 
377
-	return tex.w;
393
+	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
394
+	if (w)
395
+		*w = ext.xOff;
396
+	if (h)
397
+		*h = font->h;
378 398
 }
379 399
 
380 400
 Cur *
@@ -382,7 +402,9 @@ drw_cur_create(Drw *drw, int shape)
382 402
 {
383 403
 	Cur *cur;
384 404
 
385
-	cur = ecalloc(1, sizeof(Cur));
405
+	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
406
+		return NULL;
407
+
386 408
 	cur->cursor = XCreateFontCursor(drw->dpy, shape);
387 409
 
388 410
 	return cur;
@@ -393,6 +415,7 @@ drw_cur_free(Drw *drw, Cur *cursor)
393 415
 {
394 416
 	if (!cursor)
395 417
 		return;
418
+
396 419
 	XFreeCursor(drw->dpy, cursor->cursor);
397 420
 	free(cursor);
398 421
 }

+ 23
- 40
drw.h View File

@@ -1,29 +1,19 @@
1 1
 /* See LICENSE file for copyright and license details. */
2
-#define DRW_FONT_CACHE_SIZE 32
3
-
4
-typedef struct {
5
-	unsigned long pix;
6
-	XftColor rgb;
7
-} Clr;
8 2
 
9 3
 typedef struct {
10 4
 	Cursor cursor;
11 5
 } Cur;
12 6
 
13
-typedef struct {
7
+typedef struct Fnt {
14 8
 	Display *dpy;
15
-	int ascent;
16
-	int descent;
17 9
 	unsigned int h;
18 10
 	XftFont *xfont;
19 11
 	FcPattern *pattern;
12
+	struct Fnt *next;
20 13
 } Fnt;
21 14
 
22
-typedef struct {
23
-	Clr *fg;
24
-	Clr *bg;
25
-	Clr *border;
26
-} ClrScheme;
15
+enum { ColFg, ColBg, ColCount }; /* Scm index */
16
+typedef XftColor *Scm;
27 17
 
28 18
 typedef struct {
29 19
 	unsigned int w, h;
@@ -32,43 +22,36 @@ typedef struct {
32 22
 	Window root;
33 23
 	Drawable drawable;
34 24
 	GC gc;
35
-	ClrScheme *scheme;
36
-	size_t fontcount;
37
-	Fnt *fonts[DRW_FONT_CACHE_SIZE];
25
+	Scm scheme;
26
+	Fnt *fonts;
38 27
 } Drw;
39 28
 
40
-typedef struct {
41
-	unsigned int w;
42
-	unsigned int h;
43
-} Extnts;
44
-
45 29
 /* Drawable abstraction */
46
-Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
47
-void drw_resize(Drw *, unsigned int, unsigned int);
48
-void drw_free(Drw *);
30
+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
31
+void drw_resize(Drw *drw, unsigned int w, unsigned int h);
32
+void drw_free(Drw *drw);
49 33
 
50 34
 /* Fnt abstraction */
51
-Fnt *drw_font_create(Drw *, const char *);
52
-void drw_load_fonts(Drw *, const char *[], size_t);
53
-void drw_font_free(Fnt *);
54
-void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
55
-unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);
35
+Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
36
+void drw_fontset_free(Fnt* set);
37
+unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
38
+void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
56 39
 
57
-/* Colour abstraction */
58
-Clr *drw_clr_create(Drw *, const char *);
59
-void drw_clr_free(Clr *);
40
+/* Colorscheme abstraction */
41
+void drw_clr_create(Drw *drw, XftColor *dest, const char *clrname);
42
+Scm drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
60 43
 
61 44
 /* Cursor abstraction */
62
-Cur *drw_cur_create(Drw *, int);
63
-void drw_cur_free(Drw *, Cur *);
45
+Cur *drw_cur_create(Drw *drw, int shape);
46
+void drw_cur_free(Drw *drw, Cur *cursor);
64 47
 
65 48
 /* Drawing context manipulation */
66
-void drw_setfont(Drw *, Fnt *);
67
-void drw_setscheme(Drw *, ClrScheme *);
49
+void drw_setfontset(Drw *drw, Fnt *set);
50
+void drw_setscheme(Drw *drw, Scm scm);
68 51
 
69 52
 /* Drawing functions */
70
-void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
71
-int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int);
53
+void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
54
+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
72 55
 
73 56
 /* Map functions */
74
-void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);
57
+void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);

+ 39
- 46
dwm.c View File

@@ -55,7 +55,8 @@
55 55
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
56 56
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
57 57
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
58
-#define TEXTW(X)                (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
58
+#define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
59
+#define ColBorder               2
59 60
 
60 61
 /* enums */
61 62
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@ -240,6 +241,7 @@ static char stext[256];
240 241
 static int screen;
241 242
 static int sw, sh;           /* X display screen geometry width, height */
242 243
 static int bh, blw = 0;      /* bar geometry */
244
+static int lrpad;            /* sum of left and right padding for text */
243 245
 static int (*xerrorxlib)(Display *, XErrorEvent *);
244 246
 static unsigned int numlockmask = 0;
245 247
 static void (*handler[LASTEvent]) (XEvent *) = {
@@ -261,7 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
261 263
 static Atom wmatom[WMLast], netatom[NetLast];
262 264
 static int running = 1;
263 265
 static Cur *cursor[CurLast];
264
-static ClrScheme scheme[SchemeLast];
266
+static Scm scheme[SchemeLast];
265 267
 static Display *dpy;
266 268
 static Drw *drw;
267 269
 static Monitor *mons, *selmon;
@@ -481,11 +483,8 @@ cleanup(void)
481 483
 		cleanupmon(mons);
482 484
 	for (i = 0; i < CurLast; i++)
483 485
 		drw_cur_free(drw, cursor[i]);
484
-	for (i = 0; i < SchemeLast; i++) {
485
-		drw_clr_free(scheme[i].border);
486
-		drw_clr_free(scheme[i].bg);
487
-		drw_clr_free(scheme[i].fg);
488
-	}
486
+	for (i = 0; i < SchemeLast; i++)
487
+		free(scheme[i]);
489 488
 	drw_free(drw);
490 489
 	XSync(dpy, False);
491 490
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
@@ -709,11 +708,18 @@ dirtomon(int dir)
709 708
 void
710 709
 drawbar(Monitor *m)
711 710
 {
712
-	int x, xx, w, dx;
711
+	int x, w, sw = 0;
712
+	int boxs = drw->fonts->h / 9;
713
+	int boxw = drw->fonts->h / 6 + 2;
713 714
 	unsigned int i, occ = 0, urg = 0;
714 715
 	Client *c;
715 716
 
716
-	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
717
+	/* draw status first so it can be overdrawn by tags later */
718
+	if (m == selmon) { /* status is only drawn on selected monitor */
719
+		drw_setscheme(drw, scheme[SchemeNorm]);
720
+		sw = TEXTW(stext) - lrpad / 2; /* no right padding so status text hugs the corner */
721
+		drw_text(drw, m->ww - sw, 0, sw, bh, lrpad / 2 - 2, stext, 0);
722
+	}
717 723
 
718 724
 	for (c = m->clients; c; c = c->next) {
719 725
 		occ |= c->tags;
@@ -723,36 +729,27 @@ drawbar(Monitor *m)
723 729
 	x = 0;
724 730
 	for (i = 0; i < LENGTH(tags); i++) {
725 731
 		w = TEXTW(tags[i]);
726
-		drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
727
-		drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
728
-		drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
729
-		           occ & 1 << i, urg & 1 << i);
732
+		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
733
+		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
734
+		if (occ & 1 << i)
735
+			drw_rect(drw, x + boxs, boxs, boxw, boxw,
736
+			         m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
737
+			         urg & 1 << i);
730 738
 		x += w;
731 739
 	}
732 740
 	w = blw = TEXTW(m->ltsymbol);
733
-	drw_setscheme(drw, &scheme[SchemeNorm]);
734
-	drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
735
-	x += w;
736
-	xx = x;
737
-	if (m == selmon) { /* status is only drawn on selected monitor */
738
-		w = TEXTW(stext);
739
-		x = m->ww - w;
740
-		if (x < xx) {
741
-			x = xx;
742
-			w = m->ww - xx;
743
-		}
744
-		drw_text(drw, x, 0, w, bh, stext, 0);
745
-	} else
746
-		x = m->ww;
747
-	if ((w = x - xx) > bh) {
748
-		x = xx;
741
+	drw_setscheme(drw, scheme[SchemeNorm]);
742
+	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
743
+
744
+	if ((w = m->ww - sw - x) > bh) {
749 745
 		if (m->sel) {
750
-			drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
751
-			drw_text(drw, x, 0, w, bh, m->sel->name, 0);
752
-			drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0);
746
+			drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
747
+			drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
748
+			if (m->sel->isfloating)
749
+				drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
753 750
 		} else {
754
-			drw_setscheme(drw, &scheme[SchemeNorm]);
755
-			drw_rect(drw, x, 0, w, bh, 1, 0, 1);
751
+			drw_setscheme(drw, scheme[SchemeNorm]);
752
+			drw_rect(drw, x, 0, w, bh, 1, 1);
756 753
 		}
757 754
 	}
758 755
 	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
@@ -812,7 +809,7 @@ focus(Client *c)
812 809
 		detachstack(c);
813 810
 		attachstack(c);
814 811
 		grabbuttons(c, 1);
815
-		XSetWindowBorder(dpy, c->win, scheme[SchemeSel].border->pix);
812
+		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
816 813
 		setfocus(c);
817 814
 	} else {
818 815
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -1071,7 +1068,7 @@ manage(Window w, XWindowAttributes *wa)
1071 1068
 
1072 1069
 	wc.border_width = c->bw;
1073 1070
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
1074
-	XSetWindowBorder(dpy, w, scheme[SchemeNorm].border->pix);
1071
+	XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
1075 1072
 	configure(c); /* propagates border_width, if size doesn't change */
1076 1073
 	updatewindowtype(c);
1077 1074
 	updatesizehints(c);
@@ -1563,10 +1560,10 @@ setup(void)
1563 1560
 	sh = DisplayHeight(dpy, screen);
1564 1561
 	root = RootWindow(dpy, screen);
1565 1562
 	drw = drw_create(dpy, screen, root, sw, sh);
1566
-	drw_load_fonts(drw, fonts, LENGTH(fonts));
1567
-	if (!drw->fontcount)
1563
+	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
1568 1564
 		die("no fonts could be loaded.\n");
1569
-	bh = drw->fonts[0]->h + 2;
1565
+	lrpad = drw->fonts->h;
1566
+	bh = drw->fonts->h + 2;
1570 1567
 	updategeom();
1571 1568
 	/* init atoms */
1572 1569
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1586,12 +1583,8 @@ setup(void)
1586 1583
 	cursor[CurResize] = drw_cur_create(drw, XC_sizing);
1587 1584
 	cursor[CurMove] = drw_cur_create(drw, XC_fleur);
1588 1585
 	/* init appearance */
1589
-	scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor);
1590
-	scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
1591
-	scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
1592
-	scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
1593
-	scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
1594
-	scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
1586
+	scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 3);
1587
+	scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 3);
1595 1588
 	/* init bars */
1596 1589
 	updatebars();
1597 1590
 	updatestatus();
@@ -1751,7 +1744,7 @@ unfocus(Client *c, int setfocus)
1751 1744
 	if (!c)
1752 1745
 		return;
1753 1746
 	grabbuttons(c, 0);
1754
-	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->pix);
1747
+	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
1755 1748
 	if (setfocus) {
1756 1749
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
1757 1750
 		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);

+ 2
- 2
util.h View File

@@ -4,5 +4,5 @@
4 4
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))
5 5
 #define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
6 6
 
7
-void die(const char *errstr, ...);
8
-void *ecalloc(size_t, size_t);
7
+void die(const char *fmt, ...);
8
+void *ecalloc(size_t nmemb, size_t size);

Loading…
Cancel
Save