continued with draw.c abstraction, also started util.{h,c} implementation, that will...

[dwm.git] / draw.h

diff --git a/draw.h b/draw.h
index d1a2f37bbfe9817726eeb5f6dd263cdfb947159b..0c811ab27072953452dfe0ff3fe8ca6da64ade3e 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -8,7 +8,7 @@ typedef struct _XCol Col;
 struct _XFont {
        int ascent;
        int descent;
-       unsigned int h, w;
+       unsigned int h;
        XFontSet set;
        XFontStruct *xfont;
 };
@@ -45,12 +45,12 @@ void draw_resize(Draw *draw, unsigned int w, unsigned int h);
 void draw_free(Draw *draw);
 
 /* Fnt abstraction */
-Fnt *font_create(const char *fontname);
-void font_free(Fnt *font);
+Fnt *draw_font_create(Draw *draw, const char *fontname);
+void draw_font_free(Draw *draw, Fnt *font);
 
 /* Colour abstraction */
-Col *col_create(const char *colname);
-void col_free(Col *col);
+Col *draw_col_create(Draw *draw, const char *colname);
+void draw_col_free(Draw *draw, Col *col);
 
 /* Drawing context manipulation */
 void draw_setfont(Draw *draw, Fnt *font);