Added tag 0.6 for changeset 25f679fb19686140a907684ffcb423b9e9d44b53

[dmenu.git] / dmenu.h

diff --git a/dmenu.h b/dmenu.h
index 8d630ba..337e094 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -7,7 +7,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xlocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xlocale.h>
 

-typedef struct Brush Brush;
+#define SPACE          30 /* px */
+
+/* color */
+enum { ColFG, ColBG, ColLast };
+

 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 


@@ -21,38 +25,24 @@ struct Fnt {
 
 struct DC { /* draw context */
        int x, y, w, h;
 
 struct DC { /* draw context */
        int x, y, w, h;

-       unsigned long bg;
-       unsigned long fg;
-       unsigned long border;
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];

        Drawable drawable;
        Fnt font;
        GC gc;
 };
 
        Drawable drawable;
        Fnt font;
        GC gc;
 };
 

-struct Brush {
-       GC gc;
-       Drawable drawable;
-       int x, y, w, h;
-       Fnt font;
-       unsigned long bg;
-       unsigned long fg;
-       unsigned long border;
-};
-
-
+extern int screen;
+extern Display *dpy;
+extern DC dc;

 
 /* draw.c */
 
 /* draw.c */

-extern void draw(Display *dpy, Brush *b, Bool border, const char *text);
-extern void loadcolors(Display *dpy, int screen, Brush *b,
-               const char *bg, const char *fg, const char *bo);
-extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
-extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
-extern unsigned int textw(Fnt *font, char *text);
-extern unsigned int texth(Fnt *font);
+extern void drawtext(const char *text, unsigned long col[ColLast]);
+extern unsigned long getcolor(const char *colstr);
+extern void setfont(const char *fontstr);
+extern unsigned int textw(const char *text);

 
 /* util.c */
 extern void *emalloc(unsigned int size);
 
 /* util.c */
 extern void *emalloc(unsigned int size);

-extern void *emallocz(unsigned int size);

 extern void eprint(const char *errstr, ...);
 extern char *estrdup(const char *str);
 extern void eprint(const char *errstr, ...);
 extern char *estrdup(const char *str);

-extern void swap(void **p1, void **p2);