X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fmorph3d.c;h=a2a383ab387ff21732278d16c231715339d736da;hb=a445bdd3e3ba4abbee441844b6665b4c3c13d48c;hp=1fc3e1b993e06cf0cdd269c14e536e0f9f120c11;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver

diff --git a/hacks/glx/morph3d.c b/hacks/glx/morph3d.c
index 1fc3e1b9..a2a383ab 100644
--- a/hacks/glx/morph3d.c
+++ b/hacks/glx/morph3d.c
@@ -39,9 +39,7 @@ static const char sccsid[] = "@(#)morph3d.c	4.07 97/11/24 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 (Feb-13-1997)
@@ -69,9 +67,11 @@ static const char sccsid[] = "@(#)morph3d.c	4.07 97/11/24 xlockmore";
 # define PROGCLASS		"Morph3d"
 # define HACK_INIT		init_morph3d
 # define HACK_DRAW		draw_morph3d
-# define morph3d_opts		xlockmore_opts
-# define DEFAULTS		"*delay: 1000 \n" \
-				"*count: 0 \n"
+# define HACK_RESHAPE	reshape_morph3d
+# define morph3d_opts	xlockmore_opts
+# define DEFAULTS		"*delay:		40000	\n"		\
+						"*showFPS:      False   \n"		\
+						"*count: 		0		\n"
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else /* !STANDALONE */
 # include "xlock.h"		/* from the xlockmore distribution */
@@ -652,8 +652,8 @@ draw_icosa(ModeInfo * mi)
 	glDeleteLists(list, 1);
 }
 
-static void
-reshape(ModeInfo * mi, int width, int height)
+void
+reshape_morph3d(ModeInfo * mi, int width, int height)
 {
 	morph3dstruct *mp = &morph3d[MI_SCREEN(mi)];
 
@@ -793,7 +793,7 @@ init_morph3d(ModeInfo * mi)
 
 	if ((mp->glx_context = init_GL(mi)) != NULL) {
 
-		reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+		reshape_morph3d(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
 		mp->object = MI_COUNT(mi);
 		if (mp->object <= 0 || mp->object > 5)
 			mp->object = NRAND(5) + 1;
@@ -858,6 +858,8 @@ draw_morph3d(ModeInfo * mi)
 
 	glPopMatrix();
 
+    if (mi->fps_p) do_fps (mi);
+
 	glFlush();
 
 	glXSwapBuffers(display, window);