continued with draw.c and draw.h implementation, now the integration begins

[dwm.git] / draw.h

diff --git a/draw.h b/draw.h
index 4cd6fb1..17d2c89 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -1,36 +1,64 @@
-/*
- * (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>
-
-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 ascent;
        int descent;

-       int height;
+       unsigned int h;
+       XFontSet set;
+       XFontStruct *xfont;

 };
 };

+typedef struct _XFont Fnt;

 
 

-struct Brush {
-       GC gc;
+typedef struct _XDraw Draw;
+struct _XDraw {
+       unsigned int w, h;
+       Display *dpy;
+       int screen;
+       Window win;

        Drawable drawable;
        Drawable drawable;

-       int x, y, w, h;
-       Fnt font;
-       unsigned long bg;
-       unsigned long fg;
-       unsigned long border;
+       GC gc;
+       Col *fg;
+       Col *bg;
+       Fnt *font;

 };
 
 };
 

-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 textnw(Fnt *font, char *text, unsigned int len);
-extern unsigned int textw(Fnt *font, char *text);
-extern unsigned int texth(Fnt *font);
+typedef struct {
+       unsigned int w;
+       unsigned int h;
+       int xOff;
+       int yOff;
+} TextExtents;
+
+/* Drawable abstraction */
+Draw *draw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
+void draw_resize(Draw *draw, unsigned int w, unsigned int h);
+void draw_free(Draw *draw);
+
+/* Fnt abstraction */
+Fnt *draw_font_create(Draw *draw, const char *fontname);
+void draw_font_free(Draw *draw, Fnt *font);
+
+/* Colour abstraction */
+Col *draw_col_create(Draw *draw, const char *colname);
+void draw_col_free(Draw *draw, Col *col);
+
+/* Drawing context manipulation */
+void draw_setfont(Draw *draw, Fnt *font);
+void draw_setfg(Draw *draw, Col *col);
+void draw_setbg(Draw *draw, Col *col);
+
+/* Drawing functions */
+void draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h, Bool filled, Bool empty, Bool invert);
+void draw_text(Draw *draw, int x, int y, unsigned int w, unsigned int h, const char *text, Bool invert);
+
+/* Map functions */
+void draw_map(Draw *draw, int x, int y, unsigned int w, unsigned int h);
+
+/* Text functions */
+void draw_getextents(Draw *draw, const char *text, unsigned int len, TextExtents *extents);
+