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

[xscreensaver] / hacks / glx / discoball.c

diff --git a/hacks/glx/discoball.c b/hacks/glx/discoball.c
index 5e8ee92593a5faeca7c9574a6a81f75846ee7047..4085c56d124b3ec5fe977c9eb21fb7c2c227a35b 100644 (file)
--- a/hacks/glx/discoball.c
+++ b/hacks/glx/discoball.c
@@ -14,7 +14,7 @@
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
 
-# define refresh_ball 0
+# define release_ball 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
@@ -498,8 +498,15 @@ ENTRYPOINT void
 reshape_ball (ModeInfo *mi, int width, int height)
 {
   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();
@@ -543,14 +550,7 @@ init_ball (ModeInfo *mi)
   ball_configuration *bp;
   int wire = MI_IS_WIREFRAME(mi);
 
-  if (!bps) {
-    bps = (ball_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (ball_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -690,7 +690,7 @@ draw_ball (ModeInfo *mi)
 
 
 ENTRYPOINT void
-release_ball (ModeInfo *mi)
+free_ball (ModeInfo *mi)
 {
   ball_configuration *bp = &bps[MI_SCREEN(mi)];
   while (bp->tiles)