continued with draw.c abstraction, also started util.{h,c} implementation, that will...

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 341a26f..e88a70c 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,176 +1,155 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <locale.h>
-#include <stdarg.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>

 #include <X11/Xlib.h>
 #include <X11/Xlib.h>

-#include "draw.h"
-
-#define MAX(a, b)  ((a) > (b) ? (a) : (b))
-#define MIN(a, b)  ((a) < (b) ? (a) : (b))
-#define DEFAULTFN  "fixed"
-
-static Bool loadfont(DC *dc, const char *fontstr);

 
 

-void
-drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
-       XSetForeground(dc->dpy, dc->gc, color);
-       if(fill)
-               XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
-       else
-               XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
+#include "draw.h"
+#include "util.h"
+
+Draw *
+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;
+       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;

 }
 
 void
 }
 
 void

-drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
-       char buf[BUFSIZ];
-       size_t mn, n = strlen(text);
-
-       /* shorten text if necessary */
-       for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--)
-               if(mn == 0)
-                       return;
-       memcpy(buf, text, mn);
-       if(mn < n)
-               for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
-
-       drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
-       drawtextn(dc, buf, mn, col);
+draw_resize(Draw *draw, unsigned int w, unsigned int h) {
+       if(!draw)
+               return;
+       draw->w = w;
+       draw->h = h;
+       XFreePixmap(draw->dpy, draw->drawable);
+       draw->drawable = XCreatePixmap(draw->dpy, draw->win, w, h, DefaultDepth(draw->dpy, draw->screen));

 }
 
 void
 }
 
 void

-drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
-       int x = dc->x + dc->font.height/2;
-       int y = dc->y + dc->font.ascent+1;
-
-       XSetForeground(dc->dpy, dc->gc, FG(dc, col));
-       if(dc->font.set)
-               XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
-       else {
-               XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
-               XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
-       }
+draw_free(Draw *draw) {
+       XFreePixmap(draw->dpy, draw->drawable);
+       XFreeGC(draw->dpy, draw->gc);
+       free(draw);

 }
 
 }
 

-void
-eprintf(const char *fmt, ...) {
-       va_list ap;
-
-       va_start(ap, fmt);
-       vfprintf(stderr, fmt, ap);
-       va_end(ap);
-
-       if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
-               fputc(' ', stderr);
-               perror(NULL);
+Fnt *
+draw_font_create(Draw *draw, const char *fontname) {
+       Fnt *font;
+       char *def, **missing;
+       int n;
+
+       if(!draw)
+               return NULL;
+       font = (Fnt *)calloc(1, sizeof(Fnt));
+       font->set = XCreateFontSet(draw->dpy, fontname, &missing, &n, &def);
+       if(missing) {
+               while(n--)
+                       fprintf(stderr, "draw: missing fontset: %s\n", missing[n]);
+               XFreeStringList(missing);

        }
        }

-       exit(EXIT_FAILURE);
+       if(font->set) {
+               XFontStruct **xfonts;
+               char **font_names;
+
+               XExtentsOfFontSet(font->set);
+               n = XFontsOfFontSet(font->set, &xfonts, &font_names);
+               while(n--) {
+                       font->ascent = MAX(font->ascent, (*xfonts)->ascent);
+                       font->descent = MAX(font->descent,(*xfonts)->descent);
+                       xfonts++;
+               }
+       }
+       else {
+               if(!(font->xfont = XLoadQueryFont(draw->dpy, fontname))
+               && !(font->xfont = XLoadQueryFont(draw->dpy, "fixed")))
+                       die("error, cannot load font: '%s'\n", fontname);
+               font->ascent = font->xfont->ascent;
+               font->descent = font->xfont->descent;
+       }
+       font->h = font->ascent + font->descent;
+       return font;

 }
 
 void
 }
 
 void

-freedc(DC *dc) {
-       if(dc->font.set)
-               XFreeFontSet(dc->dpy, dc->font.set);
-       if(dc->font.xfont)
-               XFreeFont(dc->dpy, dc->font.xfont);
-       if(dc->canvas)
-               XFreePixmap(dc->dpy, dc->canvas);
-       XFreeGC(dc->dpy, dc->gc);
-       XCloseDisplay(dc->dpy);
-       free(dc);
+draw_font_free(Draw *draw, Fnt *font) {
+       if(!draw || !font)
+               return;
+       if(font->set)
+               XFreeFontSet(draw->dpy, font->set);
+       else
+               XFreeFont(draw->dpy, font->xfont);
+       free(font);

 }
 
 }
 

