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/glhanoi.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'hacks/glx/glhanoi.c') diff --git a/hacks/glx/glhanoi.c b/hacks/glx/glhanoi.c index 11ac75f..b544283 100644 --- a/hacks/glx/glhanoi.c +++ b/hacks/glx/glhanoi.c @@ -60,9 +60,6 @@ enum { #define MARBLE_TEXTURE_SIZE 256 -#undef countof -#define countof(x) (sizeof((x))/sizeof((*x))) - #include #include "xlockmore.h" @@ -1978,14 +1975,12 @@ ENTRYPOINT void draw_glhanoi(ModeInfo * mi) update_glhanoi(glhanoi); updateView(glhanoi); -# 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); + GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi) + ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi)) + : 1); + glScalef (s, s, s); } -# endif if(!glhanoi->wire && glhanoi->texture) { glEnable(GL_TEXTURE_2D); -- cgit v1.2.3-55-g7522