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.31.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glslideshow.c
diff --git
a/hacks/glx/glslideshow.c
b/hacks/glx/glslideshow.c
index bf5f87d22428cbb761a29bf450b899404af1391c..992d75cbbea974029b05b8ec1ba7c9e6dff40338 100644
(file)
--- a/
hacks/glx/glslideshow.c
+++ b/
hacks/glx/glslideshow.c
@@
-73,7
+73,7
@@
"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*useSHM: True \n" \
"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*useSHM: True \n" \
-
"*titleFont: -*-helvetica-medium-r-normal-*-180
-*\n" \
+
"*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*
-*\n" \
"*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
"*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
@@
-99,7
+99,7
@@
# define DEF_MIPMAP "True"
#include "grab-ximage.h"
# define DEF_MIPMAP "True"
#include "grab-ximage.h"
-#include "
glxfonts
.h"
+#include "
texfont
.h"
typedef struct {
double x, y, w, h;
typedef struct {
double x, y, w, h;
@@
-806,19
+806,13
@@
draw_sprite (ModeInfo *mi, sprite *sp)
if (do_titles &&
if (do_titles &&
- img->title && *img->title)
+ img->title && *img->title &&
+ (sp->state == IN || sp->state == FULL))
{
{
- int x = 10;
- int y = mi->xgwa.height - 10;
- glColor4f (0, 0, 0, sp->opacity); /* cheap-assed dropshadow */
- print_gl_string (mi->dpy, ss->font_data,
- mi->xgwa.width, mi->xgwa.height, x, y,
- img->title, False);
- x++; y++;
glColor4f (1, 1, 1, sp->opacity);
glColor4f (1, 1, 1, sp->opacity);
- print_
gl_string
(mi->dpy, ss->font_data,
-
mi->xgwa.width, mi->xgwa.height, x, y
,
-
img->title, Fals
e);
+ print_
texture_label
(mi->dpy, ss->font_data,
+
mi->xgwa.width, mi->xgwa.height
,
+
1, img->titl
e);
}
}
glPopMatrix();
}
}
glPopMatrix();