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
/
glsnake.c
diff --git
a/hacks/glx/glsnake.c
b/hacks/glx/glsnake.c
index 4d13a93243a70af5d5318c82555cec413eaebbbf..2117a93889529911070e23ae08ac47baca399dd6 100644
(file)
--- a/
hacks/glx/glsnake.c
+++ b/
hacks/glx/glsnake.c
@@
-201,12
+201,7
@@
struct model_s {
struct glsnake_cfg {
#ifndef HAVE_GLUT
GLXContext * glx_context;
struct glsnake_cfg {
#ifndef HAVE_GLUT
GLXContext * glx_context;
-# ifdef HAVE_GLBITMAP
- XFontStruct * font;
- GLuint font_list;
-# else
- texture_font_data *font_data;
-# endif
+ texture_font_data *font_data;
#else
/* font list number */
int font;
#else
/* font list number */
int font;
@@
-1502,11
+1497,7
@@
ModeInfo * mi
/* set up a font for the labels */
#ifndef HAVE_GLUT
if (titles)
/* set up a font for the labels */
#ifndef HAVE_GLUT
if (titles)
-# ifdef HAVE_GLBITMAP
- load_font(mi->dpy, "labelfont", &bp->font, &bp->font_list);
-# else
- bp->font_data = load_texture_font (mi->dpy, "labelFont");
-# endif
+ bp->font_data = load_texture_font (mi->dpy, "labelfont");
#endif
/* build a solid display list */
#endif
/* build a solid display list */
@@
-1742,13
+1733,8
@@
static void draw_title(
glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, s[i++]);
}
#else
glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, s[i++]);
}
#else
- print_gl_string(mi->dpy,
-# ifdef HAVE_GLBITMAP
- bp->font, bp->font_list,
-# else
- bp->font_data,
-# endif
- mi->xgwa.width, mi->xgwa.height,
+ print_gl_string(mi->dpy, bp->font_data,
+ mi->xgwa.width, mi->xgwa.height,
10.0, (float) mi->xgwa.height - 10.0,
s, False);
#endif
10.0, (float) mi->xgwa.height - 10.0,
s, False);
#endif