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-4.00.tar.gz
[xscreensaver]
/
hacks
/
glx
/
cage.c
diff --git
a/hacks/glx/cage.c
b/hacks/glx/cage.c
index 412c719f9398b7f7410094081e85a8ceafa9dbea..a2983bcd718f641990dfacf0e82ec715e945bd7b 100644
(file)
--- a/
hacks/glx/cage.c
+++ b/
hacks/glx/cage.c
@@
-38,9
+38,7
@@
static const char sccsid[] = "@(#)cage.c 4.07 98/01/04 xlockmore";
* Since I'm not a native English speaker, my apologies for any grammatical
* mistake.
*
* Since I'm not a native English speaker, my apologies for any grammatical
* mistake.
*
- * My e-mail addresses are
- * vianna@cat.cbpf.br
- * and
+ * My e-mail address is
* m-vianna@usa.net
*
* Marcelo F. Vianna (Jun-01-1997)
* m-vianna@usa.net
*
* Marcelo F. Vianna (Jun-01-1997)
@@
-84,9
+82,10
@@
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 cage_opts xlockmore_opts
-# define DEFAULTS "*
cycles: 1
\n" \
- "*
delay: 1000
\n" \
+# define DEFAULTS "*
delay: 25000
\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 */
@@
-294,8
+293,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)];
@@
-374,7
+373,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);
@@
-419,6
+418,7
@@
draw_cage(ModeInfo * mi)
glPopMatrix();
glPopMatrix();
+ if (mi->fps_p) do_fps (mi);
glFlush();
glXSwapBuffers(display, window);
glFlush();
glXSwapBuffers(display, window);