suckless/dmenu
1
0
Fork 0
Code Activity

drw style improvements

Browse source 
this makes the code-style more consistent aswell.
This commit is contained in:
Hiltjo Posthuma 2015-09-27 23:56:02 +02:00
parent bc20c13db0
commit 03cb1ec55a
2 changed files with 106 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
drw.c
View file

@ -17,7 +17,8 @@ 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 const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
static long static long
utf8decodebyte(const char c, size_t *i) { utf8decodebyte(const char c, size_t *i)
{
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
return (unsigned char)c & ~utfmask[*i]; return (unsigned char)c & ~utfmask[*i];
@ -25,7 +26,8 @@ utf8decodebyte(const char c, size_t *i) {
} }
static size_t static size_t
utf8validate(long *u, size_t i) { utf8validate(long *u, size_t i)
{
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID; *u = UTF_INVALID;
for (i = 1; *u > utfmax[i]; ++i) for (i = 1; *u > utfmax[i]; ++i)
@ -34,7 +36,8 @@ utf8validate(long *u, size_t i) {
} }
static size_t static size_t
utf8decode(const char *c, long *u, size_t clen) { utf8decode(const char *c, long *u, size_t clen)
{
size_t i, j, len, type; size_t i, j, len, type;
long udecoded; long udecoded;
@ -46,20 +49,23 @@ utf8decode(const char *c, long *u, size_t clen) {
return 1; return 1;
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
if(type != 0) if (type)
return j; return j;
} }
if (j < len) if (j < len)
return 0; return 0;
*u = udecoded; *u = udecoded;
utf8validate(u, len); utf8validate(u, len);
return len; return len;
} }
Drw * Drw *
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) { drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
Drw *drw = (Drw *)calloc(1, sizeof(Drw)); {
if(!drw) Drw *drw;
if (!(drw = calloc(1, sizeof(Drw))))
return NULL; return NULL;
drw->dpy = dpy; drw->dpy = dpy;
drw->screen = screen; drw->screen = screen;
@ -70,27 +76,29 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
drw->gc = XCreateGC(dpy, root, 0, NULL); drw->gc = XCreateGC(dpy, root, 0, NULL);
drw->fontcount = 0; drw->fontcount = 0;
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
return drw; return drw;
} }
void void
drw_resize(Drw *drw, unsigned int w, unsigned int h) { drw_resize(Drw *drw, unsigned int w, unsigned int h)
{
if (!drw) if (!drw)
return; return;
drw->w = w; drw->w = w;
drw->h = h; drw->h = h;
if(drw->drawable != 0) if (drw->drawable)
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
} }
void void
drw_free(Drw *drw) { drw_free(Drw *drw)
{
size_t i; size_t i;
for (i = 0; i < drw->fontcount; i++) { for (i = 0; i < drw->fontcount; i++)
drw_font_free(drw->fonts[i]); drw_font_free(drw->fonts[i]);
}
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
XFreeGC(drw->dpy, drw->gc); XFreeGC(drw->dpy, drw->gc);
free(drw); free(drw);
@ -100,13 +108,14 @@ drw_free(Drw *drw) {
* drw_font_create instead. * drw_font_create instead.
*/ */
static Fnt * static Fnt *
drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) { drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
{
Fnt *font; Fnt *font;
if (!(fontname || fontpattern)) if (!(fontname || fontpattern))
die("No font specified.\n"); die("No font specified.\n");
if (!(font = (Fnt *)calloc(1, sizeof(Fnt)))) if (!(font = calloc(1, sizeof(Fnt))))
return NULL; return NULL;
if (fontname) { if (fontname) {
@ -125,12 +134,11 @@ drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) {
fprintf(stderr, "error, cannot load font: '%s'\n", fontname); fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
} }
} else if (fontpattern) { } else if (fontpattern) {
if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern)))
fprintf(stderr, "error, cannot load font pattern.\n"); fprintf(stderr, "error, cannot load font pattern.\n");
} else { else
font->pattern = NULL; font->pattern = NULL;
} }
}
if (!font->xfont) { if (!font->xfont) {
free(font); free(font);
@ -141,16 +149,19 @@ drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) {
font->descent = font->xfont->descent; font->descent = font->xfont->descent;
font->h = font->ascent + font->descent; font->h = font->ascent + font->descent;
font->dpy = drw->dpy; font->dpy = drw->dpy;
return font; return font;
} }
Fnt* Fnt*
drw_font_create(Drw *drw, const char *fontname) { drw_font_create(Drw *drw, const char *fontname)
{
return drw_font_xcreate(drw, fontname, NULL); return drw_font_xcreate(drw, fontname, NULL);
} }
void void
drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) { drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
{
size_t i; size_t i;
Fnt *font; Fnt *font;
@ -164,7 +175,8 @@ drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
} }
void void
drw_font_free(Fnt *font) { drw_font_free(Fnt *font)
{
if (!font) if (!font)
return; return;
if (font->pattern) if (font->pattern)
@ -174,38 +186,42 @@ drw_font_free(Fnt *font) {
} }
Clr * Clr *
drw_clr_create(Drw *drw, const char *clrname) { drw_clr_create(Drw *drw, const char *clrname)
{
Clr *clr; Clr *clr;
Colormap cmap; Colormap cmap;
Visual *vis; Visual *vis;
if (!drw) if (!drw)
return NULL; return NULL;
clr = (Clr *)calloc(1, sizeof(Clr)); if (!(clr = calloc(1, sizeof(Clr))))
if(!clr)
return NULL; return NULL;
cmap = DefaultColormap(drw->dpy, drw->screen); cmap = DefaultColormap(drw->dpy, drw->screen);
vis = DefaultVisual(drw->dpy, drw->screen); vis = DefaultVisual(drw->dpy, drw->screen);
if (!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb)) if (!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb))
die("error, cannot allocate color '%s'\n", clrname); die("error, cannot allocate color '%s'\n", clrname);
clr->pix = clr->rgb.pixel; clr->pix = clr->rgb.pixel;
return clr; return clr;
} }
void void
drw_clr_free(Clr *clr) { drw_clr_free(Clr *clr)
{
free(clr); free(clr);
} }
void void
drw_setscheme(Drw *drw, ClrScheme *scheme) { drw_setscheme(Drw *drw, ClrScheme *scheme)
{
if (!drw) if (!drw)
return; return;
drw->scheme = scheme; drw->scheme = scheme;
} }
void void
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) { drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
{
if (!drw || !drw->scheme) if (!drw || !drw->scheme)
return; return;
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix); XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
@ -216,7 +232,8 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int
} }
int int
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) { drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
{
char buf[1024]; char buf[1024];
int tx, ty, th; int tx, ty, th;
Extnts tex; Extnts tex;
@ -234,9 +251,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
XftResult result; XftResult result;
int charexists = 0; int charexists = 0;
if (!(render = x || y || w || h)) { if (!(render = x || y || w || h))
w = ~w; w = ~w;
}
if (!drw || !drw->scheme) { if (!drw || !drw->scheme) {
return 0; return 0;
@ -273,12 +289,11 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
} }
} }
if (!charexists || (nextfont && nextfont != curfont)) { if (!charexists || (nextfont && nextfont != curfont))
break; break;
} else { else
charexists = 0; charexists = 0;
} }
}
if (utf8strlen) { if (utf8strlen) {
drw_font_getexts(curfont, utf8str, utf8strlen, &tex); drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
@ -298,7 +313,6 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
tx = x + (h / 2); tx = x + (h / 2);
XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len); XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
} }
x += tex.w; x += tex.w;
w -= tex.w; w -= tex.w;
} }
@ -315,17 +329,15 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
*/ */
charexists = 1; charexists = 1;
if (drw->fontcount >= DRW_FONT_CACHE_SIZE) { if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
continue; continue;
}
fccharset = FcCharSetCreate(); fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, utf8codepoint); FcCharSetAddChar(fccharset, utf8codepoint);
if (!drw->fonts[0]->pattern) { if (!drw->fonts[0]->pattern) {
/* Refer to the comment in drw_font_xcreate for more /* Refer to the comment in drw_font_xcreate for more
* information. * information. */
*/
die("The first font in the cache must be loaded from a font string.\n"); die("The first font in the cache must be loaded from a font string.\n");
} }
@ -345,33 +357,31 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) { if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
drw->fonts[drw->fontcount++] = curfont; drw->fonts[drw->fontcount++] = curfont;
} else { } else {
if (curfont) { if (curfont)
drw_font_free(curfont); drw_font_free(curfont);
}
curfont = drw->fonts[0]; curfont = drw->fonts[0];
} }
} }
} }
} }
if (render)
if (render) {
XftDrawDestroy(d); XftDrawDestroy(d);
}
return x; return x;
} }
void void
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) { drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
{
if (!drw) if (!drw)
return; return;
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
XSync(drw->dpy, False); XSync(drw->dpy, False);
} }
void void
drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) { drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
{
XGlyphInfo ext; XGlyphInfo ext;
if (!font || !text) if (!font || !text)
@ -382,7 +392,8 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) {
} }
unsigned int unsigned int
drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) { drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
{
Extnts tex; Extnts tex;
if (!font) if (!font)
@ -392,20 +403,22 @@ drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) {
} }
Cur * Cur *
drw_cur_create(Drw *drw, int shape) { drw_cur_create(Drw *drw, int shape)
{
Cur *cur; Cur *cur;
if (!drw) if (!drw)
return NULL; return NULL;
cur = (Cur *)calloc(1, sizeof(Cur)); if (!(cur = calloc(1, sizeof(Cur))))
if (!cur)
return NULL; return NULL;
cur->cursor = XCreateFontCursor(drw->dpy, shape); cur->cursor = XCreateFontCursor(drw->dpy, shape);
return cur; return cur;
} }
void void
drw_cur_free(Drw *drw, Cur *cursor) { drw_cur_free(Drw *drw, Cur *cursor)
{
if (!drw || !cursor) if (!drw || !cursor)
return; return;
XFreeCursor(drw->dpy, cursor->cursor); XFreeCursor(drw->dpy, cursor->cursor);

34
drw.h
View file

@ -43,32 +43,32 @@ typedef struct {
} Extnts; } Extnts;
/* Drawable abstraction */ /* Drawable abstraction */
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
void drw_resize(Drw *drw, unsigned int w, unsigned int h); void drw_resize(Drw *, unsigned int, unsigned int);
void drw_free(Drw *drw); void drw_free(Drw *);
/* Fnt abstraction */ /* Fnt abstraction */
Fnt *drw_font_create(Drw *drw, const char *fontname); Fnt *drw_font_create(Drw *, const char *);
void drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount); void drw_load_fonts(Drw *, const char *[], size_t);
void drw_font_free(Fnt *font); void drw_font_free(Fnt *);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *extnts); void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
unsigned int drw_font_getexts_width(Fnt *font, const char *text, unsigned int len); unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);
/* Colour abstraction */ /* Colour abstraction */
Clr *drw_clr_create(Drw *drw, const char *clrname); Clr *drw_clr_create(Drw *, const char *);
void drw_clr_free(Clr *clr); void drw_clr_free(Clr *);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *, int);
void drw_cur_free(Drw *drw, Cur *cursor); void drw_cur_free(Drw *, Cur *);
/* Drawing context manipulation */ /* Drawing context manipulation */
void drw_setfont(Drw *drw, Fnt *font); void drw_setfont(Drw *, Fnt *);
void drw_setscheme(Drw *drw, ClrScheme *scheme); void drw_setscheme(Drw *, ClrScheme *);
/* Drawing functions */ /* Drawing functions */
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert); void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert); int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int);
/* Map functions */ /* Map functions */
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);