X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.h;h=43a57bf6fe4ce49599e861c9fcb9e2e97df76134;hp=710087f4de0ab24bcae6c2a33fe6c78f36087bfe;hb=2255bf46a0af475e70fb4cc90d912b435f21eb5e;hpb=39677ec76616fe4165ef92afb14db2bef2488e30

diff --git a/draw.h b/draw.h
index 710087f..43a57bf 100644
--- a/draw.h
+++ b/draw.h
@@ -1,35 +1,35 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 
-#include <X11/Xlib.h>
-#include <X11/Xlocale.h>
+#define FG(dc, col)  ((col)[(dc)->invert ? ColBG : ColFG])
+#define BG(dc, col)  ((col)[(dc)->invert ? ColFG : ColBG])
 
-typedef struct Brush Brush;
-typedef struct Fnt Fnt;
+enum { ColBG, ColFG, ColBorder, ColLast };
 
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-	int height;
-};
-
-struct Brush {
+typedef struct {
+	int x, y, w, h;
+	Bool invert;
+	Display *dpy;
 	GC gc;
-	Drawable drawable;
-	XRectangle rect;
-	Fnt font;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
-};
+	Pixmap canvas;
+	struct {
+		int ascent;
+		int descent;
+		int height;
+		int width;
+		XFontSet set;
+		XFontStruct *xfont;
+	} font;
+} DC;  /* draw context */
 
-extern void draw(Display *dpy, Brush *b, Bool border, const char *text);
-extern void loadcolors(Display *dpy, int screen, Brush *b,
-		const char *bg, const char *fg, const char *bo);
-extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
-extern unsigned int textwidth_l(Fnt *font, char *text, unsigned int len);
-extern unsigned int textwidth(Fnt *font, char *text);
+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);