X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fdiscoball.c;h=4085c56d124b3ec5fe977c9eb21fb7c2c227a35b;hp=015c59a50f5405ed46e64a2d711d98319396885e;hb=39809ded547bdbb08207d3e514950425215b4410;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba

diff --git a/hacks/glx/discoball.c b/hacks/glx/discoball.c
index 015c59a5..4085c56d 100644
--- a/hacks/glx/discoball.c
+++ b/hacks/glx/discoball.c
@@ -14,7 +14,6 @@
 			"*showFPS:      False       \n" \
 			"*wireframe:    False       \n" \
 
-# define refresh_ball 0
 # define release_ball 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -499,8 +498,15 @@ ENTRYPOINT void
 reshape_ball (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();
@@ -538,16 +544,13 @@ ball_handle_event (ModeInfo *mi, XEvent *event)
 }
 
 
-static void free_ball (ModeInfo *mi);
-
-
 ENTRYPOINT void 
 init_ball (ModeInfo *mi)
 {
   ball_configuration *bp;
   int wire = MI_IS_WIREFRAME(mi);
 
-  MI_INIT (mi, bps, free_ball);
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -686,7 +689,7 @@ draw_ball (ModeInfo *mi)
 }
 
 
-static void
+ENTRYPOINT void
 free_ball (ModeInfo *mi)
 {
   ball_configuration *bp = &bps[MI_SCREEN(mi)];