next version will contain updated copyright notice

[dmenu.git] / dmenu.h

diff --git a/dmenu.h b/dmenu.h
index 75b6266..0afdf0e 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,15 +1,19 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

-#include "config.h"

 #include <X11/Xlib.h>
 #include <X11/Xlib.h>

-#include <X11/Xlocale.h>

 
 

-#define SPACE          30 /* px */
+#define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+#define NORMBGCOLOR            "#333366"
+#define NORMFGCOLOR            "#cccccc"
+#define SELBGCOLOR             "#666699"
+#define SELFGCOLOR             "#eeeeee"
+#define SPACE                  30 /* px */
+
+/* color */
+enum { ColFG, ColBG, ColLast };

 
 

-typedef struct Brush Brush;

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


@@ -21,27 +25,27 @@ struct Fnt {
        int height;
 };
 
        int height;
 };
 

-struct DC { /* draw context */
+struct DC {

        int x, y, w, h;
        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;

-};
+}; /* draw context */

 
 extern int screen;
 extern Display *dpy;
 
 extern int screen;
 extern Display *dpy;

-extern DC dc;
+extern DC dc;                  /* global drawing context */

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

-extern void drawtext(const char *text, Bool invert, Bool border);
-extern unsigned long getcolor(const char *colstr);
-extern void setfont(const char *fontstr);
-extern unsigned int textw(const char *text);
+extern void drawtext(const char *text,
+                       unsigned long col[ColLast]);    /* draws text with the defined color tuple */
+extern unsigned long getcolor(const char *colstr);     /* returns color of colstr */
+extern void setfont(const char *fontstr);              /* sets global font */
+extern unsigned int textw(const char *text);           /* returns width of text in px */

 
 /* util.c */
 
 /* util.c */

-extern void *emalloc(unsigned int size);
-extern void eprint(const char *errstr, ...);
-extern char *estrdup(const char *str);
+extern void *emalloc(unsigned int size);               /* allocates memory, exits on error */
+extern void eprint(const char *errstr, ...);           /* prints errstr and exits with 1 */
+extern char *estrdup(const char *str);                 /* duplicates str, exits on allocation error */