removed DDC, all is Draw-dependent

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 04e7f0d..01436ea 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -5,12 +5,16 @@
 #include "draw.h"
 
 Draw *
-draw_create(Display *dpy, Window win, unsigned int w, unsigned int h) {
+draw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h) {
        Draw *draw = (Draw *)calloc(1, sizeof(Draw));
+       draw->dpy = dpy;
+       draw->screen = screen;
+       draw->win = win;
        draw->w = w;
        draw->h = h;
-       /* TODO: drawable creation */
-       /* TODO: gc allocation */
+       draw->drawable = XCreatePixmap(dpy, win, w, h, DefaultDepth(dpy, screen));
+       draw->gc = XCreateGC(dpy, win, 0, NULL);
+       XSetLineAttributes(dpy, draw->gc, 1, LineSolid, CapButt, JoinMiter);
        return draw;
 }
 
@@ -20,38 +24,17 @@ draw_resize(Draw *draw, unsigned int w, unsigned int h) {
                return;
        draw->w = w;
        draw->h = h;
-       /* TODO: resize drawable */
+       XFreePixmap(draw->dpy, draw->drawable);
+       draw->drawable = XCreatePixmap(draw->dpy, draw->win, w, h, DefaultDepth(draw->dpy, draw->screen));
 }
 
 void
 draw_free(Draw *draw) {
-       /* TODO: deallocate DDCs */
-       /* TODO: deallocate drawable */
+       XFreePixmap(draw->dpy, draw->drawable);
+       XFreeGC(draw->dpy, draw->gc);
        free(draw);
 }
 
-DDC *
-dc_create(Draw *draw) {
-       DDC *dc = (DDC *)calloc(1, sizeof(DDC));
-       dc->draw = draw;
-       dc->next = draw->dc;
-       draw->dc = dc;
-       return dc;
-}
-
-void
-dc_free(DDC *dc) {
-       DDC **tdc;
-
-       if(!dc)
-               return;
-       /* remove from dc list */
-       for(tdc = &dc->draw->dc; *tdc && *tdc != dc; tdc = &(*tdc)->next);
-       *tdc = dc->next;
-       /* TODO: deallocate any resources of this dc, if needed */
-       free(dc);
-}
-
 Fnt *
 font_create(const char *fontname) {
        Fnt *font = (Fnt *)calloc(1, sizeof(Fnt));
@@ -83,57 +66,50 @@ col_free(Col *col) {
 }
 
 void
-dc_setfont(DDC *dc, Fnt *font) {
-       if(!dc || !font)
+draw_setfont(Draw *draw, Fnt *font) {
+       if(!draw || !font)
                return;
-       dc->font = font;
+       draw->font = font;
 }
 
 void
-dc_setfg(DDC *dc, Col *col) {
-       if(!dc || !col) 
+draw_setfg(Draw *draw, Col *col) {
+       if(!draw || !col) 
                return;
-       dc->fg = col;
+       draw->fg = col;
 }
 
 void
-dc_setbg(DDC *dc, Col *col) {
-       if(!dc || !col)
+draw_setbg(Draw *draw, Col *col) {
+       if(!draw || !col)
                return;
-       dc->bg = col;
+       draw->bg = col;
 }
 
 void
-dc_setfill(DDC *dc, Bool fill) {
-       if(!dc)
-               return;
-       dc->fill = fill;
-}
-
-void
-dc_drawrect(DDC *dc, int x, int y, unsigned int w, unsigned int h) {
-       if(!dc)
+draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
                return;
        /* TODO: draw the rectangle */
 }
 
 void
-dc_drawtext(DDC *dc, int x, int y, const char *text) {
-       if(!dc)
+draw_text(Draw *draw, int x, int y, const char *text) {
+       if(!draw)
                return;
        /* TODO: draw the text */
 }
 
 void
-dc_map(DDC *dc, int x, int y, unsigned int w, unsigned int h) {
-       if(!dc)
+draw_map(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
                return;
-       /* TODO: map the dc contents in the region */
+       /* TODO: map the draw contents in the region */
 }
 
 void
-dc_getextents(DDC *dc, const char *text, TextExtents *extents) {
-       if(!dc || !extents)
+draw_getextents(Draw *draw, const char *text, TextExtents *extents) {
+       if(!draw || !extents)
                return;
        /* TODO: get extents */
 }