projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz
[xscreensaver]
/
hacks
/
glx
/
photopile.c
diff --git
a/hacks/glx/photopile.c
b/hacks/glx/photopile.c
index 0f6312febf6a96b74a288a0b39f4dd5012e9e80f..e060f25b11fe6bf5d0b0a3fe58d0ba8dd6e59706 100644
(file)
--- a/
hacks/glx/photopile.c
+++ b/
hacks/glx/photopile.c
@@
-1,4
+1,4
@@
-/* photopile, Copyright (c) 2008-201
5
Jens Kilian <jjk@acm.org>
+/* photopile, Copyright (c) 2008-201
8
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.
*
* 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"
#if defined(HAVE_COCOA) || defined(HAVE_ANDROID)
# define DEF_FONT "OCR A Std 48, Lucida Console 48, Monaco 48"
-#el
se
+#el
if 0 /* real X11, XQueryFont() */
# define DEF_FONT "-*-helvetica-bold-r-normal-*-*-480-*-*-*-*-*-*"
# 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" \
#endif
#define DEFAULTS "*count: 7 \n" \
@@
-29,9
+31,9
@@
"*chooseRandomImages: True \n" \
"*suppressRotationAnimation: True\n" \
"*chooseRandomImages: True \n" \
"*suppressRotationAnimation: True\n" \
-# define
refresh
_photopile 0
+# define
free
_photopile 0
# define release_photopile 0
# define release_photopile 0
-# define photopile_handle_event
0
+# define photopile_handle_event
xlockmore_no_events
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-480,7
+482,7
@@
init_photopile (ModeInfo *mi)
photopile_state *ss;
int wire = MI_IS_WIREFRAME(mi);
photopile_state *ss;
int wire = MI_IS_WIREFRAME(mi);
- MI_INIT (mi, sss
, NULL
);
+ MI_INIT (mi, sss);
ss = &sss[screen];
ss->mi = mi;
ss = &sss[screen];
ss->mi = mi;
@@
-662,6
+664,7
@@
draw_image (ModeInfo *mi, int i, GLfloat t, GLfloat s, GLfloat z)
# if defined(HAVE_COCOA)
scale /= 2;
# if defined(HAVE_COCOA)
scale /= 2;
+ if (MI_WIDTH(mi) > 2560) scale /= 2; /* Retina displays */
# endif
# if defined(HAVE_MOBILE)
# endif
# if defined(HAVE_MOBILE)