http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.24.tar.gz

[xscreensaver] / hacks / fontglide.c

diff --git a/hacks/fontglide.c b/hacks/fontglide.c
index 02493c8543c0f12951b929ed1505d5fca1d9759a..c1e4bdd343623857a64e3696620194851132a6e9 100644 (file)
--- a/hacks/fontglide.c
+++ b/hacks/fontglide.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2003 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2003, 2005 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -284,8 +284,9 @@ pick_font_1 (state *s, sentence *se)
   se->font = XLoadQueryFont (s->dpy, pattern);
   if (! se->font)
     {
-      fprintf (stderr, "%s: unable to load font %s\n",
-               progname, pattern);
+      if (s->debug_p)
+        fprintf (stderr, "%s: unable to load font %s\n",
+                 progname, pattern);
       return False;
     }
 
@@ -325,7 +326,7 @@ pick_font (state *s, sentence *se)
   for (i = 0; i < 20; i++)
     if (pick_font_1 (s, se))
       return;
-  fprintf (stderr, "%s: too many failures: giving up!\n", progname);
+  fprintf (stderr, "%s: too many font-loading failures: giving up!\n", progname);
   exit (1);
 }
 
@@ -1346,9 +1347,7 @@ static void
 launch_text_generator (state *s)
 {
   char *oprogram = get_string_resource ("program", "Program");
-  char *program;
-
-  program = (char *) malloc (strlen (oprogram) + 10);
+  char *program = (char *) malloc (strlen (oprogram) + 10);
   strcpy (program, "( ");
   strcat (program, oprogram);
   strcat (program, " ) 2>&1");
@@ -1536,7 +1535,7 @@ char *defaults [] = {
   ".foreground:                #DDDDDD",
   ".borderColor:       #555555",
   "*delay:             10000",
-  "*program:         " FORTUNE_PROGRAM,
+  "*program:           xscreensaver-text",
   "*mode:               random",
   ".font:               (default)",
   "*fontCharset:        iso8859-1",