X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fstderr.c;h=0743a50e799e58733c2510615001cfb30b5455f5;hb=481b95e2617b69e6fd4444432747d7e1e0c3dc85;hp=9e536585268f1ac48d1ccdbb79c0214b689b968b;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver

diff --git a/driver/stderr.c b/driver/stderr.c
index 9e536585..0743a50e 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 <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
@@ -57,7 +57,7 @@ reset_stderr (saver_screen_info *ssi)
 
   if (si->prefs.debug_p)
     fprintf ((real_stderr ? real_stderr : stderr),
-	     "%s: resetting stderr\n", progname);
+	     "%s: resetting stderr\n", blurb());
 
   ssi->stderr_text_x = 0;
   ssi->stderr_text_y = 0;
@@ -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;
@@ -212,7 +207,7 @@ make_stderr_overlay_window (saver_screen_info *ssi)
       if (si->prefs.debug_p)
 	fprintf(real_stderr,
 		"%s: using overlay visual 0x%0x for stderr text layer.\n",
-		progname, (int) XVisualIDFromVisual (visual));
+		blurb(), (int) XVisualIDFromVisual (visual));
 
       ssi->stderr_cmap = XCreateColormap(si->dpy,
 					 RootWindowOfScreen(ssi->screen),