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 bb5ac27..e88a70c 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,137 +1,155 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * © 2007 Premysl Hruby <dfenze at gmail dot com>
- * See LICENSE file for license details. */
-#include "dwm.h"
-#include <string.h>
-
-/* static */
-
-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
-       int x;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       gcv.foreground = col[ColFG];
-       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-       x = (dc.font.ascent + dc.font.descent + 2) / 4;
-       r.x = dc.x + 1;
-       r.y = dc.y + 1;
-       if(filled) {
-               r.width = r.height = x + 1;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
-       else if(empty) {
-               r.width = r.height = x;
-               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
-}
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>

 
 

-static Bool
-isoccupied(unsigned int t) {
-       Client *c;
+#include "draw.h"
+#include "util.h"

 
 

-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
+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;

 }
 
 }
 

-static unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
+void
+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));
+}

 
 

-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc.font.xfont, text, len);
+void
+draw_free(Draw *draw) {
+       XFreePixmap(draw->dpy, draw->drawable);
+       XFreeGC(draw->dpy, draw->gc);
+       free(draw);

 }
 
 }
 

-/* extern */
+Fnt *
+draw_font_create(Draw *draw, const char *fontname) {
+       Fnt *font;
+       char *def, **missing;
+       int n;

 
 

-void
-drawstatus(void) {
-       int i, x;
-
-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
-               dc.w = textw(tags[i]);
-               if(seltag[i]) {
-                       drawtext(tags[i], dc.sel);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
-               }
-               else {
-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
-               }
-               dc.x += dc.w;
-       }
-       dc.w = blw;
-       drawtext(lt->symbol, dc.norm);
-       x = dc.x + dc.w;
-       dc.w = textw(stext);
-       dc.x = sw - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = sw - x;
+       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);

        }
        }

-       drawtext(stext, dc.norm);
-       if((dc.w = dc.x - x) > bh) {
-               dc.x = x;
-               if(sel) {
-                       drawtext(sel->name, dc.sel);
-                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
+       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
-                       drawtext(NULL, dc.norm);

        }
        }

-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
-       XSync(dpy, False);
+       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

-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
+draw_font_free(Draw *draw, Fnt *font) {
+       if(!draw || !font)

                return;
                return;

-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
-       h = dc.font.ascent + dc.font.descent;
-       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-       x = dc.x + (h / 2);
-       /* shorten text if necessary */
-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
-       if(dc.font.set)
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+       if(font->set)
+               XFreeFontSet(draw->dpy, font->set);

        else
        else

-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+               XFreeFont(draw->dpy, font->xfont);
+       free(font);
+}
+
+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;
+
+       if(!XAllocNamedColor(draw->dpy, cmap, colname, &color, &color))
+               die("error, cannot allocate color '%s'\n", colname);
+       col->rgb = color.pixel;
+       return col;
+}
+
+void
+draw_col_free(Draw *draw, Col *col) {
+       if(!col)
+               return;
+       free(col);
+}
+
+void
+draw_setfont(Draw *draw, Fnt *font) {
+       if(!draw || !font)
+               return;
+       draw->font = font;
+}
+
+void
+draw_setfg(Draw *draw, Col *col) {
+       if(!draw || !col) 
+               return;
+       draw->fg = col;
+}
+
+void
+draw_setbg(Draw *draw, Col *col) {
+       if(!draw || !col)
+               return;
+       draw->bg = col;
+}
+
+void
+draw_rect(Draw *draw, int x, int y, unsigned int w, unsigned int h) {
+       if(!draw)
+               return;
+       /* TODO: draw the rectangle */
+}
+
+void
+draw_text(Draw *draw, int x, int y, const char *text) {
+       if(!draw)
+               return;
+       /* TODO: draw the text */

 }
 
 }
 

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

 }
 }