http://packetstormsecurity.org/UNIX/admin/xscreensaver-3.29.tar.gz

[xscreensaver] / hacks / glx / atlantis.c

diff --git a/hacks/glx/atlantis.c b/hacks/glx/atlantis.c
index 590d3f2172b4933b8999cf4ba0d119c8598fb0c1..00853dc6a09b81b86192bb1b9a39493795b58630 100644 (file)
--- a/hacks/glx/atlantis.c
+++ b/hacks/glx/atlantis.c
@@ -102,9 +102,11 @@ static const char sccsid[] = "@(#)atlantis.c       1.3 98/06/18 xlockmore";
 # define PROGCLASS     "Atlantis"
 # define HACK_INIT     init_atlantis
 # define HACK_DRAW     draw_atlantis
+# define HACK_RESHAPE  reshape_atlantis
 # define atlantis_opts xlockmore_opts
 # define DEFAULTS      "*delay:       40000 \n" \
                         "*count:          4 \n" \
+                        "*showFPS:    False \n" \
                         "*cycles:       100 \n" \
                         "*size:        6000 \n" \
                         "*whalespeed:   250 \n"
@@ -238,8 +240,8 @@ Init(atlantisstruct * ap)
        glClearColor(0.0, fgreen, fblue, 0.0);
 }
 
-static void
-Reshape(ModeInfo * mi, int width, int height)
+void
+reshape_atlantis(ModeInfo * mi, int width, int height)
 {
        atlantisstruct *ap = &atlantis[MI_SCREEN(mi)];
 
@@ -357,7 +359,7 @@ init_atlantis(ModeInfo * mi)
        }
        if ((ap->glx_context = init_GL(mi)) != NULL) {
 
-               Reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+               reshape_atlantis(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
                glDrawBuffer(GL_BACK);
                Init(ap);
                AllDisplay(ap);
@@ -397,6 +399,7 @@ draw_atlantis(ModeInfo * mi)
 
         glPopMatrix();
 
+        if (mi->fps_p) do_fps (mi);
        glXSwapBuffers(display, window);
 }