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

[xscreensaver] / hacks / glx / skytentacles.c

diff --git a/hacks/glx/skytentacles.c b/hacks/glx/skytentacles.c
index 3e0cfcf025687ef11aef6d16e00da41ffddfdb06..9072f8f9abf0dc4807b7eedecec6987e0b13f71e 100644 (file)
--- a/hacks/glx/skytentacles.c
+++ b/hacks/glx/skytentacles.c
@@ -14,7 +14,7 @@
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
 
-# define refresh_tentacles 0
+# define free_tentacles 0
 # define release_tentacles 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -171,8 +171,15 @@ reshape_tentacles (ModeInfo *mi, int width, int height)
 {
   tentacles_configuration *tc = &tcs[MI_SCREEN(mi)];
   GLfloat h = (GLfloat) height / (GLfloat) width;
+  int y = 0;
 
-  glViewport (0, 0, (GLint) width, (GLint) height);
+  if (width > height * 5) {   /* tiny window: show middle */
+    height = width * 9/16;
+    y = -height/2;
+    h = height / (GLfloat) width;
+  }
+
+  glViewport (0, y, (GLint) width, (GLint) height);
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
@@ -818,7 +825,7 @@ tentacles_handle_event (ModeInfo *mi, XEvent *event)
       XLookupString (&event->xkey, &c, 1, &keysym, 0);
       if (c == ' ')
         {
-          gltrackball_reset (tc->trackball);
+          gltrackball_reset (tc->trackball, 0, 0);
           return True;
         }
     }
@@ -851,14 +858,7 @@ init_tentacles (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int i;
 
-  if (!tcs) {
-    tcs = (tentacles_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (tentacles_configuration));
-    if (!tcs) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, tcs);
 
   tc = &tcs[MI_SCREEN(mi)];