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

[xscreensaver] / hacks / glx / hexstrut.c

diff --git a/hacks/glx/hexstrut.c b/hacks/glx/hexstrut.c
index fc6d30970682e554df95fa4ca624a63b09033f69..a547a76ca1fe22c2c74872f8459c3d6f51a35d33 100644 (file)
--- a/hacks/glx/hexstrut.c
+++ b/hacks/glx/hexstrut.c
@@ -15,7 +15,6 @@
                        "*count:        20          \n" \
                        "*suppressRotationAnimation: True\n" \
 
-# define refresh_hexstrut 0
 # define release_hexstrut 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -333,8 +332,15 @@ ENTRYPOINT void
 reshape_hexstrut (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 * 3) {   /* 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();
@@ -386,14 +392,12 @@ hexstrut_handle_event (ModeInfo *mi, XEvent *event)
 }
 
 
-static void free_hexstrut (ModeInfo *mi);
-
 ENTRYPOINT void 
 init_hexstrut (ModeInfo *mi)
 {
   hexstrut_configuration *bp;
 
-  MI_INIT (mi, bps, free_hexstrut);
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -488,7 +492,7 @@ draw_hexstrut (ModeInfo *mi)
 }
 
 
-static void
+ENTRYPOINT void
 free_hexstrut (ModeInfo *mi)
 {
   hexstrut_configuration *bp = &bps[MI_SCREEN(mi)];