X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.h;h=955067df54f0b7315905e373ed722af367ee0e00;hp=710087f4de0ab24bcae6c2a33fe6c78f36087bfe;hb=31451c3ad36cac5275d9a67c24d45887a9810114;hpb=39677ec76616fe4165ef92afb14db2bef2488e30

diff --git a/draw.h b/draw.h
index 710087f..955067d 100644
--- a/draw.h
+++ b/draw.h
@@ -1,35 +1,76 @@
-/*
- * (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>
+/* X11 types - begin */
+struct _XDraw {
+	unsigned int w, h;
+	Display *dpy;
+	Drawable drawable;
+	GC gc;
+};
+typedef struct _XDraw Draw;
 
-typedef struct Brush Brush;
-typedef struct Fnt Fnt;
+struct _XCol {
+	unsigned long rgb;
+};
+typedef struct _XCol Col;
 
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
+struct _XFont {
 	int ascent;
 	int descent;
-	int height;
+	unsigned int h, w;
+	XFontSet set;
+	XFontStruct *xfont;
 };
+typedef struct _XFont Fnt;
+/* X11 types - end */
 
-struct Brush {
-	GC gc;
-	Drawable drawable;
-	XRectangle rect;
-	Fnt font;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
-};
+typedef struct {
+	Draw *draw;
+	Col *fg;
+	Col *bg;
+	Fnt *font;
+	Bool fill;
+} DDC;
+
+typedef struct {
+	unsigned int w;
+	unsigned int h;
+	int x;
+	int y;
+	int xOff;
+	int yOff;
+} TextExtents;
+
+/* Drawable abstraction */
+Draw *draw_create(Display *dpy, Window win, unsigned int w, unsigned int h);
+void draw_resize(Draw *draw, unsigned int w, unsigned int h);
+void draw_free(Draw *draw);
+
+/* Drawing context abstraction */
+DDC *dc_create(Draw *draw);
+void dc_free(DDC *dc);
+
+/* Fnt abstraction */
+Fnt *font_create(const char *fontname);
+void font_free(Fnt *font);
+
+/* Colour abstraction */
+Col *col_create(const char *colname);
+void col_free(Col *col);
+
+/* Drawing context manipulation */
+void dc_setfont(DDC *dc, Fnt *font);
+void dc_setfg(DDC *dc, Col col);
+void dc_setbg(DDC *dc, Col col);
+void dc_setfill(DDC *dc, Bool fill);
+
+/* Drawing functions */
+void dc_drawrect(DDC *dc, int x, int y, unsigned int w, unsigned int h);
+void dc_drawtext(DDC *dc, int x, int y, const char *text);
+
+/* Map functions */
+void dc_map(DDC *dc, int x, int y, unsigned int w, unsigned int h);
+
+/* Text functions */
+void dc_getextents(DDC *dc, const char *text, TextExtents *extents);
 
-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);