- libdraw, util: add drw.{c,h}, util.{c,h} and update code.
- libdraw: fix drw_rect(): use w and h parameter.
- libdraw: print errstr if last character in string was ":" (sbase).
- libdraw: drw_clr_free() allow valid free(NULL).
- config.def.h: set default font to monospace.
- cleanup() on exit.
- LICENSE: update license string for dmenu -v to 2015.
- LICENSE: add myself to LICENSE
master
Hiltjo Posthuma
10 years ago
committed by
Anselm R Garbe
parent
13a529ce63
commit
4b1fecd44e
11 changed files with 684 additions and 316 deletions
@ -1,177 +0,0 @@ |
||||
/* See LICENSE file for copyright and license details. */ |
||||
#include <locale.h> |
||||
#include <stdarg.h> |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <string.h> |
||||
#include <X11/Xlib.h> |
||||
#include "draw.h" |
||||
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b)) |
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b)) |
||||
#define DEFAULTFN "fixed" |
||||
|
||||
static Bool loadfont(DC *dc, const char *fontstr); |
||||
|
||||
void |
||||
drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) { |
||||
XSetForeground(dc->dpy, dc->gc, color); |
||||
if(fill) |
||||
XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h); |
||||
else |
||||
XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1); |
||||
} |
||||
|
||||
void |
||||
drawtext(DC *dc, const char *text, unsigned long col[ColLast]) { |
||||
char buf[BUFSIZ]; |
||||
size_t mn, n = strlen(text); |
||||
|
||||
/* shorten text if necessary */ |
||||
for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--) |
||||
if(mn == 0) |
||||
return; |
||||
memcpy(buf, text, mn); |
||||
if(mn < n) |
||||
for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.'); |
||||
|
||||
drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col)); |
||||
drawtextn(dc, buf, mn, col); |
||||
} |
||||
|
||||
void |
||||
drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) { |
||||
int x = dc->x + dc->font.height/2; |
||||
int y = dc->y + dc->font.ascent+1; |
||||
|
||||
XSetForeground(dc->dpy, dc->gc, FG(dc, col)); |
||||
if(dc->font.set) |
||||
XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n); |
||||
else { |
||||
XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid); |
||||
XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n); |
||||
} |
||||
} |
||||
|
||||
void |
||||
eprintf(const char *fmt, ...) { |
||||
va_list ap; |
||||
|
||||
va_start(ap, fmt); |
||||
vfprintf(stderr, fmt, ap); |
||||
va_end(ap); |
||||
|
||||
if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') { |
||||
fputc(' ', stderr); |
||||
perror(NULL); |
||||
} |
||||
exit(EXIT_FAILURE); |
||||
} |
||||
|
||||
void |
||||
freedc(DC *dc) { |
||||
if(dc->font.set) |
||||
XFreeFontSet(dc->dpy, dc->font.set); |
||||
if(dc->font.xfont) |
||||
XFreeFont(dc->dpy, dc->font.xfont); |
||||
if(dc->canvas) |
||||
XFreePixmap(dc->dpy, dc->canvas); |
||||
XFreeGC(dc->dpy, dc->gc); |
||||
XCloseDisplay(dc->dpy); |
||||
free(dc); |
||||
} |
||||
|
||||
unsigned long |
||||
getcolor(DC *dc, const char *colstr) { |
||||
Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)); |
||||
XColor color; |
||||
|
||||
if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color)) |
||||
eprintf("cannot allocate color '%s'\n", colstr); |
||||
return color.pixel; |
||||
} |
||||
|
||||
DC * |
||||
initdc(void) { |
||||
DC *dc; |
||||
|
||||
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) |
||||
fputs("no locale support\n", stderr); |
||||
if(!(dc = calloc(1, sizeof *dc))) |
||||
eprintf("cannot malloc %u bytes:", sizeof *dc); |
||||
if(!(dc->dpy = XOpenDisplay(NULL))) |
||||
eprintf("cannot open display\n"); |
||||
|
||||
dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL); |
||||
XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter); |
||||
return dc; |
||||
} |
||||
|
||||
void |
||||
initfont(DC *dc, const char *fontstr) { |
||||
if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) { |
||||
if(fontstr != NULL) |
||||
fprintf(stderr, "cannot load font '%s'\n", fontstr); |
||||
if(fontstr == NULL || !loadfont(dc, DEFAULTFN)) |
||||
eprintf("cannot load font '%s'\n", DEFAULTFN); |
||||
} |
||||
dc->font.height = dc->font.ascent + dc->font.descent; |
||||
} |
||||
|
||||
Bool |
||||
loadfont(DC *dc, const char *fontstr) { |
||||
char *def, **missing, **names; |
||||
int i, n; |
||||
XFontStruct **xfonts; |
||||
|
||||
if(!*fontstr) |
||||
return False; |
||||
if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) { |
||||
n = XFontsOfFontSet(dc->font.set, &xfonts, &names); |
||||
for(i = 0; i < n; i++) { |
||||
dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent); |
||||
dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent); |
||||
dc->font.width = MAX(dc->font.width, xfonts[i]->max_bounds.width); |
||||
} |
||||
} |
||||
else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { |
||||
dc->font.ascent = dc->font.xfont->ascent; |
||||
dc->font.descent = dc->font.xfont->descent; |
||||
dc->font.width = dc->font.xfont->max_bounds.width; |
||||
} |
||||
if(missing) |
||||
XFreeStringList(missing); |
||||
return dc->font.set || dc->font.xfont; |
||||
} |
||||
|
||||
void |
||||
mapdc(DC *dc, Window win, unsigned int w, unsigned int h) { |
||||
XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0); |
||||
} |
||||
|
||||
void |
||||
resizedc(DC *dc, unsigned int w, unsigned int h) { |
||||
if(dc->canvas) |
||||
XFreePixmap(dc->dpy, dc->canvas); |
||||
|
||||
dc->w = w; |
||||
dc->h = h; |
||||
dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h, |
||||
DefaultDepth(dc->dpy, DefaultScreen(dc->dpy))); |
||||
} |
||||
|
||||
int |
||||
textnw(DC *dc, const char *text, size_t len) { |
||||
if(dc->font.set) { |
||||
XRectangle r; |
||||
|
||||
XmbTextExtents(dc->font.set, text, len, NULL, &r); |
||||
return r.width; |
||||
} |
||||
return XTextWidth(dc->font.xfont, text, len); |
||||
} |
||||
|
||||
int |
||||
textw(DC *dc, const char *text) { |
||||
return textnw(dc, text, strlen(text)) + dc->font.height; |
||||
} |
||||
@ -1,35 +0,0 @@ |
||||
/* See LICENSE file for copyright and license details. */ |
||||
|
||||
#define FG(dc, col) ((col)[(dc)->invert ? ColBG : ColFG]) |
||||
#define BG(dc, col) ((col)[(dc)->invert ? ColFG : ColBG]) |
||||
|
||||
enum { ColBG, ColFG, ColBorder, ColLast }; |
||||
|
||||
typedef struct { |
||||
int x, y, w, h; |
||||
Bool invert; |
||||
Display *dpy; |
||||
GC gc; |
||||
Pixmap canvas; |
||||
struct { |
||||
int ascent; |
||||
int descent; |
||||
int height; |
||||
int width; |
||||
XFontSet set; |
||||
XFontStruct *xfont; |
||||
} font; |
||||
} DC; /* draw context */ |
||||
|
||||
void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color); |
||||
void drawtext(DC *dc, const char *text, unsigned long col[ColLast]); |
||||
void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]); |
||||
void eprintf(const char *fmt, ...); |
||||
void freedc(DC *dc); |
||||
unsigned long getcolor(DC *dc, const char *colstr); |
||||
DC *initdc(void); |
||||
void initfont(DC *dc, const char *fontstr); |
||||
void mapdc(DC *dc, Window win, unsigned int w, unsigned int h); |
||||
void resizedc(DC *dc, unsigned int w, unsigned int h); |
||||
int textnw(DC *dc, const char *text, size_t len); |
||||
int textw(DC *dc, const char *text); |
||||
@ -0,0 +1,413 @@ |
||||
/* See LICENSE file for copyright and license details. */ |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <string.h> |
||||
#include <X11/Xlib.h> |
||||
#include <X11/Xft/Xft.h> |
||||
|
||||
#include "drw.h" |
||||
#include "util.h" |
||||
|
||||
#define UTF_INVALID 0xFFFD |
||||
#define UTF_SIZ 4 |
||||
|
||||
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; |
||||
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; |
||||
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; |
||||
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; |
||||
|
||||
static long |
||||
utf8decodebyte(const char c, size_t *i) { |
||||
for(*i = 0; *i < (UTF_SIZ + 1); ++(*i)) |
||||
if(((unsigned char)c & utfmask[*i]) == utfbyte[*i]) |
||||
return (unsigned char)c & ~utfmask[*i]; |
||||
return 0; |
||||
} |
||||
|
||||
static size_t |
||||
utf8validate(long *u, size_t i) { |
||||
if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) |
||||
*u = UTF_INVALID; |
||||
for(i = 1; *u > utfmax[i]; ++i) |
||||
; |
||||
return i; |
||||
} |
||||
|
||||
static size_t |
||||
utf8decode(const char *c, long *u, size_t clen) { |
||||
size_t i, j, len, type; |
||||
long udecoded; |
||||
|
||||
*u = UTF_INVALID; |
||||
if(!clen) |
||||
return 0; |
||||
udecoded = utf8decodebyte(c[0], &len); |
||||
if(!BETWEEN(len, 1, UTF_SIZ)) |
||||
return 1; |
||||
for(i = 1, j = 1; i < clen && j < len; ++i, ++j) { |
||||
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); |
||||
if(type != 0) |
||||
return j; |
||||
} |
||||
if(j < len) |
||||
return 0; |
||||
*u = udecoded; |
||||
utf8validate(u, len); |
||||
return len; |
||||
} |
||||
|
||||
Drw * |
||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) { |
||||
Drw *drw = (Drw *)calloc(1, sizeof(Drw)); |
||||
if(!drw) |
||||
return NULL; |
||||
drw->dpy = dpy; |
||||
drw->screen = screen; |
||||
drw->root = root; |
||||
drw->w = w; |
||||
drw->h = h; |
||||
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); |
||||
drw->gc = XCreateGC(dpy, root, 0, NULL); |
||||
drw->fontcount = 0; |
||||
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); |
||||
return drw; |
||||
} |
||||
|
||||
void |
||||
drw_resize(Drw *drw, unsigned int w, unsigned int h) { |
||||
if(!drw) |
||||
return; |
||||
drw->w = w; |
||||
drw->h = h; |
||||
if(drw->drawable != 0) |
||||
XFreePixmap(drw->dpy, drw->drawable); |
||||
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); |
||||
} |
||||
|
||||
void |
||||
drw_free(Drw *drw) { |
||||
size_t i; |
||||
|
||||
for (i = 0; i < drw->fontcount; i++) { |
||||
drw_font_free(drw->fonts[i]); |
||||
} |
||||
XFreePixmap(drw->dpy, drw->drawable); |
||||
XFreeGC(drw->dpy, drw->gc); |
||||
free(drw); |
||||
} |
||||
|
||||
/* This function is an implementation detail. Library users should use
|
||||
* drw_font_create instead. |
||||
*/ |
||||
static Fnt * |
||||
drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) { |
||||
Fnt *font; |
||||
|
||||
if (!(fontname || fontpattern)) |
||||
die("No font specified.\n"); |
||||
|
||||
if (!(font = (Fnt *)calloc(1, sizeof(Fnt)))) |
||||
return NULL; |
||||
|
||||
if (fontname) { |
||||
/* Using the pattern found at font->xfont->pattern does not yield same
|
||||
* the same substitution results as using the pattern returned by |
||||
* FcNameParse; using the latter results in the desired fallback |
||||
* behaviour whereas the former just results in |
||||
* missing-character-rectangles being drawn, at least with some fonts. |
||||
*/ |
||||
if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) || |
||||
!(font->pattern = FcNameParse((FcChar8 *) fontname))) { |
||||
if (font->xfont) { |
||||
XftFontClose(drw->dpy, font->xfont); |
||||
font->xfont = NULL; |
||||
} |
||||
fprintf(stderr, "error, cannot load font: '%s'\n", fontname); |
||||
} |
||||
} else if (fontpattern) { |
||||
if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { |
||||
fprintf(stderr, "error, cannot load font pattern.\n"); |
||||
} else { |
||||
font->pattern = NULL; |
||||
} |
||||
} |
||||
|
||||
if (!font->xfont) { |
||||
free(font); |
||||
return NULL; |
||||
} |
||||
|
||||
font->ascent = font->xfont->ascent; |
||||
font->descent = font->xfont->descent; |
||||
font->h = font->ascent + font->descent; |
||||
font->dpy = drw->dpy; |
||||
return font; |
||||
} |
||||
|
||||
Fnt* |
||||
drw_font_create(Drw *drw, const char *fontname) { |
||||
return drw_font_xcreate(drw, fontname, NULL); |
||||
} |
||||
|
||||
void |
||||
drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) { |
||||
size_t i; |
||||
Fnt *font; |
||||
|
||||
for (i = 0; i < fontcount; i++) { |
||||
if (drw->fontcount >= DRW_FONT_CACHE_SIZE) { |
||||
die("Font cache exhausted.\n"); |
||||
} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) { |
||||
drw->fonts[drw->fontcount++] = font; |
||||
} |
||||
} |
||||
} |
||||
|
||||
void |
||||
drw_font_free(Fnt *font) { |
||||
if(!font) |
||||
return; |
||||
if(font->pattern) |
||||
FcPatternDestroy(font->pattern); |
||||
XftFontClose(font->dpy, font->xfont); |
||||
free(font); |
||||
} |
||||
|
||||
Clr * |
||||
drw_clr_create(Drw *drw, const char *clrname) { |
||||
Clr *clr; |
||||
Colormap cmap; |
||||
Visual *vis; |
||||
|
||||
if(!drw) |
||||
return NULL; |
||||
clr = (Clr *)calloc(1, sizeof(Clr)); |
||||
if(!clr) |
||||
return NULL; |
||||
cmap = DefaultColormap(drw->dpy, drw->screen); |
||||
vis = DefaultVisual(drw->dpy, drw->screen); |
||||
if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb)) |
||||
die("error, cannot allocate color '%s'\n", clrname); |
||||
clr->pix = clr->rgb.pixel; |
||||
return clr; |
||||
} |
||||
|
||||
void |
||||
drw_clr_free(Clr *clr) { |
||||
free(clr); |
||||
} |
||||
|
||||
void |
||||
drw_setscheme(Drw *drw, ClrScheme *scheme) { |
||||
if(!drw) |
||||
return; |
||||
drw->scheme = scheme; |
||||
} |
||||
|
||||
void |
||||
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) { |
||||
if(!drw || !drw->scheme) |
||||
return; |
||||
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix); |
||||
if(filled) |
||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1); |
||||
else if(empty) |
||||
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); |
||||
} |
||||
|
||||
int |
||||
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) { |
||||
char buf[1024]; |
||||
int tx, ty, th; |
||||
Extnts tex; |
||||
Colormap cmap; |
||||
Visual *vis; |
||||
XftDraw *d; |
||||
Fnt *curfont, *nextfont; |
||||
size_t i, len; |
||||
int utf8strlen, utf8charlen, render; |
||||
long utf8codepoint = 0; |
||||
const char *utf8str; |
||||
FcCharSet *fccharset; |
||||
FcPattern *fcpattern; |
||||
FcPattern *match; |
||||
XftResult result; |
||||
int charexists = 0; |
||||
|
||||
if (!(render = x || y || w || h)) { |
||||
w = ~w; |
||||
} |
||||
|
||||
if (!drw || !drw->scheme) { |
||||
return 0; |
||||
} else if (render) { |
||||
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix); |
||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); |
||||
} |
||||
|
||||
if (!text || !drw->fontcount) { |
||||
return 0; |
||||
} else if (render) { |
||||
cmap = DefaultColormap(drw->dpy, drw->screen); |
||||
vis = DefaultVisual(drw->dpy, drw->screen); |
||||
d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap); |
||||
} |
||||
|
||||
curfont = drw->fonts[0]; |
||||
while (1) { |
||||
utf8strlen = 0; |
||||
utf8str = text; |
||||
nextfont = NULL; |
||||
while (*text) { |
||||
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); |
||||
for (i = 0; i < drw->fontcount; i++) { |
||||
charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint); |
||||
if (charexists) { |
||||
if (drw->fonts[i] == curfont) { |
||||
utf8strlen += utf8charlen; |
||||
text += utf8charlen; |
||||
} else { |
||||
nextfont = drw->fonts[i]; |
||||
} |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (!charexists || (nextfont && nextfont != curfont)) { |
||||
break; |
||||
} else { |
||||
charexists = 0; |
||||
} |
||||
} |
||||
|
||||
if (utf8strlen) { |
||||
drw_font_getexts(curfont, utf8str, utf8strlen, &tex); |
||||
/* shorten text if necessary */ |
||||
for(len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--) |
||||
drw_font_getexts(curfont, utf8str, len, &tex); |
||||
|
||||
if (len) { |
||||
memcpy(buf, utf8str, len); |
||||
buf[len] = '\0'; |
||||
if(len < utf8strlen) |
||||
for(i = len; i && i > len - 3; buf[--i] = '.'); |
||||
|
||||
if (render) { |
||||
th = curfont->ascent + curfont->descent; |
||||
ty = y + (h / 2) - (th / 2) + curfont->ascent; |
||||
tx = x + (h / 2); |
||||
XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len); |
||||
} |
||||
|
||||
x += tex.w; |
||||
w -= tex.w; |
||||
} |
||||
} |
||||
|
||||
if (!*text) { |
||||
break; |
||||
} else if (nextfont) { |
||||
charexists = 0; |
||||
curfont = nextfont; |
||||
} else { |
||||
/* Regardless of whether or not a fallback font is found, the
|
||||
* character must be drawn. |
||||
*/ |
||||
charexists = 1; |
||||
|
||||
if (drw->fontcount >= DRW_FONT_CACHE_SIZE) { |
||||
continue; |
||||
} |
||||
|
||||
fccharset = FcCharSetCreate(); |
||||
FcCharSetAddChar(fccharset, utf8codepoint); |
||||
|
||||
if (!drw->fonts[0]->pattern) { |
||||
/* Refer to the comment in drw_font_xcreate for more
|
||||
* information. |
||||
*/ |
||||
die("The first font in the cache must be loaded from a font string.\n"); |
||||
} |
||||
|
||||
fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern); |
||||
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); |
||||
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); |
||||
|
||||
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); |
||||
FcDefaultSubstitute(fcpattern); |
||||
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); |
||||
|
||||
FcCharSetDestroy(fccharset); |
||||
FcPatternDestroy(fcpattern); |
||||
|
||||
if (match) { |
||||
curfont = drw_font_xcreate(drw, NULL, match); |
||||
if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) { |
||||
drw->fonts[drw->fontcount++] = curfont; |
||||
} else { |
||||
if (curfont) { |
||||
drw_font_free(curfont); |
||||
} |
||||
curfont = drw->fonts[0]; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
if (render) { |
||||
XftDrawDestroy(d); |
||||
} |
||||
|
||||
return x; |
||||
} |
||||
|
||||
void |
||||
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) { |
||||
if(!drw) |
||||
return; |
||||
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); |
||||
XSync(drw->dpy, False); |
||||
} |
||||
|
||||
|
||||
void |
||||
drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) { |
||||
XGlyphInfo ext; |
||||
|
||||
if(!font || !text) |
||||
return; |
||||
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); |
||||
tex->h = font->h; |
||||
tex->w = ext.xOff; |
||||
} |
||||
|
||||
unsigned int |
||||
drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) { |
||||
Extnts tex; |
||||
|
||||
if(!font) |
||||
return -1; |
||||
drw_font_getexts(font, text, len, &tex); |
||||
return tex.w; |
||||
} |
||||
|
||||
Cur * |
||||
drw_cur_create(Drw *drw, int shape) { |
||||
Cur *cur; |
||||
|
||||
if(!drw) |
||||
return NULL; |
||||
cur = (Cur *)calloc(1, sizeof(Cur)); |
||||
if (!cur) |
||||
return NULL; |
||||
cur->cursor = XCreateFontCursor(drw->dpy, shape); |
||||
return cur; |
||||
} |
||||
|
||||
void |
||||
drw_cur_free(Drw *drw, Cur *cursor) { |
||||
if(!drw || !cursor) |
||||
return; |
||||
XFreeCursor(drw->dpy, cursor->cursor); |
||||
free(cursor); |
||||
} |
||||
@ -0,0 +1,74 @@ |
||||
/* See LICENSE file for copyright and license details. */ |
||||
#define DRW_FONT_CACHE_SIZE 32 |
||||
|
||||
typedef struct { |
||||
unsigned long pix; |
||||
XftColor rgb; |
||||
} Clr; |
||||
|
||||
typedef struct { |
||||
Cursor cursor; |
||||
} Cur; |
||||
|
||||
typedef struct { |
||||
Display *dpy; |
||||
int ascent; |
||||
int descent; |
||||
unsigned int h; |
||||
XftFont *xfont; |
||||
FcPattern *pattern; |
||||
} Fnt; |
||||
|
||||
typedef struct { |
||||
Clr *fg; |
||||
Clr *bg; |
||||
Clr *border; |
||||
} ClrScheme; |
||||
|
||||
typedef struct { |
||||
unsigned int w, h; |
||||
Display *dpy; |
||||
int screen; |
||||
Window root; |
||||
Drawable drawable; |
||||
GC gc; |
||||
ClrScheme *scheme; |
||||
size_t fontcount; |
||||
Fnt *fonts[DRW_FONT_CACHE_SIZE]; |
||||
} Drw; |
||||
|
||||
typedef struct { |
||||
unsigned int w; |
||||
unsigned int h; |
||||
} Extnts; |
||||
|
||||
/* Drawable abstraction */ |
||||
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); |
||||
void drw_resize(Drw *drw, unsigned int w, unsigned int h); |
||||
void drw_free(Drw *drw); |
||||
|
||||
/* Fnt abstraction */ |
||||
Fnt *drw_font_create(Drw *drw, const char *fontname); |
||||
void drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount); |
||||
void drw_font_free(Fnt *font); |
||||
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *extnts); |
||||
unsigned int drw_font_getexts_width(Fnt *font, const char *text, unsigned int len); |
||||
|
||||
/* Colour abstraction */ |
||||
Clr *drw_clr_create(Drw *drw, const char *clrname); |
||||
void drw_clr_free(Clr *clr); |
||||
|
||||
/* Cursor abstraction */ |
||||
Cur *drw_cur_create(Drw *drw, int shape); |
||||
void drw_cur_free(Drw *drw, Cur *cursor); |
||||
|
||||
/* Drawing context manipulation */ |
||||
void drw_setfont(Drw *drw, Fnt *font); |
||||
void drw_setscheme(Drw *drw, ClrScheme *scheme); |
||||
|
||||
/* Drawing functions */ |
||||
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert); |
||||
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert); |
||||
|
||||
/* Map functions */ |
||||
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); |
||||
@ -0,0 +1,23 @@ |
||||
/* See LICENSE file for copyright and license details. */ |
||||
#include <stdarg.h> |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <string.h> |
||||
|
||||
#include "util.h" |
||||
|
||||
void |
||||
die(const char *fmt, ...) { |
||||
va_list ap; |
||||
|
||||
va_start(ap, fmt); |
||||
vfprintf(stderr, fmt, ap); |
||||
va_end(ap); |
||||
|
||||
if (fmt[0] && fmt[strlen(fmt)-1] == ':') { |
||||
fputc(' ', stderr); |
||||
perror(NULL); |
||||
} |
||||
|
||||
exit(1); |
||||
} |
||||
Loading…
Reference in new issue