cache option in config.mk

[dmenu.git] / draw.h

diff --git a/draw.h b/draw.h
index 1705909..ac3943f 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -1,32 +1,37 @@
 /* See LICENSE file for copyright and license details. */
 
 /* See LICENSE file for copyright and license details. */
 

-/* enums */
-enum { ColFG, ColBG, ColLast };
+#define FG(dc, col)  ((col)[(dc)->invert ? ColBG : ColFG])
+#define BG(dc, col)  ((col)[(dc)->invert ? ColFG : ColBG])
+
+enum { ColBG, ColFG, ColBorder, ColLast };

 
 

-/* typedefs */

 typedef struct {
        int x, y, w, h;
 typedef struct {
        int x, y, w, h;

-       Drawable drawable;
+       Bool invert;

        Display *dpy;
        GC gc;
        Display *dpy;
        GC gc;

+       Pixmap canvas;

        struct {
        struct {

-               XFontStruct *xfont;
-               XFontSet set;

                int ascent;
                int descent;
                int height;
                int ascent;
                int descent;
                int height;

+               XFontSet set;
+               XFontStruct *xfont;

        } font;
        } font;

-} DC; /* draw context */
+} DC;  /* draw context */

 
 

-/* forward declarations */
-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);
 unsigned long getcolor(DC *dc, const char *colstr);

+void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
+void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
+void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);

 void initfont(DC *dc, const char *fontstr);
 void initfont(DC *dc, const char *fontstr);

-int textnw(DC *dc, const char *text, unsigned int len);
+void freedc(DC *dc);
+DC *initdc(void);
+void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
+void resizedc(DC *dc, unsigned int w, unsigned int h);
+int textnw(DC *dc, const char *text, size_t len);

 int textw(DC *dc, const char *text);
 int textw(DC *dc, const char *text);

+void eprintf(const char *fmt, ...);
+void weprintf(const char *fmt, ...);

 
 

-/* variables */
-extern const char *progname;
+const char *progname;