-/* starwars, Copyright (c) 1998-2012 Jamie Zawinski <jwz@jwz.org> and
+/* starwars, Copyright (c) 1998-2014 Jamie Zawinski <jwz@jwz.org> and
* Claudio Matsuoka <claudio@helllabs.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
# include <unistd.h>
#endif
-
#include "starwars.h"
#define DEFAULTS "*delay: 40000 \n" \
"*showFPS: False \n" \
static int
-string_width (sws_configuration *sc, const char *s)
+sw_string_width (sws_configuration *sc, const char *s)
{
if (textures_p)
return texture_string_width (sc->texfont, s, 0);
char s[2];
s[0] = c;
s[1] = 0;
- return string_width (sc, s);
+ return sw_string_width (sc, s);
}
*/
while (target > 0)
{
- char c = textclient_getc (sc->tc);
+ int c = textclient_getc (sc->tc);
if (c <= 0)
break;
- sc->buf[sc->buf_tail++] = c;
+ sc->buf[sc->buf_tail++] = (char) c;
sc->buf[sc->buf_tail] = 0;
target--;
}
while (*s)
{
*c = *s++;
- w = string_width (sc, c);
+ w = sw_string_width (sc, c);
glBegin (GL_LINE_LOOP);
glVertex3f (0, 0, 0);
glVertex3f (w, 0, 0);
if (alignment >= 0)
{
- int n = string_width (sc, line);
+ int n = sw_string_width (sc, line);
xoff = 1.0 - (n * sc->font_scale);
}
}
+#ifdef __GNUC__
+ __extension__ /* don't warn about "string length is greater than the length
+ ISO C89 compilers are required to support" when including
+ "starwars.txt" in the defaults... */
+#endif
+
XSCREENSAVER_MODULE_2 ("StarWars", starwars, sws)
#endif /* USE_GL */