X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fkaleidocycle.c;h=884400f8c65256554ac7fb0419b59fc3dc25be5d;hb=39809ded547bdbb08207d3e514950425215b4410;hp=f88ccc662a2fde3fdc7ff0dc1cbbbe9ac3a8a184;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver

diff --git a/hacks/glx/kaleidocycle.c b/hacks/glx/kaleidocycle.c
index f88ccc66..884400f8 100644
--- a/hacks/glx/kaleidocycle.c
+++ b/hacks/glx/kaleidocycle.c
@@ -19,8 +19,9 @@
 			"*count:        16          \n" \
 			"*showFPS:      False       \n" \
 			"*wireframe:    False       \n" \
+			"*suppressRotationAnimation: True\n" \
 
-# define refresh_kaleidocycle 0
+# define free_kaleidocycle 0
 # define release_kaleidocycle 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -89,8 +90,15 @@ ENTRYPOINT void
 reshape_kaleidocycle (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();
@@ -102,6 +110,14 @@ reshape_kaleidocycle (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);
 }
 
@@ -158,14 +174,7 @@ init_kaleidocycle (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int i;
 
-  if (!bps) {
-    bps = (kaleidocycle_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (kaleidocycle_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];