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

[xscreensaver] / hacks / glx / tronbit.c

diff --git a/hacks/glx/tronbit.c b/hacks/glx/tronbit.c
index 3c82428136a347681f5b1f70416c673bc776a2d4..832d329d1d65cec4f7f2e2fd75df03aa601c7b08 100644 (file)
--- a/hacks/glx/tronbit.c
+++ b/hacks/glx/tronbit.c
@@ -301,7 +301,7 @@ draw_histogram (ModeInfo *mi, GLfloat ratio)
     glPushMatrix();
 
     glLoadIdentity();
-    glRotatef(current_device_rotation(), 0, 0, 1);
+    /* glRotatef(current_device_rotation(), 0, 0, 1); */
     glOrtho (0, mi->xgwa.width, 0, mi->xgwa.height, -1, 1);
 
     for (k = 0; k < overlays; k++)
@@ -407,14 +407,7 @@ init_bit (ModeInfo *mi)
   bit_configuration *bp;
   int i;
 
-  if (!bps) {
-    bps = (bit_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (bit_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps, NULL);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -483,9 +476,18 @@ draw_bit (ModeInfo *mi)
     }
 
   glPushMatrix ();
-  glRotatef(current_device_rotation(), 0, 0, 1);
   glScalef(1.1, 1.1, 1.1);
 
+# ifdef HAVE_MOBILE    /* Keep it the same relative size when rotated. */
+  {
+    GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1/h);
+    glRotatef(o, 0, 0, 1);
+  }
+# endif
+
   {
     double x, y, z;
     get_position (bp->rot, &x, &y, &z, !bp->button_down_p);