Added tag 2.4.2 for changeset 1ca5d430524e

[dmenu.git] / dmenu.h

diff --git a/dmenu.h b/dmenu.h
index 1eb57ba..2174688 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,50 +1,42 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 
 #include <X11/Xlib.h>
  * See LICENSE file for license details.
  */
 
 #include <X11/Xlib.h>

-#include <X11/Xlocale.h>

 
 

-#define FONT                   "fixed"
-#define NORMBGCOLOR            "#333366"
-#define NORMFGCOLOR            "#cccccc"
-#define SELBGCOLOR             "#666699"
-#define SELFGCOLOR             "#eeeeee"
-#define SPACE          30 /* px */
+#define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+#define NORMBGCOLOR            "#eeeeee"
+#define NORMFGCOLOR            "#222222"
+#define SELBGCOLOR             "#006699"
+#define SELFGCOLOR             "#ffffff"
+#define SPACE                  30 /* px */

 
 /* color */
 enum { ColFG, ColBG, ColLast };
 
 
 /* color */
 enum { ColFG, ColBG, ColLast };
 

-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-struct Fnt {
-       XFontStruct *xfont;
-       XFontSet set;
-       int ascent;
-       int descent;
-       int height;
-};
-
-struct DC {
+typedef struct {

        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];
        Drawable drawable;
        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];
        Drawable drawable;

-       Fnt font;

        GC gc;
        GC gc;

-}; /* draw context */
+       struct {
+               XFontStruct *xfont;
+               XFontSet set;
+               int ascent;
+               int descent;
+               int height;
+       } font;
+} DC; /* draw context */

 
 extern int screen;
 extern Display *dpy;
 extern DC dc;                  /* global drawing context */
 
 /* draw.c */
 
 extern int screen;
 extern Display *dpy;
 extern DC dc;                  /* global drawing context */
 
 /* draw.c */

-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 */
+extern void drawtext(const char *text, unsigned long col[ColLast]);
+extern unsigned int textw(const char *text);
+extern unsigned int textnw(const char *text, unsigned int len);

 
 /* util.c */
 extern void *emalloc(unsigned int size);               /* allocates memory, exits on error */
 
 /* util.c */
 extern void *emalloc(unsigned int size);               /* allocates memory, exits on error */