X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxjack.c;h=f5a3eb716c78a6bb1399577a4019cd29a4aa2a4e;hp=da913c724fada1f2e238610feb61b911d21c13e2;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hpb=39809ded547bdbb08207d3e514950425215b4410 diff --git a/hacks/xjack.c b/hacks/xjack.c index da913c72..f5a3eb71 100644 --- 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,