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

[xscreensaver] / hacks / glx / jigsaw.c

diff --git a/hacks/glx/jigsaw.c b/hacks/glx/jigsaw.c
index 541239308576d7b1daa96e459f16c36667b2d49f..5185f9b55fe135149cf1c8c8d80dccd5af3e612a 100644 (file)
--- a/hacks/glx/jigsaw.c
+++ b/hacks/glx/jigsaw.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997-2015 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997-2017 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -59,7 +59,7 @@
                  "*suppressRotationAnimation: True\n" \
 
 
-# define refresh_jigsaw 0
+# define free_jigsaw 0
 # define release_jigsaw 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -1325,8 +1325,15 @@ reshape_jigsaw (ModeInfo *mi, int width, int height)
 {
   jigsaw_configuration *jc = &sps[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();
@@ -1378,14 +1385,7 @@ init_jigsaw (ModeInfo *mi)
   jigsaw_configuration *jc;
   int wire = MI_IS_WIREFRAME(mi);
 
-  if (!sps) {
-    sps = (jigsaw_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (jigsaw_configuration));
-    if (!sps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, sps);
   jc = &sps[MI_SCREEN(mi)];
   jc->glx_context = init_GL(mi);