removed colors from dc

[dmenu.git] / draw.h

diff --git a/draw.h b/draw.h
index b6615ab..1705909 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -6,9 +6,8 @@ enum { ColFG, ColBG, ColLast };
 /* typedefs */
 typedef struct {
        int x, y, w, h;
 /* typedefs */
 typedef struct {
        int x, y, w, h;

-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];

        Drawable drawable;
        Drawable drawable;

+       Display *dpy;

        GC gc;
        struct {
                XFontStruct *xfont;
        GC gc;
        struct {
                XFontStruct *xfont;


@@ -20,25 +19,14 @@ typedef struct {
 } DC; /* draw context */
 
 /* forward declarations */
 } DC; /* draw context */
 
 /* forward declarations */

-void drawcleanup(void);
-void drawsetup(void);
-void drawtext(const char *text, unsigned long col[ColLast]);
-void eprint(const char *errstr, ...);
-unsigned long getcolor(const char *colstr);
-void initfont(const char *fontstr);
-int textnw(const char *text, unsigned int len);
-int textw(const char *text);
+void cleanupdraw(DC *dc);
+void setupdraw(DC *dc, Window w);
+void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
+void eprint(const char *fmt, ...);
+unsigned long getcolor(DC *dc, const char *colstr);
+void initfont(DC *dc, const char *fontstr);
+int textnw(DC *dc, const char *text, unsigned int len);
+int textw(DC *dc, const char *text);

 
 /* variables */
 
 /* variables */

-extern Display *dpy;
-extern DC dc;
-extern int screen;
-extern unsigned int mw, mh;
-extern Window parent;
-
-/* style */
-extern const char *font;
-extern const char *normbgcolor;
-extern const char *normfgcolor;
-extern const char *selbgcolor;
-extern const char *selfgcolor;
+extern const char *progname;