applied ido-matching to dmenu

[dmenu.git] / dmenu.h

diff --git a/dmenu.h b/dmenu.h
index 5c047ff..015e808 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,7 +1,4 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */

 #include <X11/Xlib.h>
 
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #include <X11/Xlib.h>
 
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"


@@ -14,31 +11,31 @@
 /* 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 int screen;
 extern Display *dpy;

-extern DC dc;                  /* global drawing context */
+extern DC dc;                          /* global drawing context */
+
+/* draw.c */
+void drawtext(const char *text, unsigned long col[ColLast]);
+unsigned int textw(const char *text);
+unsigned int textnw(const char *text, unsigned int len);

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

-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 */
+void *emalloc(unsigned int size);      /* allocates memory, exits on error */
+void eprint(const char *errstr, ...);  /* prints errstr and exits with 1 */
+char *estrdup(const char *str);                /* duplicates str, exits on allocation error */