X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgears.c;h=3976f2f13ef98211b63983217cae7dd799323075;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=1f26cea286f6288da0bcd6d67f1dfd3149337c4d;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver

diff --git a/hacks/glx/gears.c b/hacks/glx/gears.c
index 1f26cea2..3976f2f1 100644
--- a/hacks/glx/gears.c
+++ b/hacks/glx/gears.c
@@ -18,7 +18,7 @@
 			"*wireframe:    False       \n" \
 			"*suppressRotationAnimation: True\n" \
 
-# define refresh_gears 0
+# define free_gears 0
 # define release_gears 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -86,8 +86,15 @@ ENTRYPOINT void
 reshape_gears (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();
@@ -698,14 +705,7 @@ init_gears (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int i;
 
-  if (!bps) {
-    bps = (gears_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (gears_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];