diff options
| author | Simon Rettberg | 2021-04-06 14:43:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-04-07 13:38:37 +0200 |
| commit | 38886de0c3e9ea5729ef23e4c653fa2822f52e8f (patch) | |
| tree | 9b799c8c968a92cc77746a95e0e8bdd90b6b13c3 /hacks/glx/razzledazzle.c | |
| parent | Maybe not remove, but ... (diff) | |
| download | xscreensaver-openslx.tar.gz xscreensaver-openslx.tar.xz xscreensaver-openslx.zip | |
Diffstat (limited to 'hacks/glx/razzledazzle.c')
| -rw-r--r-- | hacks/glx/razzledazzle.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/hacks/glx/razzledazzle.c b/hacks/glx/razzledazzle.c index 4c940d1..8b4d23f 100644 --- a/hacks/glx/razzledazzle.c +++ b/hacks/glx/razzledazzle.c @@ -1,4 +1,4 @@ -/* razzledazzle, Copyright (c) 2018 Jamie Zawinski <jwz@jwz.org> +/* razzledazzle, Copyright (c) 2018-2020 Jamie Zawinski <jwz@jwz.org> * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -16,8 +16,6 @@ "*suppressRotationAnimation: True\n" \ # define release_dazzle 0 -#undef countof -#define countof(x) (sizeof((x))/sizeof((*x))) #include "xlockmore.h" #include "colors.h" @@ -339,7 +337,7 @@ reshape_dazzle (ModeInfo *mi, int width, int height) glOrtho (0, 1, 0.5-s, 0.5+s, -1, 1); } -# ifdef USE_IPHONE /* So much WTF */ +# ifdef HAVE_MOBILE /* So much WTF */ { int rot = current_device_rotation(); @@ -596,7 +594,7 @@ draw_dazzle (ModeInfo *mi) if (bp->which_ship != -1) { -# ifdef USE_IPHONE +# ifdef HAVE_IPHONE int rot = current_device_rotation(); # endif @@ -612,7 +610,7 @@ draw_dazzle (ModeInfo *mi) glEnable (GL_DEPTH_TEST); } -# ifdef USE_IPHONE +# ifdef HAVE_IPHONE glRotatef (90, 0, 0, 1); if (rot == 90 || rot == -270) glRotatef (180, 0, 0, 1); @@ -623,7 +621,7 @@ draw_dazzle (ModeInfo *mi) glScalef (0.9, 0.9, 0.9); glTranslatef (-0.5, 0, -0.2); -# ifdef USE_IPHONE +# ifdef HAVE_IPHONE if (rot == 0 || rot == 180 || rot == -180) glScalef (1, 1, (GLfloat) MI_HEIGHT(mi) / MI_WIDTH(mi)); else |