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

[xscreensaver] / hacks / glx / timetunnel.c

diff --git a/hacks/glx/timetunnel.c b/hacks/glx/timetunnel.c
index 882635000deee9be0c1b20f31589ec0f6fb2b0c4..106f6a64c588b98a14950530a8545cdf716ff624 100644 (file)
--- a/hacks/glx/timetunnel.c
+++ b/hacks/glx/timetunnel.c
@@ -23,7 +23,7 @@
 
 
 
-# define refresh_tunnel 0
+# define free_tunnel 0
 # define release_tunnel 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -352,8 +352,15 @@ ENTRYPOINT void
 reshape_tunnel (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();
@@ -877,8 +884,8 @@ static void LoadTexture(ModeInfo * mi, char **fn, const char *filename, GLuint t
                        by = by * 2;
        }
 
-#ifndef HAVE_JWZGLES
        if (rescale) {
+#ifndef HAVE_JWZGLES
                tmpbuf = calloc(bx * by * 4, sizeof(unsigned char));
                if (gluScaleImage(GL_RGBA, teximage->width, teximage->height, GL_UNSIGNED_BYTE, teximage->data,
                                bx, by, GL_UNSIGNED_BYTE, tmpbuf))
@@ -888,9 +895,9 @@ static void LoadTexture(ModeInfo * mi, char **fn, const char *filename, GLuint t
                teximage->data = (char *) tmpbuf;
                teximage->width = bx;
                teximage->height= by;
+#endif /* !HAVE_JWZGLES */
        }
        /* end rescale code */
-#endif /* !HAVE_JWZGLES */
                
        if (anegative ) {
                for (ix = 0 ; ix < teximage->height * teximage->width; ix++)
@@ -1031,14 +1038,7 @@ init_tunnel (ModeInfo *mi)
   wire = 0;
 # endif
 
-  if (!tconf) {
-    tconf = (tunnel_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (tunnel_configuration));
-    if (!tconf) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, tconf);
 
   tc = &tconf[MI_SCREEN(mi)];