X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ftimetunnel.c;h=106f6a64c588b98a14950530a8545cdf716ff624;hb=39809ded547bdbb08207d3e514950425215b4410;hp=53d8dd97b9d145be1cc6a167a461aeaf1b1a0935;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;p=xscreensaver

diff --git a/hacks/glx/timetunnel.c b/hacks/glx/timetunnel.c
index 53d8dd97..106f6a64 100644
--- 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();
@@ -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)];