http://ftp.x.org/contrib/applications/xscreensaver-2.21.tar.gz

[xscreensaver] / driver / stderr.c

diff --git a/driver/stderr.c b/driver/stderr.c
index 9e536585268f1ac48d1ccdbb79c0214b689b968b..0c999e2fcfd55cdef991c2712069e15b3243b902 100644 (file)
--- 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 <jwz@netscape.com>
+ * xscreensaver, Copyright (c) 1991-1998 Jamie Zawinski <jwz@netscape.com>
  *
  * 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;