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

[xscreensaver] / hacks / glx / unicrud.c

diff --git a/hacks/glx/unicrud.c b/hacks/glx/unicrud.c
index dae95f1bd5b5272c745c7ba3c59ff9cd5b19a8de..79422522aa22322001629f94faeb3089ebe2eee9 100644 (file)
--- a/hacks/glx/unicrud.c
+++ b/hacks/glx/unicrud.c
@@ -1,4 +1,4 @@
-/* unicrud, Copyright (c) 2016-2017 Jamie Zawinski <jwz@jwz.org>
+/* unicrud, Copyright (c) 2016-2018 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
@@ -15,7 +15,7 @@
        "*titleFont: -*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*\n" \
        "*font:      -*-helvetica-bold-r-normal-*-*-2400-*-*-*-*-iso10646-1\n" \
 
-# define refresh_unicrud 0
+# define free_unicrud 0
 # define release_unicrud 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -56,7 +56,7 @@ static unicrud_configuration *bps = NULL;
 static Bool do_spin;
 static GLfloat speed;
 static Bool do_wander;
-static char *do_block;
+static char *do_block = 0;
 static Bool do_titles;
 
 static XrmOptionDescRec opts[] = {
@@ -702,8 +702,15 @@ ENTRYPOINT void
 reshape_unicrud (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();
@@ -757,7 +764,7 @@ init_unicrud (ModeInfo *mi)
 {
   unicrud_configuration *bp;
 
-  MI_INIT (mi, bps, NULL);
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -788,7 +795,7 @@ init_unicrud (ModeInfo *mi)
 
 
   if (matches ("all", do_block))
-    do_block = "";
+    do_block = strdup("");
 
   {
     char *s;