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.15.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glslideshow.c
diff --git
a/hacks/glx/glslideshow.c
b/hacks/glx/glslideshow.c
index 386b4d8ff8a0b9b84bb6e59c472ff3e8dffc0780..d939c97e305347de1777262b3413869d04ec415f 100644
(file)
--- a/
hacks/glx/glslideshow.c
+++ b/
hacks/glx/glslideshow.c
@@
-1,4
+1,4
@@
-/* glslideshow, Copyright (c) 2003-20
08
Jamie Zawinski <jwz@jwz.org>
+/* glslideshow, Copyright (c) 2003-20
11
Jamie Zawinski <jwz@jwz.org>
* Loads a sequence of images and smoothly pans around them; crossfades
* when loading new images.
*
* Loads a sequence of images and smoothly pans around them; crossfades
* when loading new images.
*
@@
-358,8
+358,12
@@
image_loaded_cb (const char *filename, XRectangle *geom,
img->geom.height *= scale;
}
img->geom.height *= scale;
}
- if (img->title) /* strip filename to part between last "/" and last ".". */
+ /* xscreensaver-getimage returns paths relative to the image directory
+ now, so leave the sub-directory part in. Unless it's an absolute path.
+ */
+ if (img->title && img->title[0] == '/')
{
{
+ /* strip filename to part between last "/" and last ".". */
char *s = strrchr (img->title, '/');
if (s) strcpy (img->title, s+1);
s = strrchr (img->title, '.');
char *s = strrchr (img->title, '/');
if (s) strcpy (img->title, s+1);
s = strrchr (img->title, '.');
@@
-1210,7
+1214,6
@@
draw_slideshow (ModeInfo *mi)
draw_sprites (mi);
draw_sprites (mi);
- ss->fps = fps_compute (mi->fpst, 0);
if (mi->fps_p) do_fps (mi);
glFinish();
if (mi->fps_p) do_fps (mi);
glFinish();