rebind ^N ^P

[dmenu.git] / draw.h

diff --git a/draw.h b/draw.h
index b6615ab..43a57bf 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -1,44 +1,35 @@
 /* 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;

-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
-       Drawable drawable;
+       Bool invert;
+       Display *dpy;

        GC gc;
        GC gc;

+       Pixmap canvas;

        struct {
        struct {

-               XFontStruct *xfont;
-               XFontSet set;

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

+               int width;
+               XFontSet set;
+               XFontStruct *xfont;

        } font;
        } font;

-} 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);
-
-/* variables */
-extern Display *dpy;
-extern DC dc;
-extern int screen;
-extern unsigned int mw, mh;
-extern Window parent;
+} DC;  /* draw context */

 
 

-/* style */
-extern const char *font;
-extern const char *normbgcolor;
-extern const char *normfgcolor;
-extern const char *selbgcolor;
-extern const char *selfgcolor;
+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 eprintf(const char *fmt, ...);
+void freedc(DC *dc);
+unsigned long getcolor(DC *dc, const char *colstr);
+DC *initdc(void);
+void initfont(DC *dc, const char *fontstr);
+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);