projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.tienza.es/crux/src/www.jwz.org/xscreensaver/xscreensaver-5.04.tar.gz
[xscreensaver]
/
driver
/
splash.c
diff --git
a/driver/splash.c
b/driver/splash.c
index 52c21ad6c0e21881df9b1c0e0bf5a5dfed72007e..56f66daf5c69f38c62203aab1f4657b299f29153 100644
(file)
--- a/
driver/splash.c
+++ b/
driver/splash.c
@@
-87,10
+87,7
@@
draw_shaded_rectangle (Display *dpy, Window window,
int
string_width (XFontStruct *font, char *s)
{
int
string_width (XFontStruct *font, char *s)
{
- int direction, ascent, descent;
- XCharStruct overall;
- XTextExtents (font, s, strlen(s), &direction, &ascent, &descent, &overall);
- return overall.width;
+ return XTextWidth(font, s, strlen(s));
}
}
@@
-417,7
+414,9
@@
make_splash_dialog (saver_info *si)
attrmask, &attrs);
XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
attrmask, &attrs);
XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
- sp->logo_pixmap = xscreensaver_logo (ssi->screen, ssi->current_visual,
+ sp->logo_pixmap = xscreensaver_logo (ssi->screen,
+ /* same visual as si->splash_dialog */
+ DefaultVisualOfScreen (ssi->screen),
si->splash_dialog, cmap,
sp->background,
&sp->logo_pixels, &sp->logo_npixels,
si->splash_dialog, cmap,
sp->background,
&sp->logo_pixels, &sp->logo_npixels,