X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fstderr.c;h=0c999e2fcfd55cdef991c2712069e15b3243b902;hp=9e536585268f1ac48d1ccdbb79c0214b689b968b;hb=c6b273ef7292ba10943694df1656b05203d7b62f;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b diff --git a/driver/stderr.c b/driver/stderr.c index 9e536585..0c999e2f 100644 --- a/driver/stderr.c +++ b/driver/stderr.c @@ -1,5 +1,5 @@ /* stderr.c --- capturing stdout/stderr output onto the screensaver window. - * xscreensaver, Copyright (c) 1991-1997 Jamie Zawinski + * xscreensaver, Copyright (c) 1991-1998 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -90,7 +90,6 @@ static void print_stderr_1 (saver_screen_info *ssi, char *string) { saver_info *si = ssi->global; - saver_preferences *p = &si->prefs; Display *dpy = si->dpy; Screen *screen = ssi->screen; Window window = (ssi->stderr_overlay_window ? @@ -101,10 +100,6 @@ print_stderr_1 (saver_screen_info *ssi, char *string) char *head = string; char *tail; - /* In verbose mode, copy it to stderr as well. */ - if (p->verbose_p) - fprintf (real_stderr, "%s", string); - if (! ssi->stderr_font) { char *font_name = get_string_resource ("font", "Font"); @@ -131,8 +126,8 @@ print_stderr_1 (saver_screen_info *ssi, char *string) cmap = ssi->stderr_cmap; } - fg = get_pixel_resource ("textForeground", "Foreground", dpy, cmap); - bg = get_pixel_resource ("textBackground", "Background", dpy, cmap); + fg = get_pixel_resource ("overlayTextForeground","Foreground",dpy,cmap); + bg = get_pixel_resource ("overlayTextBackground","Background",dpy,cmap); gcv.font = ssi->stderr_font->fid; gcv.foreground = fg; gcv.background = bg;