X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/e1deda9e040c052af62aecc2fb4ee770fb2496a2..0a673ad7a37f3a1bdda7cef316bda300f8f181eb:/draw.c
diff --git a/draw.c b/draw.c
index bb5ac27..df5aeec 100644
--- a/draw.c
+++ b/draw.c
@@ -1,137 +1,144 @@
-/* © 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);
- }
-}
-
-static Bool
-isoccupied(unsigned int t) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(c->tags[t])
- return True;
- return False;
-}
-
-static unsigned int
-textnw(const char *text, unsigned int len) {
- XRectangle r;
-
- if(dc.font.set) {
- XmbTextExtents(dc.font.set, text, len, NULL, &r);
- return r.width;
- }
- return XTextWidth(dc.font.xfont, text, len);
-}
-
-/* extern */
+/* See LICENSE file for copyright and license details. */
+#include <stdlib.h>
+#include <X11/Xlib.h>
+
+#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_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
+draw_free(Draw *draw) {
+ XFreePixmap(draw->dpy, draw->drawable);
+ XFreeGC(draw->dpy, draw->gc);
+ 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
+col_free(Col *col) {
+ if(!col)
+ return;
+ /* TODO: deallocate any color resource */
+ free(col);
+}
+
+void
+dc_setfont(DDC *dc, Fnt *font) {
+ if(!dc || !font)
+ return;
+ dc->font = font;
+}
+
+void
+dc_setfg(DDC *dc, Col *col) {
+ if(!dc || !col)
+ return;
+ dc->fg = col;
+}
+
+void
+dc_setbg(DDC *dc, Col *col) {
+ if(!dc || !col)
+ return;
+ dc->bg = col;
+}
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;
- }
- 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);
- }
- else
- drawtext(NULL, dc.norm);
- }
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
- XSync(dpy, False);
+dc_setfill(DDC *dc, Bool fill) {
+ if(!dc)
+ return;
+ dc->fill = fill;
+}
+
+void
+dc_drawrect(DDC *dc, int x, int y, unsigned int w, unsigned int h) {
+ if(!dc)
+ return;
+ /* TODO: draw the rectangle */
+}
+
+void
+dc_drawtext(DDC *dc, int x, int y, const char *text) {
+ if(!dc)
+ return;
+ /* TODO: draw the 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
-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)
+dc_getextents(DDC *dc, const char *text, TextExtents *extents) {
+ if(!dc || !extents)
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);
- else
- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-}
-
-unsigned int
-textw(const char *text) {
- return textnw(text, strlen(text)) + dc.font.height;
+ /* TODO: get extents */
}