From 241a4ef80ed34d43cad2629fdda8244b2d8d2619 Mon Sep 17 00:00:00 2001 From: rcyeske Date: Mon, 19 Feb 2001 20:47:29 +0000 Subject: renamed FONT and COLOR defines --- src/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index ad7df8c..6edf808 100644 --- a/src/main.c +++ b/src/main.c @@ -257,10 +257,10 @@ main (int argc, char *argv[]) init_numbers (); init_window_list (); - font = XLoadQueryFont (dpy, FONT_NAME); + font = XLoadQueryFont (dpy, FONT); if (font == NULL) { - fprintf (stderr, "ratpoison: Cannot load font %s.\n", FONT_NAME); + fprintf (stderr, "ratpoison: Cannot load font %s.\n", FONT); exit (EXIT_FAILURE); } @@ -299,14 +299,14 @@ init_screen (screen_info *s, int screen_num) XGetWindowAttributes (dpy, s->root, &s->root_attr); /* Get our program bar colors */ - if (!XAllocNamedColor (dpy, s->def_cmap, BAR_FG_COLOR, &fg_color, &junk)) + if (!XAllocNamedColor (dpy, s->def_cmap, FOREGROUND, &fg_color, &junk)) { - fprintf (stderr, "ratpoison: Unknown color '%s'\n", BAR_FG_COLOR); + fprintf (stderr, "ratpoison: Unknown color '%s'\n", FOREGROUND); } - if (!XAllocNamedColor (dpy, s->def_cmap, BAR_BG_COLOR, &bg_color, &junk)) + if (!XAllocNamedColor (dpy, s->def_cmap, BACKGROUND, &bg_color, &junk)) { - fprintf (stderr, "ratpoison: Unknown color '%s'\n", BAR_BG_COLOR); + fprintf (stderr, "ratpoison: Unknown color '%s'\n", BACKGROUND); } /* if (!XAllocNamedColor (dpy, s->def_cmap, BAR_BOLD_COLOR, &bold_color, &junk)) */ -- cgit v1.2.3