it* dwm + patches Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/dwm-sdk URL:git://git.codevoid.de/dwm-sdk codevoid.de 70 1Log /git/dwm-sdk/log.gph codevoid.de 70 1Files /git/dwm-sdk/files.gph codevoid.de 70 1Refs /git/dwm-sdk/refs.gph codevoid.de 70 1README /git/dwm-sdk/file/README.gph codevoid.de 70 1LICENSE /git/dwm-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 7af4d439bdb5a2e40aca69446a3367bd71431c45 /git/dwm-sdk/commit/7af4d439bdb5a2e40aca69446a3367bd71431c45.gph codevoid.de 70 1parent cd2d7549b3ae5ec234b45d85608f79f4d3aaa851 /git/dwm-sdk/commit/cd2d7549b3ae5ec234b45d85608f79f4d3aaa851.gph codevoid.de 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de codevoid.de 70 iDate: Sun, 22 May 2016 22:33:56 +0200 Err codevoid.de 70 i Err codevoid.de 70 iimport new drw from libsl and minor fixes. Err codevoid.de 70 i Err codevoid.de 70 i- better scaling for occupied tag squares. Err codevoid.de 70 i- draw statusline first to omitt some complicated calculations. Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M config.def.h | 24 +++++++++++++----------- Err codevoid.de 70 i M drw.c | 241 +++++++++++++++++-------------- Err codevoid.de 70 i M drw.h | 63 +++++++++++-------------------- Err codevoid.de 70 i M dwm.c | 85 ++++++++++++++----------------- Err codevoid.de 70 i M util.h | 4 ++-- Err codevoid.de 70 i Err codevoid.de 70 i5 files changed, 209 insertions(+), 208 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/config.def.h b/config.def.h /git/dwm-sdk/file/config.def.h.gph codevoid.de 70 it@@ -1,20 +1,22 @@ Err codevoid.de 70 i /* See LICENSE file for copyright and license details. */ Err codevoid.de 70 i Err codevoid.de 70 i /* appearance */ Err codevoid.de 70 i-static const char *fonts[] = { Err codevoid.de 70 i- "monospace:size=10" Err codevoid.de 70 i-}; Err codevoid.de 70 i-static const char dmenufont[] = "monospace:size=10"; Err codevoid.de 70 i-static const char normbordercolor[] = "#444444"; Err codevoid.de 70 i-static const char normbgcolor[] = "#222222"; Err codevoid.de 70 i-static const char normfgcolor[] = "#bbbbbb"; Err codevoid.de 70 i-static const char selbordercolor[] = "#005577"; Err codevoid.de 70 i-static const char selbgcolor[] = "#005577"; Err codevoid.de 70 i-static const char selfgcolor[] = "#eeeeee"; Err codevoid.de 70 i static const unsigned int borderpx = 1; /* border pixel of windows */ Err codevoid.de 70 i static const unsigned int snap = 32; /* snap pixel */ Err codevoid.de 70 i static const int showbar = 1; /* 0 means no bar */ Err codevoid.de 70 i static const int topbar = 1; /* 0 means bottom bar */ Err codevoid.de 70 i+static const char *fonts[] = { "monospace:size=10" }; Err codevoid.de 70 i+static const char dmenufont[] = "monospace:size=10"; Err codevoid.de 70 i+static const char col_gray1[] = "#222222"; Err codevoid.de 70 i+static const char col_gray2[] = "#444444"; Err codevoid.de 70 i+static const char col_gray3[] = "#bbbbbb"; Err codevoid.de 70 i+static const char col_gray4[] = "#eeeeee"; Err codevoid.de 70 i+static const char col_cyan[] = "#005577"; Err codevoid.de 70 i+static const char *colors[][3] = { Err codevoid.de 70 i+ /* fg bg border */ Err codevoid.de 70 i+ { col_gray3, col_gray1, col_gray2}, /* normal */ Err codevoid.de 70 i+ { col_gray4, col_cyan, col_cyan }, /* selected */ Err codevoid.de 70 i+}; Err codevoid.de 70 i Err codevoid.de 70 i /* tagging */ Err codevoid.de 70 i static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; Err codevoid.de 70 it@@ -54,7 +56,7 @@ static const Layout layouts[] = { Err codevoid.de 70 i Err codevoid.de 70 i /* commands */ Err codevoid.de 70 i static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ Err codevoid.de 70 i-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; Err codevoid.de 70 i+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; Err codevoid.de 70 i static const char *termcmd[] = { "st", NULL }; Err codevoid.de 70 i Err codevoid.de 70 i static Key keys[] = { Err codevoid.de 70 1diff --git a/drw.c b/drw.c /git/dwm-sdk/file/drw.c.gph codevoid.de 70 it@@ -63,9 +63,8 @@ utf8decode(const char *c, long *u, size_t clen) Err codevoid.de 70 i Drw * Err codevoid.de 70 i drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) Err codevoid.de 70 i { Err codevoid.de 70 i- Drw *drw; Err codevoid.de 70 i+ Drw *drw = ecalloc(1, sizeof(Drw)); Err codevoid.de 70 i Err codevoid.de 70 i- drw = ecalloc(1, sizeof(Drw)); Err codevoid.de 70 i drw->dpy = dpy; Err codevoid.de 70 i drw->screen = screen; Err codevoid.de 70 i drw->root = root; Err codevoid.de 70 it@@ -73,7 +72,6 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h Err codevoid.de 70 i drw->h = h; Err codevoid.de 70 i drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); Err codevoid.de 70 i drw->gc = XCreateGC(dpy, root, 0, NULL); Err codevoid.de 70 i- drw->fontcount = 0; Err codevoid.de 70 i XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); Err codevoid.de 70 i Err codevoid.de 70 i return drw; Err codevoid.de 70 it@@ -82,6 +80,9 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h Err codevoid.de 70 i void Err codevoid.de 70 i drw_resize(Drw *drw, unsigned int w, unsigned int h) Err codevoid.de 70 i { Err codevoid.de 70 i+ if (!drw) Err codevoid.de 70 i+ return; Err codevoid.de 70 i+ Err codevoid.de 70 i drw->w = w; Err codevoid.de 70 i drw->h = h; Err codevoid.de 70 i if (drw->drawable) Err codevoid.de 70 it@@ -92,44 +93,39 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h) Err codevoid.de 70 i void Err codevoid.de 70 i drw_free(Drw *drw) Err codevoid.de 70 i { Err codevoid.de 70 i- size_t i; Err codevoid.de 70 i- Err codevoid.de 70 i- for (i = 0; i < drw->fontcount; i++) Err codevoid.de 70 i- drw_font_free(drw->fonts[i]); Err codevoid.de 70 i XFreePixmap(drw->dpy, drw->drawable); Err codevoid.de 70 i XFreeGC(drw->dpy, drw->gc); Err codevoid.de 70 i free(drw); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i /* This function is an implementation detail. Library users should use Err codevoid.de 70 i- * drw_font_create instead. Err codevoid.de 70 i+ * drw_fontset_create instead. Err codevoid.de 70 i */ Err codevoid.de 70 i static Fnt * Err codevoid.de 70 i-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) Err codevoid.de 70 i+xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) Err codevoid.de 70 i { Err codevoid.de 70 i Fnt *font; Err codevoid.de 70 i XftFont *xfont = NULL; Err codevoid.de 70 i FcPattern *pattern = NULL; Err codevoid.de 70 i Err codevoid.de 70 i if (fontname) { Err codevoid.de 70 i- /* Using the pattern found at font->xfont->pattern does not yield same Err codevoid.de 70 i- * the same substitution results as using the pattern returned by Err codevoid.de 70 i+ /* Using the pattern found at font->xfont->pattern does not yield the Err codevoid.de 70 i+ * same substitution results as using the pattern returned by Err codevoid.de 70 i * FcNameParse; using the latter results in the desired fallback Err codevoid.de 70 i- * behaviour whereas the former just results in Err codevoid.de 70 i- * missing-character-rectangles being drawn, at least with some fonts. Err codevoid.de 70 i- */ Err codevoid.de 70 i+ * behaviour whereas the former just results in missing-character Err codevoid.de 70 i+ * rectangles being drawn, at least with some fonts. */ Err codevoid.de 70 i if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { Err codevoid.de 70 i- fprintf(stderr, "error, cannot load font: '%s'\n", fontname); Err codevoid.de 70 i+ fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); Err codevoid.de 70 i return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i if (!(pattern = FcNameParse((FcChar8 *) fontname))) { Err codevoid.de 70 i- fprintf(stderr, "error, cannot load font: '%s'\n", fontname); Err codevoid.de 70 i+ fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); Err codevoid.de 70 i XftFontClose(drw->dpy, xfont); Err codevoid.de 70 i return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i } else if (fontpattern) { Err codevoid.de 70 i if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { Err codevoid.de 70 i- fprintf(stderr, "error, cannot load font pattern.\n"); Err codevoid.de 70 i+ fprintf(stderr, "error, cannot load font from pattern.\n"); Err codevoid.de 70 i return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i } else { Err codevoid.de 70 it@@ -139,95 +135,115 @@ drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) Err codevoid.de 70 i font = ecalloc(1, sizeof(Fnt)); Err codevoid.de 70 i font->xfont = xfont; Err codevoid.de 70 i font->pattern = pattern; Err codevoid.de 70 i- font->ascent = xfont->ascent; Err codevoid.de 70 i- font->descent = xfont->descent; Err codevoid.de 70 i- font->h = font->ascent + font->descent; Err codevoid.de 70 i+ font->h = xfont->ascent + xfont->descent; Err codevoid.de 70 i font->dpy = drw->dpy; Err codevoid.de 70 i Err codevoid.de 70 i return font; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-Fnt* Err codevoid.de 70 i-drw_font_create(Drw *drw, const char *fontname) Err codevoid.de 70 i+static void Err codevoid.de 70 i+xfont_free(Fnt *font) Err codevoid.de 70 i { Err codevoid.de 70 i- return drw_font_xcreate(drw, fontname, NULL); Err codevoid.de 70 i+ if (!font) Err codevoid.de 70 i+ return; Err codevoid.de 70 i+ if (font->pattern) Err codevoid.de 70 i+ FcPatternDestroy(font->pattern); Err codevoid.de 70 i+ XftFontClose(font->dpy, font->xfont); Err codevoid.de 70 i+ free(font); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-void Err codevoid.de 70 i-drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) Err codevoid.de 70 i+Fnt* Err codevoid.de 70 i+drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) Err codevoid.de 70 i { Err codevoid.de 70 i+ Fnt *cur, *ret = NULL; Err codevoid.de 70 i size_t i; Err codevoid.de 70 i- Fnt *font; Err codevoid.de 70 i Err codevoid.de 70 i- for (i = 0; i < fontcount; i++) { Err codevoid.de 70 i- if (drw->fontcount >= DRW_FONT_CACHE_SIZE) { Err codevoid.de 70 i- die("font cache exhausted.\n"); Err codevoid.de 70 i- } else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) { Err codevoid.de 70 i- drw->fonts[drw->fontcount++] = font; Err codevoid.de 70 i+ if (!drw || !fonts) Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i+ Err codevoid.de 70 i+ for (i = 1; i <= fontcount; i++) { Err codevoid.de 70 i+ if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { Err codevoid.de 70 i+ cur->next = ret; Err codevoid.de 70 i+ ret = cur; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i+ return (drw->fonts = ret); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_font_free(Fnt *font) Err codevoid.de 70 i+drw_fontset_free(Fnt *font) Err codevoid.de 70 i { Err codevoid.de 70 i- if (!font) Err codevoid.de 70 i- return; Err codevoid.de 70 i- if (font->pattern) Err codevoid.de 70 i- FcPatternDestroy(font->pattern); Err codevoid.de 70 i- XftFontClose(font->dpy, font->xfont); Err codevoid.de 70 i- free(font); Err codevoid.de 70 i+ if (font) { Err codevoid.de 70 i+ drw_fontset_free(font->next); Err codevoid.de 70 i+ xfont_free(font); Err codevoid.de 70 i+ } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-Clr * Err codevoid.de 70 i-drw_clr_create(Drw *drw, const char *clrname) Err codevoid.de 70 i+void Err codevoid.de 70 i+drw_clr_create(Drw *drw, XftColor *dest, const char *clrname) Err codevoid.de 70 i { Err codevoid.de 70 i- Clr *clr; Err codevoid.de 70 i+ if (!drw || !dest || !clrname) Err codevoid.de 70 i+ return; Err codevoid.de 70 i Err codevoid.de 70 i- clr = ecalloc(1, sizeof(Clr)); Err codevoid.de 70 i if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), Err codevoid.de 70 i DefaultColormap(drw->dpy, drw->screen), Err codevoid.de 70 i- clrname, &clr->rgb)) Err codevoid.de 70 i+ clrname, dest)) Err codevoid.de 70 i die("error, cannot allocate color '%s'\n", clrname); Err codevoid.de 70 i- clr->pix = clr->rgb.pixel; Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Wrapper to create color schemes. The caller has to call free(3) on the Err codevoid.de 70 i+ * returned color scheme when done using it. */ Err codevoid.de 70 i+Scm Err codevoid.de 70 i+drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ size_t i; Err codevoid.de 70 i+ Scm ret; Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* need at least two colors for a scheme */ Err codevoid.de 70 i+ if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i Err codevoid.de 70 i- return clr; Err codevoid.de 70 i+ for (i = 0; i < clrcount; i++) Err codevoid.de 70 i+ drw_clr_create(drw, &ret[i], clrnames[i]); Err codevoid.de 70 i+ return ret; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_clr_free(Clr *clr) Err codevoid.de 70 i+drw_setfontset(Drw *drw, Fnt *set) Err codevoid.de 70 i { Err codevoid.de 70 i- free(clr); Err codevoid.de 70 i+ if (drw) Err codevoid.de 70 i+ drw->fonts = set; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_setscheme(Drw *drw, ClrScheme *scheme) Err codevoid.de 70 i+drw_setscheme(Drw *drw, Scm scm) Err codevoid.de 70 i { Err codevoid.de 70 i- drw->scheme = scheme; Err codevoid.de 70 i+ if (drw) Err codevoid.de 70 i+ drw->scheme = scm; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) Err codevoid.de 70 i+drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) Err codevoid.de 70 i { Err codevoid.de 70 i- if (!drw->scheme) Err codevoid.de 70 i+ if (!drw || !drw->scheme) Err codevoid.de 70 i return; Err codevoid.de 70 i- XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix); Err codevoid.de 70 i+ XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); Err codevoid.de 70 i if (filled) Err codevoid.de 70 i- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1); Err codevoid.de 70 i- else if (empty) Err codevoid.de 70 i- XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i+ XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i+ else Err codevoid.de 70 i+ XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i int Err codevoid.de 70 i-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) Err codevoid.de 70 i+drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) Err codevoid.de 70 i { Err codevoid.de 70 i char buf[1024]; Err codevoid.de 70 i- int tx, ty, th; Err codevoid.de 70 i- Extnts tex; Err codevoid.de 70 i+ int ty; Err codevoid.de 70 i+ unsigned int ew; Err codevoid.de 70 i XftDraw *d = NULL; Err codevoid.de 70 i- Fnt *curfont, *nextfont; Err codevoid.de 70 i+ Fnt *usedfont, *curfont, *nextfont; Err codevoid.de 70 i size_t i, len; Err codevoid.de 70 i- int utf8strlen, utf8charlen, render; Err codevoid.de 70 i+ int utf8strlen, utf8charlen, render = x || y || w || h; Err codevoid.de 70 i long utf8codepoint = 0; Err codevoid.de 70 i const char *utf8str; Err codevoid.de 70 i FcCharSet *fccharset; Err codevoid.de 70 it@@ -236,66 +252,67 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i XftResult result; Err codevoid.de 70 i int charexists = 0; Err codevoid.de 70 i Err codevoid.de 70 i- if (!drw->scheme || !drw->fontcount) Err codevoid.de 70 i+ if (!drw || (render && !drw->scheme) || !text || !drw->fonts) Err codevoid.de 70 i return 0; Err codevoid.de 70 i Err codevoid.de 70 i- if (!(render = x || y || w || h)) { Err codevoid.de 70 i+ if (!render) { Err codevoid.de 70 i w = ~w; Err codevoid.de 70 i } else { Err codevoid.de 70 i- XSetForeground(drw->dpy, drw->gc, invert ? Err codevoid.de 70 i- drw->scheme->fg->pix : drw->scheme->bg->pix); Err codevoid.de 70 i+ XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); Err codevoid.de 70 i XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i d = XftDrawCreate(drw->dpy, drw->drawable, Err codevoid.de 70 i DefaultVisual(drw->dpy, drw->screen), Err codevoid.de 70 i DefaultColormap(drw->dpy, drw->screen)); Err codevoid.de 70 i+ x += lpad; Err codevoid.de 70 i+ w -= lpad; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i- curfont = drw->fonts[0]; Err codevoid.de 70 i+ usedfont = drw->fonts; Err codevoid.de 70 i while (1) { Err codevoid.de 70 i utf8strlen = 0; Err codevoid.de 70 i utf8str = text; Err codevoid.de 70 i nextfont = NULL; Err codevoid.de 70 i while (*text) { Err codevoid.de 70 i utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); Err codevoid.de 70 i- for (i = 0; i < drw->fontcount; i++) { Err codevoid.de 70 i- charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint); Err codevoid.de 70 i+ for (curfont = drw->fonts; curfont; curfont = curfont->next) { Err codevoid.de 70 i+ charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); Err codevoid.de 70 i if (charexists) { Err codevoid.de 70 i- if (drw->fonts[i] == curfont) { Err codevoid.de 70 i+ if (curfont == usedfont) { Err codevoid.de 70 i utf8strlen += utf8charlen; Err codevoid.de 70 i text += utf8charlen; Err codevoid.de 70 i } else { Err codevoid.de 70 i- nextfont = drw->fonts[i]; Err codevoid.de 70 i+ nextfont = curfont; Err codevoid.de 70 i } Err codevoid.de 70 i break; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i- if (!charexists || (nextfont && nextfont != curfont)) Err codevoid.de 70 i+ if (!charexists || nextfont) Err codevoid.de 70 i break; Err codevoid.de 70 i else Err codevoid.de 70 i charexists = 0; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i if (utf8strlen) { Err codevoid.de 70 i- drw_font_getexts(curfont, utf8str, utf8strlen, &tex); Err codevoid.de 70 i+ drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); Err codevoid.de 70 i /* shorten text if necessary */ Err codevoid.de 70 i- for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--) Err codevoid.de 70 i- drw_font_getexts(curfont, utf8str, len, &tex); Err codevoid.de 70 i+ for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) Err codevoid.de 70 i+ drw_font_getexts(usedfont, utf8str, len, &ew, NULL); Err codevoid.de 70 i Err codevoid.de 70 i if (len) { Err codevoid.de 70 i memcpy(buf, utf8str, len); Err codevoid.de 70 i buf[len] = '\0'; Err codevoid.de 70 i if (len < utf8strlen) Err codevoid.de 70 i- for (i = len; i && i > len - 3; buf[--i] = '.'); Err codevoid.de 70 i+ for (i = len; i && i > len - 3; buf[--i] = '.') Err codevoid.de 70 i+ ; /* NOP */ Err codevoid.de 70 i Err codevoid.de 70 i if (render) { Err codevoid.de 70 i- th = curfont->ascent + curfont->descent; Err codevoid.de 70 i- ty = y + (h / 2) - (th / 2) + curfont->ascent; Err codevoid.de 70 i- tx = x + (h / 2); Err codevoid.de 70 i- XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len); Err codevoid.de 70 i+ ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; Err codevoid.de 70 i+ XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], Err codevoid.de 70 i+ usedfont->xfont, x, ty, (XftChar8 *)buf, len); Err codevoid.de 70 i } Err codevoid.de 70 i- x += tex.w; Err codevoid.de 70 i- w -= tex.w; Err codevoid.de 70 i+ x += ew; Err codevoid.de 70 i+ w -= ew; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 it@@ -303,26 +320,21 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i break; Err codevoid.de 70 i } else if (nextfont) { Err codevoid.de 70 i charexists = 0; Err codevoid.de 70 i- curfont = nextfont; Err codevoid.de 70 i+ usedfont = nextfont; Err codevoid.de 70 i } else { Err codevoid.de 70 i /* Regardless of whether or not a fallback font is found, the Err codevoid.de 70 i- * character must be drawn. Err codevoid.de 70 i- */ Err codevoid.de 70 i+ * character must be drawn. */ Err codevoid.de 70 i charexists = 1; Err codevoid.de 70 i Err codevoid.de 70 i- if (drw->fontcount >= DRW_FONT_CACHE_SIZE) Err codevoid.de 70 i- continue; Err codevoid.de 70 i- Err codevoid.de 70 i fccharset = FcCharSetCreate(); Err codevoid.de 70 i FcCharSetAddChar(fccharset, utf8codepoint); Err codevoid.de 70 i Err codevoid.de 70 i- if (!drw->fonts[0]->pattern) { Err codevoid.de 70 i- /* Refer to the comment in drw_font_xcreate for more Err codevoid.de 70 i- * information. */ Err codevoid.de 70 i+ if (!drw->fonts->pattern) { Err codevoid.de 70 i+ /* Refer to the comment in xfont_create for more information. */ Err codevoid.de 70 i die("the first font in the cache must be loaded from a font string.\n"); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i- fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern); Err codevoid.de 70 i+ fcpattern = FcPatternDuplicate(drw->fonts->pattern); Err codevoid.de 70 i FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); Err codevoid.de 70 i FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); Err codevoid.de 70 i Err codevoid.de 70 it@@ -334,12 +346,14 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i FcPatternDestroy(fcpattern); Err codevoid.de 70 i Err codevoid.de 70 i if (match) { Err codevoid.de 70 i- curfont = drw_font_xcreate(drw, NULL, match); Err codevoid.de 70 i- if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) { Err codevoid.de 70 i- drw->fonts[drw->fontcount++] = curfont; Err codevoid.de 70 i+ usedfont = xfont_create(drw, NULL, match); Err codevoid.de 70 i+ if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { Err codevoid.de 70 i+ for (curfont = drw->fonts; curfont->next; curfont = curfont->next) Err codevoid.de 70 i+ ; /* NOP */ Err codevoid.de 70 i+ curfont->next = usedfont; Err codevoid.de 70 i } else { Err codevoid.de 70 i- drw_font_free(curfont); Err codevoid.de 70 i- curfont = drw->fonts[0]; Err codevoid.de 70 i+ xfont_free(usedfont); Err codevoid.de 70 i+ usedfont = drw->fonts; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 it@@ -347,34 +361,40 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i if (d) Err codevoid.de 70 i XftDrawDestroy(d); Err codevoid.de 70 i Err codevoid.de 70 i- return x; Err codevoid.de 70 i+ return x + (render ? w : 0); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) Err codevoid.de 70 i { Err codevoid.de 70 i+ if (!drw) Err codevoid.de 70 i+ return; Err codevoid.de 70 i+ Err codevoid.de 70 i XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); Err codevoid.de 70 i XSync(drw->dpy, False); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-void Err codevoid.de 70 i-drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) Err codevoid.de 70 i+unsigned int Err codevoid.de 70 i+drw_fontset_getwidth(Drw *drw, const char *text) Err codevoid.de 70 i { Err codevoid.de 70 i- XGlyphInfo ext; Err codevoid.de 70 i- Err codevoid.de 70 i- XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); Err codevoid.de 70 i- tex->h = font->h; Err codevoid.de 70 i- tex->w = ext.xOff; Err codevoid.de 70 i+ if (!drw || !drw->fonts || !text) Err codevoid.de 70 i+ return 0; Err codevoid.de 70 i+ return drw_text(drw, 0, 0, 0, 0, 0, text, 0); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-unsigned int Err codevoid.de 70 i-drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) Err codevoid.de 70 i+void Err codevoid.de 70 i+drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) Err codevoid.de 70 i { Err codevoid.de 70 i- Extnts tex; Err codevoid.de 70 i+ XGlyphInfo ext; Err codevoid.de 70 i Err codevoid.de 70 i- drw_font_getexts(font, text, len, &tex); Err codevoid.de 70 i+ if (!font || !text) Err codevoid.de 70 i+ return; Err codevoid.de 70 i Err codevoid.de 70 i- return tex.w; Err codevoid.de 70 i+ XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); Err codevoid.de 70 i+ if (w) Err codevoid.de 70 i+ *w = ext.xOff; Err codevoid.de 70 i+ if (h) Err codevoid.de 70 i+ *h = font->h; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i Cur * Err codevoid.de 70 it@@ -382,7 +402,9 @@ drw_cur_create(Drw *drw, int shape) Err codevoid.de 70 i { Err codevoid.de 70 i Cur *cur; Err codevoid.de 70 i Err codevoid.de 70 i- cur = ecalloc(1, sizeof(Cur)); Err codevoid.de 70 i+ if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i+ Err codevoid.de 70 i cur->cursor = XCreateFontCursor(drw->dpy, shape); Err codevoid.de 70 i Err codevoid.de 70 i return cur; Err codevoid.de 70 it@@ -393,6 +415,7 @@ drw_cur_free(Drw *drw, Cur *cursor) Err codevoid.de 70 i { Err codevoid.de 70 i if (!cursor) Err codevoid.de 70 i return; Err codevoid.de 70 i+ Err codevoid.de 70 i XFreeCursor(drw->dpy, cursor->cursor); Err codevoid.de 70 i free(cursor); Err codevoid.de 70 i } Err codevoid.de 70 1diff --git a/drw.h b/drw.h /git/dwm-sdk/file/drw.h.gph codevoid.de 70 it@@ -1,29 +1,19 @@ Err codevoid.de 70 i /* See LICENSE file for copyright and license details. */ Err codevoid.de 70 i-#define DRW_FONT_CACHE_SIZE 32 Err codevoid.de 70 i- Err codevoid.de 70 i-typedef struct { Err codevoid.de 70 i- unsigned long pix; Err codevoid.de 70 i- XftColor rgb; Err codevoid.de 70 i-} Clr; Err codevoid.de 70 i Err codevoid.de 70 i typedef struct { Err codevoid.de 70 i Cursor cursor; Err codevoid.de 70 i } Cur; Err codevoid.de 70 i Err codevoid.de 70 i-typedef struct { Err codevoid.de 70 i+typedef struct Fnt { Err codevoid.de 70 i Display *dpy; Err codevoid.de 70 i- int ascent; Err codevoid.de 70 i- int descent; Err codevoid.de 70 i unsigned int h; Err codevoid.de 70 i XftFont *xfont; Err codevoid.de 70 i FcPattern *pattern; Err codevoid.de 70 i+ struct Fnt *next; Err codevoid.de 70 i } Fnt; Err codevoid.de 70 i Err codevoid.de 70 i-typedef struct { Err codevoid.de 70 i- Clr *fg; Err codevoid.de 70 i- Clr *bg; Err codevoid.de 70 i- Clr *border; Err codevoid.de 70 i-} ClrScheme; Err codevoid.de 70 i+enum { ColFg, ColBg, ColCount }; /* Scm index */ Err codevoid.de 70 i+typedef XftColor *Scm; Err codevoid.de 70 i Err codevoid.de 70 i typedef struct { Err codevoid.de 70 i unsigned int w, h; Err codevoid.de 70 it@@ -32,43 +22,36 @@ typedef struct { Err codevoid.de 70 i Window root; Err codevoid.de 70 i Drawable drawable; Err codevoid.de 70 i GC gc; Err codevoid.de 70 i- ClrScheme *scheme; Err codevoid.de 70 i- size_t fontcount; Err codevoid.de 70 i- Fnt *fonts[DRW_FONT_CACHE_SIZE]; Err codevoid.de 70 i+ Scm scheme; Err codevoid.de 70 i+ Fnt *fonts; Err codevoid.de 70 i } Drw; Err codevoid.de 70 i Err codevoid.de 70 i-typedef struct { Err codevoid.de 70 i- unsigned int w; Err codevoid.de 70 i- unsigned int h; Err codevoid.de 70 i-} Extnts; Err codevoid.de 70 i- Err codevoid.de 70 i /* Drawable abstraction */ Err codevoid.de 70 i-Drw *drw_create(Display *, int, Window, unsigned int, unsigned int); Err codevoid.de 70 i-void drw_resize(Drw *, unsigned int, unsigned int); Err codevoid.de 70 i-void drw_free(Drw *); Err codevoid.de 70 i+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); Err codevoid.de 70 i+void drw_resize(Drw *drw, unsigned int w, unsigned int h); Err codevoid.de 70 i+void drw_free(Drw *drw); Err codevoid.de 70 i Err codevoid.de 70 i /* Fnt abstraction */ Err codevoid.de 70 i-Fnt *drw_font_create(Drw *, const char *); Err codevoid.de 70 i-void drw_load_fonts(Drw *, const char *[], size_t); Err codevoid.de 70 i-void drw_font_free(Fnt *); Err codevoid.de 70 i-void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *); Err codevoid.de 70 i-unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int); Err codevoid.de 70 i+Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); Err codevoid.de 70 i+void drw_fontset_free(Fnt* set); Err codevoid.de 70 i+unsigned int drw_fontset_getwidth(Drw *drw, const char *text); Err codevoid.de 70 i+void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); Err codevoid.de 70 i Err codevoid.de 70 i-/* Colour abstraction */ Err codevoid.de 70 i-Clr *drw_clr_create(Drw *, const char *); Err codevoid.de 70 i-void drw_clr_free(Clr *); Err codevoid.de 70 i+/* Colorscheme abstraction */ Err codevoid.de 70 i+void drw_clr_create(Drw *drw, XftColor *dest, const char *clrname); Err codevoid.de 70 i+Scm drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); Err codevoid.de 70 i Err codevoid.de 70 i /* Cursor abstraction */ Err codevoid.de 70 i-Cur *drw_cur_create(Drw *, int); Err codevoid.de 70 i-void drw_cur_free(Drw *, Cur *); Err codevoid.de 70 i+Cur *drw_cur_create(Drw *drw, int shape); Err codevoid.de 70 i+void drw_cur_free(Drw *drw, Cur *cursor); Err codevoid.de 70 i Err codevoid.de 70 i /* Drawing context manipulation */ Err codevoid.de 70 i-void drw_setfont(Drw *, Fnt *); Err codevoid.de 70 i-void drw_setscheme(Drw *, ClrScheme *); Err codevoid.de 70 i+void drw_setfontset(Drw *drw, Fnt *set); Err codevoid.de 70 i+void drw_setscheme(Drw *drw, Scm scm); Err codevoid.de 70 i Err codevoid.de 70 i /* Drawing functions */ Err codevoid.de 70 i-void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int); Err codevoid.de 70 i-int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int); Err codevoid.de 70 i+void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); Err codevoid.de 70 i+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); Err codevoid.de 70 i Err codevoid.de 70 i /* Map functions */ Err codevoid.de 70 i-void drw_map(Drw *, Window, int, int, unsigned int, unsigned int); Err codevoid.de 70 i+void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); Err codevoid.de 70 1diff --git a/dwm.c b/dwm.c /git/dwm-sdk/file/dwm.c.gph codevoid.de 70 it@@ -55,7 +55,8 @@ Err codevoid.de 70 i #define WIDTH(X) ((X)->w + 2 * (X)->bw) Err codevoid.de 70 i #define HEIGHT(X) ((X)->h + 2 * (X)->bw) Err codevoid.de 70 i #define TAGMASK ((1 << LENGTH(tags)) - 1) Err codevoid.de 70 i-#define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h) Err codevoid.de 70 i+#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) Err codevoid.de 70 i+#define ColBorder 2 Err codevoid.de 70 i Err codevoid.de 70 i /* enums */ Err codevoid.de 70 i enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ Err codevoid.de 70 it@@ -240,6 +241,7 @@ static char stext[256]; Err codevoid.de 70 i static int screen; Err codevoid.de 70 i static int sw, sh; /* X display screen geometry width, height */ Err codevoid.de 70 i static int bh, blw = 0; /* bar geometry */ Err codevoid.de 70 i+static int lrpad; /* sum of left and right padding for text */ Err codevoid.de 70 i static int (*xerrorxlib)(Display *, XErrorEvent *); Err codevoid.de 70 i static unsigned int numlockmask = 0; Err codevoid.de 70 i static void (*handler[LASTEvent]) (XEvent *) = { Err codevoid.de 70 it@@ -261,7 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { Err codevoid.de 70 i static Atom wmatom[WMLast], netatom[NetLast]; Err codevoid.de 70 i static int running = 1; Err codevoid.de 70 i static Cur *cursor[CurLast]; Err codevoid.de 70 i-static ClrScheme scheme[SchemeLast]; Err codevoid.de 70 i+static Scm scheme[SchemeLast]; Err codevoid.de 70 i static Display *dpy; Err codevoid.de 70 i static Drw *drw; Err codevoid.de 70 i static Monitor *mons, *selmon; Err codevoid.de 70 it@@ -481,11 +483,8 @@ cleanup(void) Err codevoid.de 70 i cleanupmon(mons); Err codevoid.de 70 i for (i = 0; i < CurLast; i++) Err codevoid.de 70 i drw_cur_free(drw, cursor[i]); Err codevoid.de 70 i- for (i = 0; i < SchemeLast; i++) { Err codevoid.de 70 i- drw_clr_free(scheme[i].border); Err codevoid.de 70 i- drw_clr_free(scheme[i].bg); Err codevoid.de 70 i- drw_clr_free(scheme[i].fg); Err codevoid.de 70 i- } Err codevoid.de 70 i+ for (i = 0; i < SchemeLast; i++) Err codevoid.de 70 i+ free(scheme[i]); Err codevoid.de 70 i drw_free(drw); Err codevoid.de 70 i XSync(dpy, False); Err codevoid.de 70 i XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); Err codevoid.de 70 it@@ -709,11 +708,18 @@ dirtomon(int dir) Err codevoid.de 70 i void Err codevoid.de 70 i drawbar(Monitor *m) Err codevoid.de 70 i { Err codevoid.de 70 i- int x, xx, w, dx; Err codevoid.de 70 i+ int x, w, sw = 0; Err codevoid.de 70 i+ int boxs = drw->fonts->h / 9; Err codevoid.de 70 i+ int boxw = drw->fonts->h / 6 + 2; Err codevoid.de 70 i unsigned int i, occ = 0, urg = 0; Err codevoid.de 70 i Client *c; Err codevoid.de 70 i Err codevoid.de 70 i- dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4; Err codevoid.de 70 i+ /* draw status first so it can be overdrawn by tags later */ Err codevoid.de 70 i+ if (m == selmon) { /* status is only drawn on selected monitor */ Err codevoid.de 70 i+ drw_setscheme(drw, scheme[SchemeNorm]); Err codevoid.de 70 i+ sw = TEXTW(stext) - lrpad / 2; /* no right padding so status text hugs the corner */ Err codevoid.de 70 i+ drw_text(drw, m->ww - sw, 0, sw, bh, lrpad / 2 - 2, stext, 0); Err codevoid.de 70 i+ } Err codevoid.de 70 i Err codevoid.de 70 i for (c = m->clients; c; c = c->next) { Err codevoid.de 70 i occ |= c->tags; Err codevoid.de 70 it@@ -723,36 +729,27 @@ drawbar(Monitor *m) Err codevoid.de 70 i x = 0; Err codevoid.de 70 i for (i = 0; i < LENGTH(tags); i++) { Err codevoid.de 70 i w = TEXTW(tags[i]); Err codevoid.de 70 i- drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]); Err codevoid.de 70 i- drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i); Err codevoid.de 70 i- drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i, Err codevoid.de 70 i- occ & 1 << i, urg & 1 << i); Err codevoid.de 70 i+ drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); Err codevoid.de 70 i+ drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); Err codevoid.de 70 i+ if (occ & 1 << i) Err codevoid.de 70 i+ drw_rect(drw, x + boxs, boxs, boxw, boxw, Err codevoid.de 70 i+ m == selmon && selmon->sel && selmon->sel->tags & 1 << i, Err codevoid.de 70 i+ urg & 1 << i); Err codevoid.de 70 i x += w; Err codevoid.de 70 i } Err codevoid.de 70 i w = blw = TEXTW(m->ltsymbol); Err codevoid.de 70 i- drw_setscheme(drw, &scheme[SchemeNorm]); Err codevoid.de 70 i- drw_text(drw, x, 0, w, bh, m->ltsymbol, 0); Err codevoid.de 70 i- x += w; Err codevoid.de 70 i- xx = x; Err codevoid.de 70 i- if (m == selmon) { /* status is only drawn on selected monitor */ Err codevoid.de 70 i- w = TEXTW(stext); Err codevoid.de 70 i- x = m->ww - w; Err codevoid.de 70 i- if (x < xx) { Err codevoid.de 70 i- x = xx; Err codevoid.de 70 i- w = m->ww - xx; Err codevoid.de 70 i- } Err codevoid.de 70 i- drw_text(drw, x, 0, w, bh, stext, 0); Err codevoid.de 70 i- } else Err codevoid.de 70 i- x = m->ww; Err codevoid.de 70 i- if ((w = x - xx) > bh) { Err codevoid.de 70 i- x = xx; Err codevoid.de 70 i+ drw_setscheme(drw, scheme[SchemeNorm]); Err codevoid.de 70 i+ x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); Err codevoid.de 70 i+ Err codevoid.de 70 i+ if ((w = m->ww - sw - x) > bh) { Err codevoid.de 70 i if (m->sel) { Err codevoid.de 70 i- drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]); Err codevoid.de 70 i- drw_text(drw, x, 0, w, bh, m->sel->name, 0); Err codevoid.de 70 i- drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0); Err codevoid.de 70 i+ drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); Err codevoid.de 70 i+ drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); Err codevoid.de 70 i+ if (m->sel->isfloating) Err codevoid.de 70 i+ drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); Err codevoid.de 70 i } else { Err codevoid.de 70 i- drw_setscheme(drw, &scheme[SchemeNorm]); Err codevoid.de 70 i- drw_rect(drw, x, 0, w, bh, 1, 0, 1); Err codevoid.de 70 i+ drw_setscheme(drw, scheme[SchemeNorm]); Err codevoid.de 70 i+ drw_rect(drw, x, 0, w, bh, 1, 1); Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i drw_map(drw, m->barwin, 0, 0, m->ww, bh); Err codevoid.de 70 it@@ -812,7 +809,7 @@ focus(Client *c) Err codevoid.de 70 i detachstack(c); Err codevoid.de 70 i attachstack(c); Err codevoid.de 70 i grabbuttons(c, 1); Err codevoid.de 70 i- XSetWindowBorder(dpy, c->win, scheme[SchemeSel].border->pix); Err codevoid.de 70 i+ XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); Err codevoid.de 70 i setfocus(c); Err codevoid.de 70 i } else { Err codevoid.de 70 i XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); Err codevoid.de 70 it@@ -1071,7 +1068,7 @@ manage(Window w, XWindowAttributes *wa) Err codevoid.de 70 i Err codevoid.de 70 i wc.border_width = c->bw; Err codevoid.de 70 i XConfigureWindow(dpy, w, CWBorderWidth, &wc); Err codevoid.de 70 i- XSetWindowBorder(dpy, w, scheme[SchemeNorm].border->pix); Err codevoid.de 70 i+ XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel); Err codevoid.de 70 i configure(c); /* propagates border_width, if size doesn't change */ Err codevoid.de 70 i updatewindowtype(c); Err codevoid.de 70 i updatesizehints(c); Err codevoid.de 70 it@@ -1563,10 +1560,10 @@ setup(void) Err codevoid.de 70 i sh = DisplayHeight(dpy, screen); Err codevoid.de 70 i root = RootWindow(dpy, screen); Err codevoid.de 70 i drw = drw_create(dpy, screen, root, sw, sh); Err codevoid.de 70 i- drw_load_fonts(drw, fonts, LENGTH(fonts)); Err codevoid.de 70 i- if (!drw->fontcount) Err codevoid.de 70 i+ if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) Err codevoid.de 70 i die("no fonts could be loaded.\n"); Err codevoid.de 70 i- bh = drw->fonts[0]->h + 2; Err codevoid.de 70 i+ lrpad = drw->fonts->h; Err codevoid.de 70 i+ bh = drw->fonts->h + 2; Err codevoid.de 70 i updategeom(); Err codevoid.de 70 i /* init atoms */ Err codevoid.de 70 i wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); Err codevoid.de 70 it@@ -1586,12 +1583,8 @@ setup(void) Err codevoid.de 70 i cursor[CurResize] = drw_cur_create(drw, XC_sizing); Err codevoid.de 70 i cursor[CurMove] = drw_cur_create(drw, XC_fleur); Err codevoid.de 70 i /* init appearance */ Err codevoid.de 70 i- scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor); Err codevoid.de 70 i- scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor); Err codevoid.de 70 i- scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor); Err codevoid.de 70 i- scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor); Err codevoid.de 70 i- scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor); Err codevoid.de 70 i- scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor); Err codevoid.de 70 i+ scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 3); Err codevoid.de 70 i+ scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 3); Err codevoid.de 70 i /* init bars */ Err codevoid.de 70 i updatebars(); Err codevoid.de 70 i updatestatus(); Err codevoid.de 70 it@@ -1751,7 +1744,7 @@ unfocus(Client *c, int setfocus) Err codevoid.de 70 i if (!c) Err codevoid.de 70 i return; Err codevoid.de 70 i grabbuttons(c, 0); Err codevoid.de 70 i- XSetWindowBorder(dpy, c->win, Err codevoid.de 70 .