X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fsuperquadrics.c;h=022392c114e64bb7bd43e861b878aa7babb06f64;hb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;hp=cfc2999a56d7a8938ba9f125423063e9636e8e0f;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver

diff --git a/hacks/glx/superquadrics.c b/hacks/glx/superquadrics.c
index cfc2999a..022392c1 100644
--- a/hacks/glx/superquadrics.c
+++ b/hacks/glx/superquadrics.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* superquadrics --- 3D mathematical shapes */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)superquadrics.c	4.07 97/11/24 xlockmore";
-
 #endif
 
 /*-
@@ -83,9 +82,10 @@ static const char sccsid[] = "@(#)superquadrics.c	4.07 97/11/24 xlockmore";
 # define HACK_INIT					init_superquadrics
 # define HACK_DRAW					draw_superquadrics
 # define superquadrics_opts			xlockmore_opts
-# define DEFAULTS	"*delay:		100     \n"			\
+# define DEFAULTS	"*delay:		40000   \n"			\
 					"*count:		25      \n"			\
 					"*cycles:		40      \n"			\
+					"*showFPS:      False   \n"			\
 					"*wireframe:	False	\n"
 # include "xlockmore.h"				/* from the xscreensaver distribution */
 #else  /* !STANDALONE */
@@ -111,7 +111,7 @@ static XrmOptionDescRec opts[] =
 };
 static argtype vars[] =
 {
-  {(caddr_t *) & spinspeed, "spinspeed", "Spinspeed", DEF_SPINSPEED, t_Float}
+  {&spinspeed, "spinspeed", "Spinspeed", DEF_SPINSPEED, t_Float}
 };
 static OptionStruct desc[] =
 {
@@ -752,6 +752,7 @@ draw_superquadrics(ModeInfo * mi)
 
 	NextSuperquadricDisplay(sp);
 
+    if (mi->fps_p) do_fps (mi);
 	glFinish();
 	glXSwapBuffers(display, window);
 }