applied Markus' decouple color-scheme patch

[dwm.git] / drw.h

diff --git a/drw.h b/drw.h
index 764b9e3..ff4355b 100644 (file)
--- a/drw.h
+++ b/drw.h
@@ -1,26 +1,19 @@
 /* See LICENSE file for copyright and license details. */
 
-typedef struct {
-       unsigned long rgb;
-} Clr;
-
 typedef struct {
        Cursor cursor;
 } Cur;
 
-typedef struct {
-       int ascent;
-       int descent;
+typedef struct Fnt {
+       Display *dpy;
        unsigned int h;
-       XFontSet set;
-       XFontStruct *xfont;
+       XftFont *xfont;
+       FcPattern *pattern;
+       struct Fnt *next;
 } Fnt;
 
-typedef struct {
-       Clr *fg;
-       Clr *bg;
-       Clr *border;
-} Theme;
+enum { ColFg, ColBg, ColCount }; /* Scm index */
+typedef XftColor *Scm;
 
 typedef struct {
        unsigned int w, h;
@@ -29,41 +22,36 @@ typedef struct {
        Window root;
        Drawable drawable;
        GC gc;
-       Theme *theme;
-       Fnt *font;
+       Scm scheme;
+       Fnt *fonts;
 } 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(Display *dpy, const char *fontname);
-void drw_font_free(Display *dpy, 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);
+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);
 
-/* Colour abstraction */
-Clr *drw_clr_create(Drw *drw, const char *clrname);
-void drw_clr_free(Clr *clr);
+/* Colorscheme abstraction */
+void drw_clr_create(Drw *drw, XftColor *dest, const char *clrname);
+Scm drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
 
 /* 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_settheme(Drw *drw, Theme *theme);
+void drw_setfontset(Drw *drw, Fnt *set);
+void drw_setscheme(Drw *drw, Scm scm);
 
 /* 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_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert);
+void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
 
 /* Map functions */
 void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);