X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fsierpinski3d.c;h=0317299ab25d24dcdbefeb4bfdd08369fadd6022;hb=39809ded547bdbb08207d3e514950425215b4410;hp=7b74d5a58aff732bafbb9e3c72cfcecdec983982;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver

diff --git a/hacks/glx/sierpinski3d.c b/hacks/glx/sierpinski3d.c
index 7b74d5a5..0317299a 100644
--- a/hacks/glx/sierpinski3d.c
+++ b/hacks/glx/sierpinski3d.c
@@ -30,8 +30,9 @@ static const char sccsid[] = "@(#)sierpinski3D.c	00.01 99/11/04 xlockmore";
 # define DEFAULTS					"*delay:		20000   \n"			\
 									"*showFPS:      False   \n"			\
 									"*wireframe:	False	\n"			\
+									"*suppressRotationAnimation: True\n" \
 
-# define refresh_gasket 0
+# define release_gasket 0
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else  /* !STANDALONE */
 # include "xlock.h"			/* from the xlockmore distribution */
@@ -76,8 +77,8 @@ ENTRYPOINT ModeSpecOpt gasket_opts = {countof(opts), opts, countof(vars), vars,
 
 #ifdef USE_MODULES
 ModStruct   gasket_description =
-{"gasket", "init_gasket", "draw_gasket", "release_gasket",
- "draw_gasket", "init_gasket", NULL, &gasket_opts,
+{"gasket", "init_gasket", "draw_gasket", NULL,
+ "draw_gasket", "init_gasket", "free_gasket", &gasket_opts,
  1000, 1, 2, 1, 4, 1.0, "",
  "Shows GL's Sierpinski gasket", 0, NULL};
 
@@ -384,8 +385,15 @@ ENTRYPOINT void
 reshape_gasket(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();
   gluPerspective (30.0, 1/h, 1.0, 100.0);
@@ -396,6 +404,14 @@ reshape_gasket(ModeInfo *mi, int width, int height)
              0.0, 0.0, 0.0,
              0.0, 1.0, 0.0);
   
+# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
+  {
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1/h);
+  }
+# endif
+
   glClear(GL_COLOR_BUFFER_BIT);
 }
 
@@ -463,12 +479,7 @@ init_gasket(ModeInfo *mi)
   int           screen = MI_SCREEN(mi);
   gasketstruct *gp;
 
-  if (gasket == NULL)
-  {
-    if ((gasket = (gasketstruct *) calloc(MI_NUM_SCREENS(mi),
-					      sizeof (gasketstruct))) == NULL)
-	return;
-  }
+  MI_INIT (mi, gasket);
   gp = &gasket[screen];
 
   gp->window = MI_WINDOW(mi);
@@ -547,31 +558,20 @@ draw_gasket(ModeInfo * mi)
 }
 
 ENTRYPOINT void
-release_gasket(ModeInfo * mi)
+free_gasket(ModeInfo * mi)
 {
-  if (gasket != NULL)
-  {
-    int         screen;
-
-    for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-    {
-      gasketstruct *gp = &gasket[screen];
+  gasketstruct *gp = &gasket[MI_SCREEN(mi)];
 
-      if (gp->glx_context)
-      {
+  if (gp->glx_context)
+  {
 	/* Display lists MUST be freed while their glXContext is current. */
-        glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
+    glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
 
-        if (glIsList(gp->gasket0)) glDeleteLists(gp->gasket0, 1);
-        if (glIsList(gp->gasket1)) glDeleteLists(gp->gasket1, 1);
-        if (glIsList(gp->gasket2)) glDeleteLists(gp->gasket2, 1);
-        if (glIsList(gp->gasket3)) glDeleteLists(gp->gasket3, 1);
-      }
-    }
-    (void) free((void *) gasket);
-    gasket = NULL;
+    if (glIsList(gp->gasket0)) glDeleteLists(gp->gasket0, 1);
+    if (glIsList(gp->gasket1)) glDeleteLists(gp->gasket1, 1);
+    if (glIsList(gp->gasket2)) glDeleteLists(gp->gasket2, 1);
+    if (glIsList(gp->gasket3)) glDeleteLists(gp->gasket3, 1);
   }
-  FreeAllGL(mi);
 }
 
 XSCREENSAVER_MODULE_2 ("Sierpinski3D", sierpinski3d, gasket)