X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fshadebobs.c;h=d1361dd3aa4f23ed8d460cb3d65f73e7efe9e22d;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hp=39040ea377c66067619ea4bdc19932c23226d90a;hpb=f0261d8acab611f3433160e4f07367b870439739;p=xscreensaver

diff --git a/hacks/shadebobs.c b/hacks/shadebobs.c
index 39040ea3..d1361dd3 100644
--- a/hacks/shadebobs.c
+++ b/hacks/shadebobs.c
@@ -52,6 +52,9 @@ static const char *shadebobs_defaults [] = {
   "*cycles:   10",
   "*ncolors:  64",    /* changing this doesn't work particularly well */
   "*delay:    10000",
+#ifdef USE_IPHONE
+  "*ignoreRotation: True",
+#endif
   0
 };
 
@@ -144,8 +147,11 @@ static void MoveShadeBob( struct state *st, SShadeBob *pShadeBob )
 	pShadeBob->nAngle	   += pShadeBob->nAngleInc;
 	pShadeBob->nAngleDelta -= pShadeBob->nAngleInc;
 
-	if( pShadeBob->nAngle >= st->iDegreeCount )	pShadeBob->nAngle -= st->iDegreeCount;
-	else if( pShadeBob->nAngle < 0 )		pShadeBob->nAngle += st->iDegreeCount;
+	/* Since it can happen that nAngle < 0 and nAngle + iDegreeCount >= iDegreeCount
+	   on floating point, we set some marginal value.
+	*/
+	if( pShadeBob->nAngle + 0.5 >= st->iDegreeCount )	pShadeBob->nAngle -= st->iDegreeCount;
+	else if( pShadeBob->nAngle < -0.5 )		pShadeBob->nAngle += st->iDegreeCount;
 	
 	if( ( pShadeBob->nAngleInc>0.0F  && pShadeBob->nAngleDelta<pShadeBob->nAngleInc ) ||
 	    ( pShadeBob->nAngleInc<=0.0F && pShadeBob->nAngleDelta>pShadeBob->nAngleInc ) )
@@ -296,12 +302,13 @@ static void Initialize( struct state *st )
 {
 	XGCValues gcValues;
 	XWindowAttributes XWinAttribs;
-	int iBitsPerPixel;
+	/*int iBitsPerPixel;*/
 
 	/* Create the Image for drawing */
 	XGetWindowAttributes( st->dpy, st->window, &XWinAttribs );
 
-	/* Find the preferred bits-per-pixel. (jwz) */
+#if 0
+  /* Find the preferred bits-per-pixel. (jwz) */
 	{
 		int i, pfvc = 0;
 		XPixmapFormatValues *pfv = XListPixmapFormats( st->dpy, &pfvc );
@@ -314,6 +321,7 @@ static void Initialize( struct state *st )
 		if( pfv )
 			XFree (pfv);
 	}
+#endif
 
 	/*  Create the GC. */
 	st->gc = XCreateGC( st->dpy, st->window, 0, &gcValues );