From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / xjack.c

diff --git a/hacks/xjack.c b/hacks/xjack.c
index da913c724fada1f2e238610feb61b911d21c13e2..f5a3eb716c78a6bb1399577a4019cd29a4aa2a4e 100644 (file)
--- a/hacks/xjack.c
+++ b/hacks/xjack.c
@@ -95,20 +95,8 @@ xjack_init (Display *dpy, Window window)
   if (st->xgwa.width <= 480)
     fontname = "-*-courier-medium-r-*-*-*-180-*-*-m-*-*-*";
 
-  st->font = XLoadQueryFont (st->dpy, fontname);
-
-  if (!st->font)
-    st->font = XLoadQueryFont (st->dpy, "-*-*-medium-r-*-*-*-240-*-*-m-*-*-*");
-  if (!st->font)
-    st->font = XLoadQueryFont (st->dpy,
-                               "-*-courier-medium-r-*-*-*-180-*-*-m-*-*-*");
-  if (!st->font)
-    st->font = XLoadQueryFont (st->dpy, "-*-*-*-r-*-*-*-240-*-*-m-*-*-*");
-  if (!st->font)
-    {
-      fprintf(stderr, "no big fixed-width font like \"%s\"\n", fontname);
-      exit(1);
-    }
+  st->font = load_font_retry (st->dpy, fontname);
+  if (!st->font) abort();
 
   gcv.font = st->font->fid;
   gcv.foreground = get_pixel_resource (st->dpy, st->xgwa.colormap,