-unsigned long
-getcolor(DC *dc, const char *colstr) {
-       Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
+Col *
+draw_col_create(Draw *draw, const char *colname) {
+       Col *col = (Col *)calloc(1, sizeof(Col));
+       Colormap cmap = DefaultColormap(draw->dpy, draw->screen);

        XColor color;
 
        XColor color;
 

-       if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
-               eprintf("cannot allocate color '%s'\n", colstr);
-       return color.pixel;
+       if(!XAllocNamedColor(draw->dpy, cmap, colname, &color, &color))
+               die("error, cannot allocate color '%s'\n", colname);
+       col->rgb = color.pixel;
+       return col;

 }
 
 }
 

-DC *
-initdc(void) {
-       DC *dc;
-
-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fprintf(stderr, "no locale support\n");
-       if(!(dc = calloc(1, sizeof *dc)))
-               eprintf("cannot malloc %u bytes:", sizeof *dc);
-       if(!(dc->dpy = XOpenDisplay(NULL)))
-               eprintf("cannot open display\n");
-
-       dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL);
-       XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
-       return dc;
+void
+draw_col_free(Draw *draw, Col *col) {
+       if(!col)
+               return;
+       free(col);

 }
 
 void
 }
 
 void

-initfont(DC *dc, const char *fontstr) {
-       if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
-               if(fontstr != NULL)
-                       fprintf(stderr, "cannot load font '%s'\n", fontstr);
-               if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
-                       eprintf("cannot load font '%s'\n", DEFAULTFN);
-       }
-       dc->font.height = dc->font.ascent + dc->font.descent;
+draw_setfont(Draw *draw, Fnt *font) {
+       if(!draw || !font)
+               return;
+       draw->font = font;

 }
 
 }
 

-Bool
-loadfont(DC *dc, const char *fontstr) {
-       char *def, **missing, **names;
-       int i, n = 1;
-       XFontStruct **xfonts;
-
-       if(!*fontstr)
-               return False;
-       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-               n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-       }
-       else {
-               dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr);
-               xfonts = &dc->font.xfont;
-       }
-       for(i = 0; i < n; i++) {
-               dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
-               dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-               dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
-       }
-       if(missing)
-               XFreeStringList(missing);
-       return (dc->font.set || dc->font.xfont);
+void
+draw_setfg(Draw *draw, Col *col) {
+       if(!draw || !col) 
+               return;
+       draw->fg = col;

 }
 
 void
 }
 
 void

-mapdc(DC *dc, Window win, unsigned int w, unsigned int h) {
-       XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0);
+draw_setbg(Draw *draw, Col *col) {
+       if(!draw || !col)
+               return;
+       draw->bg = col;

 }
 
 void
 }
 
 void

-resizedc(DC *dc, unsigned int w, unsigned int h) {
-       if(dc->canvas)
-               XFreePixmap(dc->dpy, dc->canvas);
-
-       dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
-                                  DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
-       dc->w = w;
-       dc->h = h;
+draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
+               return;
+       /* TODO: draw the rectangle */

 }
 
 }
 

-int
-textnw(DC *dc, const char *text, size_t len) {
-       if(dc->font.set) {
-               XRectangle r;
+void
+draw_text(Draw *draw, int x, int y, const char *text) {
+       if(!draw)
+               return;
+       /* TODO: draw the text */
+}

 
 

-               XmbTextExtents(dc->font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc->font.xfont, text, len);
+void
+draw_map(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
+               return;
+       /* TODO: map the draw contents in the region */

 }
 
 }
 

-int
-textw(DC *dc, const char *text) {
-       return textnw(dc, text, strlen(text)) + dc->font.height;
+void
+draw_getextents(Draw *draw, const char *text, TextExtents *extents) {
+       if(!draw || !extents)
+               return;
+       /* TODO: get extents */

 }
 }