tonitch/sent
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

drw: fixup font handling

Browse Source
This commit is contained in:
Markus Teich
2015-04-21 22:57:52 +02:00
parent 85d25716b0
commit 4993b300f3
2 changed files with 75 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drw.h
View File

@ -5,14 +5,16 @@ typedef struct {
Cursor cursor;
} Cur;
typedef struct {
typedef struct Fnt Fnt;
struct Fnt {
Display *dpy;
int ascent;
int descent;
unsigned int h;
XftFont *xfont;
FcPattern *pattern;
} Fnt;
Fnt *next;
};
typedef struct {
struct {
@ -29,8 +31,7 @@ typedef struct {
Drawable drawable;
GC gc;
Scm *scheme;
size_t fontcount;
Fnt *fonts[DRW_FONT_CACHE_SIZE];
Fnt *fonts;
} Drw;
/* Drawable abstraction */
@ -39,9 +40,9 @@ 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);
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
void drw_fontset_free(Fnt* set);
unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
/* Colorscheme abstraction */
@ -53,7 +54,7 @@ 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_setfontset(Drw *drw, Fnt *set);
void drw_setscheme(Drw *drw, Scm *scm);
/* Drawing functions */