minor update, tab to space

[dwm.git] / drw.h

diff --git a/drw.h b/drw.h
index ff4355b..7978ac1 100644 (file)
--- a/drw.h
+++ b/drw.h
@@ -12,22 +12,25 @@ typedef struct Fnt {
        struct Fnt *next;
 } Fnt;
 
        struct Fnt *next;
 } Fnt;
 

-enum { ColFg, ColBg, ColCount }; /* Scm index */
-typedef XftColor *Scm;
+enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
+typedef XftColor Clr;

 
 typedef struct {
        unsigned int w, h;
        Display *dpy;
        int screen;
        Window root;
 
 typedef struct {
        unsigned int w, h;
        Display *dpy;
        int screen;
        Window root;

+       Visual *visual;
+       unsigned int depth;
+       Colormap cmap;

        Drawable drawable;
        GC gc;
        Drawable drawable;
        GC gc;

-       Scm scheme;
+       Clr *scheme;

        Fnt *fonts;
 } Drw;
 
 /* Drawable abstraction */
        Fnt *fonts;
 } Drw;
 
 /* Drawable abstraction */

-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap);

 void drw_resize(Drw *drw, unsigned int w, unsigned int h);
 void drw_free(Drw *drw);
 
 void drw_resize(Drw *drw, unsigned int w, unsigned int h);
 void drw_free(Drw *drw);
 


@@ -38,8 +41,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
 void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
 
 /* Colorscheme abstraction */
 void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
 
 /* Colorscheme abstraction */

-void drw_clr_create(Drw *drw, XftColor *dest, const char *clrname);
-Scm drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
+Clr *drw_scm_create(Drw *drw, char *clrnames[], const unsigned int alphas[], size_t clrcount);

 
 /* Cursor abstraction */
 Cur *drw_cur_create(Drw *drw, int shape);
 
 /* Cursor abstraction */
 Cur *drw_cur_create(Drw *drw, int shape);


@@ -47,7 +50,7 @@ void drw_cur_free(Drw *drw, Cur *cursor);
 
 /* Drawing context manipulation */
 void drw_setfontset(Drw *drw, Fnt *set);
 
 /* Drawing context manipulation */
 void drw_setfontset(Drw *drw, Fnt *set);

-void drw_setscheme(Drw *drw, Scm scm);
+void drw_setscheme(Drw *drw, Clr *scm);

 
 /* Drawing functions */
 void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
 
 /* Drawing functions */
 void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);