X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fjigsaw.c;h=541239308576d7b1daa96e459f16c36667b2d49f;hp=dc7b8c3db654e36527790693a3351d14c776d82a;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc diff --git a/hacks/glx/jigsaw.c b/hacks/glx/jigsaw.c index dc7b8c3d..54123930 100644 --- a/hacks/glx/jigsaw.c +++ b/hacks/glx/jigsaw.c @@ -55,7 +55,8 @@ "*wireframe: False \n" \ "*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \ "*grabDesktopImages: False \n" \ - "*chooseRandomImages: True \n" + "*chooseRandomImages: True \n" \ + "*suppressRotationAnimation: True\n" \ # define refresh_jigsaw 0 @@ -63,7 +64,7 @@ #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) -#ifdef HAVE_COCOA +#ifdef HAVE_JWXYZ # include "jwxyz.h" #else # include @@ -1337,6 +1338,14 @@ reshape_jigsaw (ModeInfo *mi, int width, int height) 0.0, 0.0, 0.0, 0.0, 1.0, 0.0); +# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */ + { + int o = (int) current_device_rotation(); + if (o != 0 && o != 180 && o != -180) + glScalef (1/h, 1/h, 1/h); + } +# endif + glClear(GL_COLOR_BUFFER_BIT); jc->line_thickness = (MI_IS_WIREFRAME (mi) ? 1 : MAX (1, height / 300.0)); @@ -1434,7 +1443,7 @@ draw_jigsaw (ModeInfo *mi) mi->polygon_count = 0; glPushMatrix (); - glRotatef(current_device_rotation(), 0, 0, 1); +/* glRotatef(current_device_rotation(), 0, 0, 1); */ gltrackball_rotate (jc->trackball); animate (mi);