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.16.tar.gz
[xscreensaver]
/
hacks
/
glx
/
engine.c
diff --git
a/hacks/glx/engine.c
b/hacks/glx/engine.c
index 3310bfe8f555b50e560f7d56eb6b2714545424a2..d83c0e45a6a55437c257461330c4d073e73e6425 100644
(file)
--- a/
hacks/glx/engine.c
+++ b/
hacks/glx/engine.c
@@
-109,8
+109,12
@@
typedef struct {
rotator *rot;
trackball_state *trackball;
Bool button_down_p;
rotator *rot;
trackball_state *trackball;
Bool button_down_p;
+# ifdef HAVE_GLBITMAP
XFontStruct *xfont;
GLuint font_dlist;
XFontStruct *xfont;
GLuint font_dlist;
+# else
+ texture_font_data *font_data;
+# endif
char *engine_name;
int engineType;
int movepaused;
char *engine_name;
int engineType;
int movepaused;
@@
-916,7
+920,12
@@
ENTRYPOINT void init_engine(ModeInfo *mi)
e->shaft_polys = makeshaft(e);
e->piston_polys = makepiston(e);
e->shaft_polys = makeshaft(e);
e->piston_polys = makepiston(e);
+
+#ifdef HAVE_GLBITMAP
load_font (mi->dpy, "titleFont", &e->xfont, &e->font_dlist);
load_font (mi->dpy, "titleFont", &e->xfont, &e->font_dlist);
+#else
+ e->font_data = load_texture_font (mi->dpy, "Font");
+#endif
}
ENTRYPOINT Bool
}
ENTRYPOINT Bool
@@
-975,7
+984,12
@@
ENTRYPOINT void draw_engine(ModeInfo *mi)
mi->polygon_count = display(e);
if (do_titles)
mi->polygon_count = display(e);
if (do_titles)
- print_gl_string (mi->dpy, e->xfont, e->font_dlist,
+ print_gl_string (mi->dpy,
+# ifdef HAVE_GLBITMAP
+ e->xfont, e->font_dlist,
+# else
+ e->font_data,
+# endif
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
e->engine_name, False);
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
e->engine_name, False);