From http://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz

[xscreensaver] / hacks / glx / moebius.c

diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c
index 8c92ff7f073844886c58459ccb657752de1efc8c..5fe2d9b8a8c4f43438ee51932eff61010bd6ff5a 100644 (file)
--- a/hacks/glx/moebius.c
+++ b/hacks/glx/moebius.c
@@ -79,7 +79,8 @@ static const char sccsid[] = "@(#)moebius.c   5.01 2001/03/01 xlockmore";
 
 #ifdef STANDALONE
 # define MODE_moebius
-# define refresh_moebius 0
+# define free_moebius 0
+# define release_moebius 0
 # define DEFAULTS                      "*delay:                20000   \n"                     \
                                                        "*showFPS:      False   \n"                     \
                                                        "*suppressRotationAnimation: True\n" \
@@ -148,7 +149,7 @@ ENTRYPOINT ModeSpecOpt moebius_opts =
 
 #ifdef USE_MODULES
 ModStruct   moebius_description =
-{"moebius", "init_moebius", "draw_moebius", "release_moebius",
+{"moebius", "init_moebius", "draw_moebius", (char *) NULL,
  "draw_moebius", "change_moebius", (char *) NULL, &moebius_opts,
  1000, 1, 1, 1, 4, 1.0, "",
  "Shows Moebius Strip II, an Escher-like GL scene with ants", 0, NULL};
@@ -563,8 +564,14 @@ ENTRYPOINT void
 reshape_moebius (ModeInfo * mi, int width, int height)
 {
        moebiusstruct *mp = &moebius[MI_SCREEN(mi)];
+    int y = 0;
 
-       glViewport(0, 0, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
+    if (width > height * 5) {   /* tiny window: show middle */
+      height = width;
+      y = -height/2;
+    }
+
+       glViewport(0, y, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
        glMatrixMode(GL_PROJECTION);
        glLoadIdentity();
        glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
@@ -653,17 +660,6 @@ pinit(ModeInfo *mi)
 }
 
 
-
-ENTRYPOINT void
-release_moebius (ModeInfo * mi)
-{
-       if (moebius != NULL) {
-               (void) free((void *) moebius);
-               moebius = (moebiusstruct *) NULL;
-       }
-       FreeAllGL(mi);
-}
-
 ENTRYPOINT Bool
 moebius_handle_event (ModeInfo *mi, XEvent *event)
 {
@@ -683,11 +679,7 @@ init_moebius (ModeInfo * mi)
 {
        moebiusstruct *mp;
 
-       if (moebius == NULL) {
-               if ((moebius = (moebiusstruct *) calloc(MI_NUM_SCREENS(mi),
-                                           sizeof (moebiusstruct))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, moebius);
        mp = &moebius[MI_SCREEN(mi)];
        mp->step = NRAND(90);
        mp->ant_position = NRAND(90);
@@ -764,7 +756,7 @@ draw_moebius (ModeInfo * mi)
 
        /* moebius */
        if (!draw_moebius_strip(mi)) {
-               release_moebius(mi);
+               MI_ABORT(mi);
                return;
        }