projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-3.29.tar.gz
[xscreensaver]
/
hacks
/
glx
/
cage.c
diff --git
a/hacks/glx/cage.c
b/hacks/glx/cage.c
index 27ea8030d65ff176af9e86268d9b56ab123c98ca..16bcfcf0c5aa7f80715a4fc2e07f526ebe5c0cdd 100644
(file)
--- a/
hacks/glx/cage.c
+++ b/
hacks/glx/cage.c
@@
-82,9
+82,11
@@
static const char sccsid[] = "@(#)cage.c 4.07 98/01/04 xlockmore";
# define PROGCLASS "Cage"
# define HACK_INIT init_cage
# define HACK_DRAW draw_cage
# define PROGCLASS "Cage"
# define HACK_INIT init_cage
# define HACK_DRAW draw_cage
+# define HACK_RESHAPE reshape_cage
# define cage_opts xlockmore_opts
# define DEFAULTS "*cycles: 1 \n" \
"*delay: 20000 \n" \
# define cage_opts xlockmore_opts
# define DEFAULTS "*cycles: 1 \n" \
"*delay: 20000 \n" \
+ "*showFPS: False \n" \
"*wireframe: False \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
"*wireframe: False \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@
-292,8
+294,8
@@
draw_impossiblecage(cagestruct * cp)
glPopMatrix();
}
glPopMatrix();
}
-
static
void
-reshape(ModeInfo * mi, int width, int height)
+void
+reshape
_cage
(ModeInfo * mi, int width, int height)
{
cagestruct *cp = &cage[MI_SCREEN(mi)];
{
cagestruct *cp = &cage[MI_SCREEN(mi)];
@@
-372,7
+374,7
@@
init_cage(ModeInfo * mi)
if ((cp->glx_context = init_GL(mi)) != NULL) {
if ((cp->glx_context = init_GL(mi)) != NULL) {
- reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+ reshape
_cage
(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
glDrawBuffer(GL_BACK);
if (!glIsList(objects))
objects = glGenLists(1);
glDrawBuffer(GL_BACK);
if (!glIsList(objects))
objects = glGenLists(1);
@@
-417,6
+419,7
@@
draw_cage(ModeInfo * mi)
glPopMatrix();
glPopMatrix();
+ if (mi->fps_p) do_fps (mi);
glFlush();
glXSwapBuffers(display, window);
glFlush();
glXSwapBuffers(display, window);