summaryrefslogtreecommitdiffstats
path: root/hacks/glx/tronbit.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:23:46 +0200
committerSimon Rettberg2021-04-06 14:23:46 +0200
commit26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9 (patch)
treea51e1637554bcd84e63cccb1cb220c898a2c4ee8 /hacks/glx/tronbit.c
parent5.44 (diff)
downloadxscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.gz
xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.xz
xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.zip
xscreensaver 6.00
Diffstat (limited to 'hacks/glx/tronbit.c')
-rw-r--r--hacks/glx/tronbit.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/hacks/glx/tronbit.c b/hacks/glx/tronbit.c
index 7354355..966ccf0 100644
--- a/hacks/glx/tronbit.c
+++ b/hacks/glx/tronbit.c
@@ -15,8 +15,6 @@
"*wireframe: False \n"
# define release_bit 0
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
#include "xlockmore.h"
#include "colors.h"
@@ -477,15 +475,12 @@ draw_bit (ModeInfo *mi)
glPushMatrix ();
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);
+ GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi)
+ ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi))
+ : 1);
+ glScalef (s, s, s);
}
-# endif
{
double x, y, z;