[hackers] [dwm] basic draw.c structure || anselm

From: <hg_AT_suckless.org>
Date: Sun, 18 Nov 2012 12:04:19 +0100 (CET)

changeset: 1612:565cb8c28fc0
tag: tip
user: anselm_AT_garbe.us
date: Sun Nov 18 12:04:29 2012 +0100
files: Makefile draw.c draw.h
description:
basic draw.c structure


diff -r 1166b378cfa8 -r 565cb8c28fc0 Makefile
--- a/Makefile Sun Nov 18 10:56:54 2012 +0100
+++ b/Makefile Sun Nov 18 12:04:29 2012 +0100
_AT_@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = dwm.c
+SRC = draw.c dwm.c
 OBJ = ${SRC:.c=.o}
 
 all: options dwm
diff -r 1166b378cfa8 -r 565cb8c28fc0 draw.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/draw.c Sun Nov 18 12:04:29 2012 +0100
_AT_@ -0,0 +1,139 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdlib.h>
+#include <X11/Xlib.h>
+
+#include "draw.h"
+
+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
+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
+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
+dc_getextents(DDC *dc, const char *text, TextExtents *extents) {
+ if(!dc || !extents)
+ return;
+ /* TODO: get extents */
+}
diff -r 1166b378cfa8 -r 565cb8c28fc0 draw.h
--- a/draw.h Sun Nov 18 10:56:54 2012 +0100
+++ b/draw.h Sun Nov 18 12:04:29 2012 +0100
_AT_@ -1,13 +1,16 @@
 /* See LICENSE file for copyright and license details. */
 
+typedef struct _DDC DDC;
+
 /* X11 types - begin */
+typedef struct _XDraw Draw;
 struct _XDraw {
         unsigned int w, h;
         Display *dpy;
         Drawable drawable;
         GC gc;
+ DDC *dc;
 };
-typedef struct _XDraw Draw;
 
 struct _XCol {
         unsigned long rgb;
_AT_@ -24,13 +27,14 @@
 typedef struct _XFont Fnt;
 /* X11 types - end */
 
-typedef struct {
+struct _DDC {
         Draw *draw;
         Col *fg;
         Col *bg;
         Fnt *font;
         Bool fill;
-} DDC;
+ DDC *next;
+};
 
 typedef struct {
         unsigned int w;
_AT_@ -60,8 +64,8 @@
 
 /* Drawing context manipulation */
 void dc_setfont(DDC *dc, Fnt *font);
-void dc_setfg(DDC *dc, Col col);
-void dc_setbg(DDC *dc, Col col);
+void dc_setfg(DDC *dc, Col *col);
+void dc_setbg(DDC *dc, Col *col);
 void dc_setfill(DDC *dc, Bool fill);
 
 /* Drawing functions */
Received on Sun Nov 18 2012 - 12:04:19 CET