X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=04e7f0d4f6f7d19a1b6aeadfd5dfdb3e14f6c69f;hb=d456617f0eb93df0ec8eb81ff6e04ca988c09c60;hp=a3c526ede838a242392fa05987761669938eb3f8;hpb=8a8b7956b6de80decbfd3bff6d2ad6e5bb69b2bd;p=dwm.git diff --git a/draw.c b/draw.c index a3c526e..04e7f0d 100644 --- a/draw.c +++ b/draw.c @@ -1,170 +1,139 @@ -/* - * (C)opyright MMIV-MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ - -#include -#include +/* See LICENSE file for copyright and license details. */ +#include +#include #include "draw.h" -#include "util.h" - -static void -drawborder(Display *dpy, Brush *b) -{ - XPoint points[5]; - XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter); - XSetForeground(dpy, b->gc, b->border); - points[0].x = b->rect.x; - points[0].y = b->rect.y; - points[1].x = b->rect.width - 1; - points[1].y = 0; - points[2].x = 0; - points[2].y = b->rect.height - 1; - points[3].x = -(b->rect.width - 1); - points[3].y = 0; - points[4].x = 0; - points[4].y = -(b->rect.height - 1); - XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious); + +Draw * +draw_create(Display *dpy, Window win, unsigned int w, unsigned int h) { + Draw *draw = (Draw *)calloc(1, sizeof(Draw)); + draw->w = w; + draw->h = h; + /* TODO: drawable creation */ + /* TODO: gc allocation */ + return draw; +} + +void +draw_resize(Draw *draw, unsigned int w, unsigned int h) { + if(!draw) + return; + draw->w = w; + draw->h = h; + /* TODO: resize drawable */ +} + +void +draw_free(Draw *draw) { + /* TODO: deallocate DDCs */ + /* TODO: deallocate drawable */ + 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)); + /* TODO: allocate actual font */ + return font; +} + +void +font_free(Fnt *font) { + if(!font) + return; + /* TODO: deallocate any font resources */ + free(font); +} + +Col * +col_create(const char *colname) { + Col *col = (Col *)calloc(1, sizeof(Col)); + /* TODO: allocate color */ + return col; } void -draw(Display *dpy, Brush *b, Bool border, const char *text) -{ - unsigned int x, y, w, h, len; - static char buf[256]; - XGCValues gcv; +col_free(Col *col) { + if(!col) + return; + /* TODO: deallocate any color resource */ + free(col); +} - XSetForeground(dpy, b->gc, b->bg); - XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1); +void +dc_setfont(DDC *dc, Fnt *font) { + if(!dc || !font) + return; + dc->font = font; +} - if(border) - drawborder(dpy, b); +void +dc_setfg(DDC *dc, Col *col) { + if(!dc || !col) + return; + dc->fg = col; +} - if(!text) +void +dc_setbg(DDC *dc, Col *col) { + if(!dc || !col) return; + dc->bg = col; +} - len = strlen(text); - if(len >= sizeof(buf)) - len = sizeof(buf) - 1; - memcpy(buf, text, len); - buf[len] = 0; - - h = b->font.ascent + b->font.descent; - y = b->rect.y + (b->rect.height / 2) - (h / 2) + b->font.ascent; - x = b->rect.x + (h / 2); - - /* shorten text if necessary */ - while(len && (w = textwidth_l(&b->font, buf, len)) > b->rect.width - h) - buf[--len] = 0; - - if(w > b->rect.width) - return; /* too long */ - - gcv.foreground = b->fg; - gcv.background = b->bg; - if(b->font.set) { - XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv); - XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc, - x, y, buf, len); - } - else { - gcv.font = b->font.xfont->fid; - XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv); - XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len); - } -} - -static unsigned long -xloadcolors(Display *dpy, Colormap cmap, const char *colstr) -{ - XColor color; - XAllocNamedColor(dpy, cmap, colstr, &color, &color); - return color.pixel; +void +dc_setfill(DDC *dc, Bool fill) { + if(!dc) + return; + dc->fill = fill; } void -loadcolors(Display *dpy, int screen, Brush *b, - const char *bg, const char *fg, const char *border) -{ - Colormap cmap = DefaultColormap(dpy, screen); - b->bg = xloadcolors(dpy, cmap, bg); - b->fg = xloadcolors(dpy, cmap, fg); - b->border = xloadcolors(dpy, cmap, border); +dc_drawrect(DDC *dc, int x, int y, unsigned int w, unsigned int h) { + if(!dc) + return; + /* TODO: draw the rectangle */ } -unsigned int -textwidth_l(Fnt *font, char *text, unsigned int len) -{ - if(font->set) { - XRectangle r; - XmbTextExtents(font->set, text, len, 0, &r); - return r.width; - } - return XTextWidth(font->xfont, text, len); +void +dc_drawtext(DDC *dc, int x, int y, const char *text) { + if(!dc) + return; + /* TODO: draw the text */ } -unsigned int -textwidth(Fnt *font, char *text) -{ - return textwidth_l(font, text, strlen(text)); +void +dc_map(DDC *dc, int x, int y, unsigned int w, unsigned int h) { + if(!dc) + return; + /* TODO: map the dc contents in the region */ } void -loadfont(Display *dpy, Fnt *font, const char *fontstr) -{ - char **missing, *def; - int n; - - missing = NULL; - def = "?"; - setlocale(LC_ALL, ""); - if(font->set) - XFreeFontSet(dpy, font->set); - font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); - if(missing) { - while(n--) - fprintf(stderr, "missing fontset: %s\n", missing[n]); - XFreeStringList(missing); - if(font->set) { - XFreeFontSet(dpy, font->set); - font->set = NULL; - } - } - if(font->set) { - XFontSetExtents *font_extents; - XFontStruct **xfonts; - char **font_names; - unsigned int i; - - font->ascent = font->descent = 0; - font_extents = XExtentsOfFontSet(font->set); - n = XFontsOfFontSet(font->set, &xfonts, &font_names); - for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) { - if(font->ascent < (*xfonts)->ascent) - font->ascent = (*xfonts)->ascent; - if(font->descent < (*xfonts)->descent) - font->descent = (*xfonts)->descent; - xfonts++; - } - } - else { - if(font->xfont) - XFreeFont(dpy, font->xfont); - font->xfont = NULL; - font->xfont = XLoadQueryFont(dpy, fontstr); - if (!font->xfont) - font->xfont = XLoadQueryFont(dpy, "fixed"); - if (!font->xfont) - error("error, cannot load 'fixed' font\n"); - font->ascent = font->xfont->ascent; - font->descent = font->xfont->descent; - } - font->height = font->ascent + font->descent; -} - -unsigned int -labelheight(Fnt *font) -{ - return font->height + 4; +dc_getextents(DDC *dc, const char *text, TextExtents *extents) { + if(!dc || !extents) + return; + /* TODO: get extents */ }