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

[xscreensaver] / hacks / glx / cubicgrid.c

diff --git a/hacks/glx/cubicgrid.c b/hacks/glx/cubicgrid.c
index 82a1862b258db5734a445fa4c8b8f793e22a5194..34b6c34aed604b91d1d993ecca680343de4b2dbd 100644 (file)
--- a/hacks/glx/cubicgrid.c
+++ b/hacks/glx/cubicgrid.c
@@ -24,7 +24,8 @@
                    "*wireframe:     False         \n" \
                   "*suppressRotationAnimation: True\n" \
 
-# define refresh_cubicgrid 0
+# define free_cubicgrid 0
+# define release_cubicgrid 0
 #include "xlockmore.h"
 
 #ifdef USE_GL
@@ -66,7 +67,7 @@ ENTRYPOINT ModeSpecOpt cubicgrid_opts = {countof(opts), opts, countof(vars), var
 
 #ifdef USE_MODULES
 ModStruct   cubicgrid_description =
-{ "cubicgrid", "init_cubicgrid", "draw_cubicgrid", "release_cubicgrid",
+{ "cubicgrid", "init_cubicgrid", "draw_cubicgrid", NULL,
   "draw_cubicgrid", "change_cubicgrid", NULL, &cubicgrid_opts,
   25000, 1, 1, 1, 1.0, 4, "",
   "Shows a rotating 3D lattice from inside", 0, NULL
@@ -191,9 +192,17 @@ static void init_gl(ModeInfo *mi)
 ENTRYPOINT void reshape_cubicgrid(ModeInfo *mi, int width, int height) 
 {
   cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)];
+  int y = 0;
   if(!height) height = 1;
   cp->ratio = (GLfloat)width/(GLfloat)height;
-  glViewport(0, 0, (GLint) width, (GLint) height);
+
+  if (width > height * 3) {   /* tiny window: show middle */
+    height = width;
+    y = -height/2;
+    cp->ratio = (GLfloat)width/(GLfloat)height;
+  }
+
+  glViewport(0, y, (GLint) width, (GLint) height);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   gluPerspective(30.0, cp->ratio, 1.0, 100.0);
@@ -201,29 +210,10 @@ ENTRYPOINT void reshape_cubicgrid(ModeInfo *mi, int width, int height)
   glClear(GL_COLOR_BUFFER_BIT);
 }
 
-ENTRYPOINT void release_cubicgrid(ModeInfo *mi) 
-{
-  if (cubicgrid != NULL) {
-    int screen;
-    for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-      cubicgrid_conf *cp = &cubicgrid[screen];
-      if (cp->glx_context) {
-        cp->glx_context = NULL;
-      }
-    }
-    free((void *)cubicgrid);
-    cubicgrid = NULL;
-  }
-  FreeAllGL(mi);
-}
-
 ENTRYPOINT void init_cubicgrid(ModeInfo *mi) 
 {
   cubicgrid_conf *cp;
-  if(!cubicgrid) {
-    cubicgrid = (cubicgrid_conf *)calloc(MI_NUM_SCREENS(mi), sizeof(cubicgrid_conf));
-    if(!cubicgrid) return;
-  }
+  MI_INIT(mi, cubicgrid);
   cp = &cubicgrid[MI_SCREEN(mi)];
 
   if ((cp->glx_context = init_GL(mi)) != NULL) {
@@ -254,7 +244,7 @@ ENTRYPOINT void draw_cubicgrid(ModeInfo * mi)
   if (!cp->glx_context) return;
   glXMakeCurrent(display, window, *(cp->glx_context));
   if (!draw_main(mi)) {
-    release_cubicgrid(mi);
+    MI_ABORT(mi);
     return;
   }
   mi->polygon_count = cp->npoints;