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.30.tar.gz
[xscreensaver]
/
hacks
/
glx
/
starwars.c
diff --git
a/hacks/glx/starwars.c
b/hacks/glx/starwars.c
index ada87e94933e13a533a0980fcc96695a0e0b27ba..1398c159c9bd28da58ef4664ae64c8e04059d69f 100644
(file)
--- a/
hacks/glx/starwars.c
+++ b/
hacks/glx/starwars.c
@@
-281,7
+281,7
@@
latin1_to_ascii (char *s)
static int
static int
-string_width (sws_configuration *sc, const char *s)
+s
w_s
tring_width (sws_configuration *sc, const char *s)
{
if (textures_p)
return texture_string_width (sc->texfont, s, 0);
{
if (textures_p)
return texture_string_width (sc->texfont, s, 0);
@@
-295,7
+295,7
@@
char_width (sws_configuration *sc, char c)
char s[2];
s[0] = c;
s[1] = 0;
char s[2];
s[0] = c;
s[1] = 0;
- return string_width (sc, s);
+ return s
w_s
tring_width (sc, s);
}
}
@@
-444,7
+444,7
@@
draw_string (sws_configuration *sc, GLfloat x, GLfloat y, const char *s)
while (*s)
{
*c = *s++;
while (*s)
{
*c = *s++;
- w = string_width (sc, c);
+ w = s
w_s
tring_width (sc, c);
glBegin (GL_LINE_LOOP);
glVertex3f (0, 0, 0);
glVertex3f (w, 0, 0);
glBegin (GL_LINE_LOOP);
glVertex3f (0, 0, 0);
glVertex3f (w, 0, 0);
@@
-1000,7
+1000,7
@@
draw_sws (ModeInfo *mi)
if (alignment >= 0)
{
if (alignment >= 0)
{
- int n = string_width (sc, line);
+ int n = s
w_s
tring_width (sc, line);
xoff = 1.0 - (n * sc->font_scale);
}
xoff = 1.0 - (n * sc->font_scale);
}