From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/glx/topblock.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'hacks/glx/topblock.c')

diff --git a/hacks/glx/topblock.c b/hacks/glx/topblock.c
index 59a463f..4976a6f 100644
--- a/hacks/glx/topblock.c
+++ b/hacks/glx/topblock.c
@@ -35,9 +35,6 @@ History
 			"*showFPS:      False       \n" \
 			"*wireframe:    False       \n" \
 
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
-
 #include "xlockmore.h"
 #include "topblock.h"
 #include "sphere.h"
@@ -345,14 +342,16 @@ draw_topBlock (ModeInfo *mi)
 	/* rotate the world */
 	glRotatef(tb->rotation, 0.0, 0.0, 1.0);		
 
-# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
+#if 0  /* This makes the blocks pop into existence already on screen */
+       /* We should just make them drop from higher, but it's not obvious
+          to me where that is set. */
         {
-          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);
+          GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi)
+                       ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi))
+                       : 1);
+          glScalef (s, s, s);
         }
-# endif
+#endif
 
 	llCurrent = tb->blockNodeRoot;
 	if (drawCarpet) {
-- 
cgit v1.2.3-55-g7522