kske
/
dwm
1
Fork 0
Code Issues Pull Requests Releases Activity

continued, distinction of Draw and DDC is bad, needs to be merged

This commit is contained in:
anselm@garbe.us 2012-11-18 17:26:12 +01:00
parent 3aabc08ede
commit 0a673ad7a3
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
draw.c
View File

@ -5,12 +5,16 @@
#include "draw.h" #include "draw.h"
Draw * Draw *
draw_create(Display *dpy, Window win, unsigned int w, unsigned int h) { draw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h) {
Draw *draw = (Draw *)calloc(1, sizeof(Draw)); Draw *draw = (Draw *)calloc(1, sizeof(Draw));
draw->dpy = dpy;
draw->screen = screen;
draw->win = win;
draw->w = w; draw->w = w;
draw->h = h; draw->h = h;
/* TODO: drawable creation */ draw->drawable = XCreatePixmap(dpy, win, w, h, DefaultDepth(dpy, screen));
/* TODO: gc allocation */ draw->gc = XCreateGC(dpy, win, 0, NULL);
XSetLineAttributes(dpy, draw->gc, 1, LineSolid, CapButt, JoinMiter);
return draw; return draw;
} }
@ -20,13 +24,14 @@ draw_resize(Draw *draw, unsigned int w, unsigned int h) {
return; return;
draw->w = w; draw->w = w;
draw->h = h; draw->h = h;
/* TODO: resize drawable */ XFreePixmap(draw->dpy, draw->drawable);
draw->drawable = XCreatePixmap(draw->dpy, draw->win, w, h, DefaultDepth(draw->dpy, draw->screen));
} }
void void
draw_free(Draw *draw) { draw_free(Draw *draw) {
/* TODO: deallocate DDCs */ XFreePixmap(draw->dpy, draw->drawable);
/* TODO: deallocate drawable */ XFreeGC(draw->dpy, draw->gc);
free(draw); free(draw);
} }

4
draw.h
View File

@ -7,6 +7,8 @@ typedef struct _XDraw Draw;
struct _XDraw { struct _XDraw {
unsigned int w, h; unsigned int w, h;
Display *dpy; Display *dpy;
int screen;
Window win;
Drawable drawable; Drawable drawable;
GC gc; GC gc;
DDC *dc; DDC *dc;
@ -46,7 +48,7 @@ typedef struct {
} TextExtents; } TextExtents;
/* Drawable abstraction */ /* Drawable abstraction */
Draw *draw_create(Display *dpy, Window win, unsigned int w, unsigned int h); Draw *draw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
void draw_resize(Draw *draw, unsigned int w, unsigned int h); void draw_resize(Draw *draw, unsigned int w, unsigned int h);
void draw_free(Draw *draw); void draw_free(Draw *draw);