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

diff --git a/hacks/glx/tronbit.c b/hacks/glx/tronbit.c
index b0ee542e..b79309cd 100644
--- a/hacks/glx/tronbit.c
+++ b/hacks/glx/tronbit.c
@@ -14,7 +14,7 @@
 			"*showFPS:      False       \n" \
 			"*wireframe:    False       \n"
 
-# define refresh_bit 0
+# define free_bit 0
 # define release_bit 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -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++)
@@ -316,10 +316,11 @@ draw_histogram (ModeInfo *mi, GLfloat ratio)
         j = bp->histogram_fp + 1;
         for (i = 0; i < samples; i++)
           {
-            GLfloat x = i;
+            GLfloat x, y, z;
             if (j >= samples) j = 0;
-            GLfloat y = bp->histogram[j];
-            GLfloat z = 0;
+            x = i;
+            y = bp->histogram[j];
+            z = 0;
 
             y += (int) ((random() % 16) - 8);
             y += 16;  /* margin at bottom of screen */
@@ -406,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);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -482,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);
@@ -512,6 +515,11 @@ draw_bit (ModeInfo *mi)
     double ratio = 1 - ((bp->last_time + bp->frequency) - now) / bp->frequency;
     if (ratio > 1) ratio = 1;
     mi->polygon_count += draw_histogram (mi, ratio);
+
+    if (MI_WIDTH(mi) > MI_HEIGHT(mi) * 5) {   /* wide window: scale up */
+      glScalef (8, 8, 8);
+    }
+
     mi->polygon_count += animate_bits (mi, omodel, nmodel, ratio);
     tick_bit (mi, now);
   }