X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fstairs.c;h=e905cae4a76c51f85be59de8d2c96979ed2e320d;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=97808a0c86d14509c7688b6b89c3c2b696351faf;hpb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;p=xscreensaver

diff --git a/hacks/glx/stairs.c b/hacks/glx/stairs.c
index 97808a0c..e905cae4 100644
--- a/hacks/glx/stairs.c
+++ b/hacks/glx/stairs.c
@@ -64,9 +64,10 @@ static const char sccsid[] = "@(#)stairs.c	4.07 97/11/24 xlockmore";
 # define PROGCLASS			"Stairs"
 # define HACK_INIT			init_stairs
 # define HACK_DRAW			draw_stairs
+# define HACK_RESHAPE		reshape_stairs
 # define stairs_opts		xlockmore_opts
-# define DEFAULTS			"*cycles:		1       \n"			\
-							"*delay:		20000   \n"			\
+# define DEFAULTS			"*delay:		20000   \n"			\
+							"*showFPS:      False   \n"			\
 							"*wireframe:	False	\n"
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else /* !STANDALONE */
@@ -414,8 +415,8 @@ draw_stairs_internal(ModeInfo * mi)
 		sp->sphere_position = 0;
 }
 
-static void
-reshape(ModeInfo * mi, int width, int height)
+void
+reshape_stairs(ModeInfo * mi, int width, int height)
 {
 	stairsstruct *sp = &stairs[MI_SCREEN(mi)];
 
@@ -495,7 +496,7 @@ init_stairs(ModeInfo * mi)
 
 	if ((sp->glx_context = init_GL(mi)) != NULL) {
 
-		reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+		reshape_stairs(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
 		glDrawBuffer(GL_BACK);
 		if (!glIsList(objects))
 			objects = glGenLists(1);
@@ -541,6 +542,7 @@ draw_stairs(ModeInfo * mi)
 
 	glPopMatrix();
 
+    if (mi->fps_p) do_fps (mi);
 	glFlush();
 
 	glXSwapBuffers(display, window);