JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
removed DDC, all is Draw-dependent
[dwm.git] / draw.c
diff --git a/draw.c b/draw.c
index a3c526e..01436ea 100644 (file)
--- a/draw.c
+++ b/draw.c
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include <stdio.h>
-#include <string.h>
+/* See LICENSE file for copyright and license details. */
+#include <stdlib.h>
+#include <X11/Xlib.h>
 
 #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, 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(Display *dpy, Brush *b, Bool border, const char *text)
-{
-       unsigned int x, y, w, h, len;
-       static char buf[256];
-       XGCValues gcv;
-
-       XSetForeground(dpy, b->gc, b->bg);
-       XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
-
-       if(border)
-               drawborder(dpy, 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->rect.y + (b->rect.height / 2) - (h / 2) + b->font.ascent;
-       x = b->rect.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 = textwidth_l(&b->font, buf, len)) > b->rect.width - 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->rect.width)
-               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(Display *dpy, 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(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);
+draw_setfont(Draw *draw, Fnt *font) {
+       if(!draw || !font)
+               return;
+       draw->font = font;
 }
 
-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
+draw_setfg(Draw *draw, Col *col) {
+       if(!draw || !col) 
+               return;
+       draw->fg = col;
 }
 
-unsigned int
-textwidth(Fnt *font, char *text)
-{
-       return textwidth_l(font, text, strlen(text));
+void
+draw_setbg(Draw *draw, Col *col) {
+       if(!draw || !col)
+               return;
+       draw->bg = col;
 }
 
 void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
-{
-       char **missing, *def;
-       int n;
+draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
+               return;
+       /* TODO: draw the rectangle */
+}
 
-       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;
+void
+draw_text(Draw *draw, int x, int y, const char *text) {
+       if(!draw)
+               return;
+       /* TODO: draw the text */
+}
 
-               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_map(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
+               return;
+       /* TODO: map the draw contents in the region */
 }
 
-unsigned int
-labelheight(Fnt *font)
-{
-       return font->height + 4;
+void
+draw_getextents(Draw *draw, const char *text, TextExtents *extents) {
+       if(!draw || !extents)
+               return;
+       /* TODO: get extents */
 }