summaryrefslogtreecommitdiffstats
path: root/utils/font-retry.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-07-30 16:03:58 +0200
committerSimon Rettberg2019-07-30 16:03:58 +0200
commit6a32252403781b303d4ebd195932ce39c5b1c08e (patch)
treecd2f8b3c4052c1b575caf33c9983ae531fad9092 /utils/font-retry.c
parentRemove android and OSX files (diff)
downloadxscreensaver-6a32252403781b303d4ebd195932ce39c5b1c08e.tar.gz
xscreensaver-6a32252403781b303d4ebd195932ce39c5b1c08e.tar.xz
xscreensaver-6a32252403781b303d4ebd195932ce39c5b1c08e.zip
Update to 5.43
Diffstat (limited to 'utils/font-retry.c')
-rw-r--r--utils/font-retry.c53
1 files changed, 33 insertions, 20 deletions
diff --git a/utils/font-retry.c b/utils/font-retry.c
index ab999e2..f8e6507 100644
--- a/utils/font-retry.c
+++ b/utils/font-retry.c
@@ -107,26 +107,39 @@ load_font_retry_1 (Display *dpy, int screen, const char *xlfd, Bool xft_p)
}
else
{
- const char *fixed[] = { "courier",
- "courier new",
- "courier 10 pitch",
- "lucidatypewriter",
- "american typewriter",
- "fixed",
- "ocr a std",
- "*" };
- const char *variable[] = { "helvetica",
- "arial",
- "bitstream vera sans",
- "gill sans",
- "times",
- "times new roman",
- "new century schoolbook",
- "utopia",
- "palatino",
- "lucida",
- "bitstream charter",
- "*" };
+ const char *variable[] = {
+ "helvetica",
+ "arial",
+ "bitstream vera sans",
+ "gill sans",
+ "times",
+ "times new roman",
+ "new century schoolbook",
+ "utopia",
+ "palatino",
+ "lucida",
+ "bitstream charter",
+
+ /* Don't use a wildcard family. If none of the above worked, then
+ then almost none of the X11 fonts are installed, and it's not
+ unlikely that "-*-*-medium-r-*-*-*-140-*-*-*-10646-1" will
+ match an Arabic or or Japanese font that contains no Latin
+ glyphs at all, even in a Latin locale. So in that case, just
+ let "helvetica" fall back to "fixed".
+ */
+ /* "*" */
+ };
+ const char *fixed[] = {
+ "courier",
+ "courier new",
+ "courier 10 pitch",
+ "lucidatypewriter",
+ "american typewriter",
+ "fixed",
+ "ocr a std",
+ /* As above, but "can't happen" because we already tried fixed? */
+ /* "*" */
+ };
const char *charsets[] = { "iso10646-1", "iso8859-1", "*-*" };
const char *weights[] = { "bold", "medium" };
const char *slants[] = { "o", "i", "r" };