made Fnt an anonymous struct

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 8b24bb0..c1d48dd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -109,7 +109,7 @@ drawmenu(void) {
 }
 
 static unsigned long
 }
 
 static unsigned long

-getcolor(const char *colstr) {
+initcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 


@@ -119,7 +119,7 @@ getcolor(const char *colstr) {
 }
 
 static void
 }
 
 static void

-setfont(const char *fontstr) {
+initfont(const char *fontstr) {

        char *def, **missing;
        int i, n;
 
        char *def, **missing;
        int i, n;
 


@@ -470,11 +470,11 @@ main(int argc, char *argv[]) {
        }
        XFreeModifiermap(modmap);
        /* style */
        }
        XFreeModifiermap(modmap);
        /* style */

-       dc.norm[ColBG] = getcolor(normbg);
-       dc.norm[ColFG] = getcolor(normfg);
-       dc.sel[ColBG] = getcolor(selbg);
-       dc.sel[ColFG] = getcolor(selfg);
-       setfont(font);
+       dc.norm[ColBG] = initcolor(normbg);
+       dc.norm[ColFG] = initcolor(normfg);
+       dc.sel[ColBG] = initcolor(selbg);
+       dc.sel[ColFG] = initcolor(selfg);
+       initfont(font);

        /* menu window */
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        /* menu window */
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;