X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxsublim.c;h=719de50c8bb7641e60bb075d2b08941370ac633f;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=60d4ce69abbaf9b0fa4250bb3783bc023e99d6a0;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/xsublim.c b/hacks/xsublim.c index 60d4ce69..719de50c 100644 --- a/hacks/xsublim.c +++ b/hacks/xsublim.c @@ -107,6 +107,7 @@ #include "usleep.h" #include "yarandom.h" #include "resources.h" +#include "font-retry.h" #include "vroot.h" @@ -313,12 +314,10 @@ int main(int argc,char* argv[]) "-*-character-*-r-*-*-*-600-*-*-p-*-*-*", "-*-helvetica-*-r-*-*-*-600-*-*-p-*-*-*", "-*-lucida-*-r-*-*-*-600-*-*-p-*-*-*", - "-*-times-*-r-*-*-*-600-*-*-p-*-*-*", "-*-*-*-r-*-sans-*-600-*-*-p-*-*-*", "-*-*-*-r-*-*-*-600-*-*-m-*-*-*", "-*-helvetica-*-r-*-*-*-240-*-*-p-*-*-*", "-*-lucida-*-r-*-*-*-240-*-*-p-*-*-*", - "-*-times-*-r-*-*-*-240-*-*-p-*-*-*", "-*-*-*-r-*-sans-*-240-*-*-p-*-*-*", "-*-*-*-r-*-*-*-240-*-*-m-*-*-*", "fixed", @@ -557,12 +556,12 @@ int main(int argc,char* argv[]) } /* Load the font */ - font_Font = XLoadQueryFont(dpy, + font_Font = load_font_retry(dpy, get_string_resource(dpy, XSUBLIM_ARG_FONT,"Font")); font_Index = 0; while ((font_Font == NULL) && (font_List[font_Index] != NULL)) { - font_Font = XLoadQueryFont(dpy,font_List[font_Index]); + font_Font = load_font_retry(dpy,font_List[font_Index]); font_Index++; } if (font_Font == NULL)