X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=01436ea4a6f436a365d3e5360458bb30a98607c0;hp=1046322c7bc003acc3673c843afcb105bad25c54;hb=c0ba635c50dc53f06e4fc96392415b3d19b25826;hpb=d7e17087ed2fc5eed57efa03e81460e3e41f7238 diff --git a/draw.c b/draw.c index 1046322..01436ea 100644 --- a/draw.c +++ b/draw.c @@ -1,172 +1,115 @@ -/* - * (C)opyright MMIV-MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ - -#include -#include - -#include - -#include "wm.h" - -static void -drawborder(Brush *b) -{ - XPoint points[5]; - XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter); - XSetForeground(dpy, b->gc, b->border); - points[0].x = b->x; - points[0].y = b->y; - points[1].x = b->w - 1; - points[1].y = 0; - points[2].x = 0; - points[2].y = b->h - 1; - points[3].x = -(b->w - 1); - points[3].y = 0; - points[4].x = 0; - points[4].y = -(b->h - 1); - XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious); +/* See LICENSE file for copyright and license details. */ +#include +#include + +#include "draw.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 -draw(Brush *b, Bool border, const char *text) -{ - int x, y, w, h; - unsigned int len; - static char buf[256]; - XGCValues gcv; - XRectangle r = { b->x, b->y, b->w, b->h }; - - XSetForeground(dpy, b->gc, b->bg); - XFillRectangles(dpy, b->drawable, b->gc, &r, 1); - - w = 0; - if(border) - drawborder(b); - - if(!text) +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)); +} - 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->y + (b->h / 2) - (h / 2) + b->font.ascent; - x = b->x + (h / 2); +void +draw_free(Draw *draw) { + XFreePixmap(draw->dpy, draw->drawable); + XFreeGC(draw->dpy, draw->gc); + free(draw); +} - /* shorten text if necessary */ - while(len && (w = textnw(&b->font, buf, len)) > b->w - h) - buf[--len] = 0; +Fnt * +font_create(const char *fontname) { + Fnt *font = (Fnt *)calloc(1, sizeof(Fnt)); + /* TODO: allocate actual font */ + return font; +} - if(w > b->w) - return; /* too long */ +void +font_free(Fnt *font) { + if(!font) + return; + /* TODO: deallocate any font resources */ + free(font); +} - 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); - } +Col * +col_create(const char *colname) { + Col *col = (Col *)calloc(1, sizeof(Col)); + /* TODO: allocate color */ + return col; } -static unsigned long -xloadcolors(Colormap cmap, const char *colstr) -{ - XColor color; - XAllocNamedColor(dpy, cmap, colstr, &color, &color); - return color.pixel; +void +col_free(Col *col) { + if(!col) + return; + /* TODO: deallocate any color resource */ + free(col); } void -loadcolors(int scr, Brush *b, - const char *bg, const char *fg, const char *border) -{ - Colormap cmap = DefaultColormap(dpy, scr); - b->bg = xloadcolors(cmap, bg); - b->fg = xloadcolors(cmap, fg); - b->border = xloadcolors(cmap, border); +draw_setfont(Draw *draw, Fnt *font) { + if(!draw || !font) + return; + draw->font = font; } -unsigned int -textnw(Fnt *font, char *text, unsigned int len) -{ - XRectangle r; - if(font->set) { - XmbTextExtents(font->set, text, len, NULL, &r); - return r.width; - } - return XTextWidth(font->xfont, text, len); +void +draw_setfg(Draw *draw, Col *col) { + if(!draw || !col) + return; + draw->fg = col; } -unsigned int -textw(Fnt *font, char *text) -{ - return textnw(font, text, strlen(text)); +void +draw_setbg(Draw *draw, Col *col) { + if(!draw || !col) + return; + draw->bg = col; } -unsigned int -texth(Fnt *font) -{ - return font->height + 4; +void +draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h) { + if(!draw) + return; + /* TODO: draw the rectangle */ } void -loadfont(Fnt *font, const char *fontstr) -{ - char **missing, *def; - int i, n; +draw_text(Draw *draw, int x, int y, const char *text) { + if(!draw) + return; + /* TODO: draw the text */ +} - missing = NULL; - 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; +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 */ +} - 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; +void +draw_getextents(Draw *draw, const char *text, TextExtents *extents) { + if(!draw || !extents) + return; + /* TODO: get extents */ }