X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fcage.c;h=654510d28e51f15f159e7a69965a4e8f1cbea6d9;hp=3590f8600f3221b80be4b302d91135d637581fb2;hb=39809ded547bdbb08207d3e514950425215b4410;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba

diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c
index 3590f860..654510d2 100644
--- a/hacks/glx/cage.c
+++ b/hacks/glx/cage.c
@@ -82,9 +82,9 @@ static const char sccsid[] = "@(#)cage.c	5.01 2001/03/01 xlockmore";
 							"*wireframe:	False	\n"			\
 							"*suppressRotationAnimation: True\n" \
 
-# define refresh_cage 0
+# define free_cage 0
 # define release_cage 0
-# define cage_handle_event 0
+# define cage_handle_event xlockmore_no_events
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else /* !STANDALONE */
 # include "xlock.h"		/* from the xlockmore distribution */
@@ -296,8 +296,14 @@ reshape_cage(ModeInfo * mi, int width, int height)
 {
 	cagestruct *cp = &cage[MI_SCREEN(mi)];
 	int i;
+    int y = 0;
 
-	glViewport(0, 0, cp->WindW = (GLint) width, cp->WindH = (GLint) height);
+    if (width > height * 5) {   /* tiny window: show middle */
+      height = width * 9/16;
+      y = -height/2;
+    }
+
+	glViewport(0, y, cp->WindW = (GLint) width, cp->WindH = (GLint) height);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
@@ -387,7 +393,7 @@ init_cage (ModeInfo * mi)
 {
 	cagestruct *cp;
 
-	MI_INIT (mi, cage, NULL);
+	MI_INIT (mi, cage);
 	cp = &cage[MI_SCREEN(mi)];
 
 	cp->step = NRAND(90);