X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fphotopile.c;h=e060f25b11fe6bf5d0b0a3fe58d0ba8dd6e59706;hp=fecef1d8f9aa3ccb302304bf6b1f17be170bf673;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hpb=39809ded547bdbb08207d3e514950425215b4410

diff --git a/hacks/glx/photopile.c b/hacks/glx/photopile.c
index fecef1d8..e060f25b 100644
--- a/hacks/glx/photopile.c
+++ b/hacks/glx/photopile.c
@@ -1,4 +1,4 @@
-/* photopile, Copyright (c) 2008-2015 Jens Kilian <jjk@acm.org>
+/* photopile, Copyright (c) 2008-2018 Jens Kilian <jjk@acm.org>
  * Based on carousel, Copyright (c) 2005-2008 Jamie Zawinski <jwz@jwz.org>
  * Loads a sequence of images and shuffles them into a pile.
  *
@@ -13,8 +13,10 @@
 
 #if defined(HAVE_COCOA) || defined(HAVE_ANDROID)
 # define DEF_FONT "OCR A Std 48, Lucida Console 48, Monaco 48"
-#else
+#elif 0  /* real X11, XQueryFont() */
 # define DEF_FONT "-*-helvetica-bold-r-normal-*-*-480-*-*-*-*-*-*"
+#else    /* real X11, load_font_retry() */
+# define DEF_FONT "-*-ocr a std-medium-r-*-*-*-480-*-*-m-*-*-*"
 #endif
 
 #define DEFAULTS  "*count:           7         \n" \
@@ -662,6 +664,7 @@ draw_image (ModeInfo *mi, int i, GLfloat t, GLfloat s, GLfloat z)
 
 # if defined(HAVE_COCOA)
       scale /= 2;
+      if (MI_WIDTH(mi) > 2560) scale /= 2;  /* Retina displays */
 # endif
 
 # if defined(HAVE_MOBILE)