X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcage.c;h=a2983bcd718f641990dfacf0e82ec715e945bd7b;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=2a831893f7524941d29578855a184aecc3f3eb13;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver

diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c
index 2a831893..a2983bcd 100644
--- 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.
  *
- * 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)
@@ -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 HACK_RESHAPE			reshape_cage
 # 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 */
@@ -294,8 +293,8 @@ draw_impossiblecage(cagestruct * cp)
 	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)];
 
@@ -374,7 +373,7 @@ init_cage(ModeInfo * mi)
 
 	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);
@@ -392,6 +391,8 @@ draw_cage(ModeInfo * mi)
 	Display    *display = MI_DISPLAY(mi);
 	Window      window = MI_WINDOW(mi);
 
+	MI_IS_DRAWN(mi) = True;
+
 	if (!cp->glx_context)
 		return;
 
@@ -417,6 +418,7 @@ draw_cage(ModeInfo * mi)
 
 	glPopMatrix();
 
+    if (mi->fps_p) do_fps (mi);
 	glFlush();
 
 	glXSwapBuffers(display, window);