X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fblinkbox.c;h=f90f7feff222822440d491d73e78644cd911eb1e;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=de7d55e741b262ab40b0d2a2791bff964512f659;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/glx/blinkbox.c b/hacks/glx/blinkbox.c
index de7d55e7..f90f7fef 100644
--- a/hacks/glx/blinkbox.c
+++ b/hacks/glx/blinkbox.c
@@ -14,6 +14,7 @@
 
 #define DEFAULTS	"*delay:	30000		 \n" \
 			"*wireframe:	False		 \n" \
+			"*suppressRotationAnimation: True\n" \
 
 # define refresh_ball 0
 # define release_ball 0
@@ -151,7 +152,7 @@ swap_mov(GLfloat *a, GLfloat *b)
   swap(a,b);
   j = get_rand();
   if (*a < 0)
-    *a = (j *= -1);
+    *a = j * -1;
   else
     *a = j;
 }
@@ -243,6 +244,13 @@ reshape_ball (ModeInfo *mi, int width, int height)
              0.0, 0.0, 0.0,
              0.0, 2.0,  10.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
 }
 
 static void
@@ -288,11 +296,7 @@ init_ball (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   blinkboxstruct *bp;
   
-  if(blinkbox == NULL) {
-    if((blinkbox = (blinkboxstruct *) calloc(MI_NUM_SCREENS(mi),
-                                             sizeof (blinkboxstruct))) == NULL)
-      return;
-  }
+  MI_INIT (mi, blinkbox, NULL);
   bp = &blinkbox[MI_SCREEN(mi)];
 
   if ((bp->glx_context = init_GL(mi)) != NULL) {
@@ -386,8 +390,6 @@ init_ball (ModeInfo *mi)
     bp->des_amt = bp->bscale.wh / MAX_COUNT;
   }
 
-  bp->glx_context = init_GL(mi);
-
   reshape_ball(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
   bp->ballList = glGenLists(1);
   glNewList(bp->ballList, GL_COMPILE);
@@ -403,7 +405,6 @@ init_ball (ModeInfo *mi)
 
   glEnable(GL_COLOR_MATERIAL);
   glShadeModel(GL_SMOOTH);
-  glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
   glClearDepth(1.0f);
   glEnable(GL_DEPTH_TEST);
   glDepthFunc(GL_LEQUAL);