reverting the xkb dependency, I don't care if this function is deprecated, it seems...

[dwm.git] / draw.h

diff --git a/draw.h b/draw.h
index 955067d..9aec43d 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -1,13 +1,16 @@
 /* See LICENSE file for copyright and license details. */
 
 /* See LICENSE file for copyright and license details. */
 

+typedef struct _DDC DDC;
+

 /* X11 types - begin */
 /* X11 types - begin */

+typedef struct _XDraw Draw;

 struct _XDraw {
        unsigned int w, h;
        Display *dpy;
        Drawable drawable;
        GC gc;
 struct _XDraw {
        unsigned int w, h;
        Display *dpy;
        Drawable drawable;
        GC gc;

+       DDC *dc;

 };
 };

-typedef struct _XDraw Draw;

 
 struct _XCol {
        unsigned long rgb;
 
 struct _XCol {
        unsigned long rgb;


@@ -24,13 +27,14 @@ struct _XFont {
 typedef struct _XFont Fnt;
 /* X11 types - end */
 
 typedef struct _XFont Fnt;
 /* X11 types - end */
 

-typedef struct {
+struct _DDC {

        Draw *draw;
        Col *fg;
        Col *bg;
        Fnt *font;
        Bool fill;
        Draw *draw;
        Col *fg;
        Col *bg;
        Fnt *font;
        Bool fill;

-} DDC;
+       DDC *next;
+};

 
 typedef struct {
        unsigned int w;
 
 typedef struct {
        unsigned int w;


@@ -60,8 +64,8 @@ void col_free(Col *col);
 
 /* Drawing context manipulation */
 void dc_setfont(DDC *dc, Fnt *font);
 
 /* 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 */
 void dc_setfill(DDC *dc, Bool fill);
 
 /* Drawing functions */