From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / hacks / bumps.c

diff --git a/hacks/bumps.c b/hacks/bumps.c
index 49c47519aeadb0f99a705e1d476fab54a130f75a..fa728e6c0a247a6ae846f272fe06176d410ead58 100644 (file)
--- a/hacks/bumps.c
+++ b/hacks/bumps.c
@@ -20,22 +20,22 @@
  *  Essentially, it 3D-izes your desktop, based on color intensity.
  *
  * Modification History:
- *  [10/01/99] - Shane Smit: Creation
- *  [10/08/99] - Shane Smit: Port to C. (Ick)
- *  [03/08/02] - Shane Smit: New movement code.
- *  [09/12/02] - Shane Smit: MIT-SHM XImages.
- *                                                      Thanks to Kennett Galbraith <http://www.Alpha-II.com/>
- *                                                      for code optimization.
+ *  [10/01/1999] - Shane Smit: Creation
+ *  [10/08/1999] - Shane Smit: Port to C. (Ick)
+ *  [03/08/2002] - Shane Smit: New movement code.
+ *  [09/12/2002] - Shane Smit: MIT-SHM XImages.
+ *                             Thanks to Kennett Galbraith <http://www.Alpha-II.com/>
+ *                             for code optimization.
+ *  [10/09/2016] - Dave Odell: Updated for new xshm.c.
+ *                             Y2K compliance.
  */
 
 
 #include <math.h>
-#include <stdint.h>
+#include <time.h>
+#include <inttypes.h>
 #include "screenhack.h"
-
-#ifdef HAVE_XSHM_EXTENSION
 #include "xshm.h"
-#endif /* HAVE_XSHM_EXTENSION */
 
 
 /* Defines: */
@@ -63,7 +63,7 @@ static const char *bumps_defaults [] = {
 #ifdef HAVE_XSHM_EXTENSION
   "*useSHM:            True",
 #endif /* HAVE_XSHM_EXTENSION */
-#ifdef USE_IPHONE
+#ifdef HAVE_MOBILE
   "*ignoreRotation: True",
   "*rotateImages:   True",
 #endif
@@ -113,10 +113,7 @@ typedef struct
        XColor *xColors;
        unsigned long *aColors;
        XImage *pXImage;
-#ifdef HAVE_XSHM_EXTENSION
        XShmSegmentInfo XShmInfo;
-       Bool    bUseShm;
-#endif /* HAVE_XSHM_EXTENSION */
 
        uint8_t nColorCount;                            /* Number of colors used. */
        uint8_t bytesPerPixel;
@@ -264,7 +261,6 @@ static void CreateBumps( SBumps *pBumps, Display *dpy, Window NewWin )
        pBumps->dpy = dpy;
        pBumps->Win = NewWin;
     pBumps->screen = XWinAttribs.screen;
-       pBumps->pXImage = NULL;
        
        iDiameter = ( ( pBumps->iWinWidth < pBumps->iWinHeight ) ? pBumps->iWinWidth : pBumps->iWinHeight ) / 2;
 
@@ -272,26 +268,8 @@ static void CreateBumps( SBumps *pBumps, Display *dpy, Window NewWin )
        constraining it to be a multiple of 8 seems to fix it. */
     iDiameter = ((iDiameter+7)/8)*8;
 
-#ifdef HAVE_XSHM_EXTENSION
-       pBumps->bUseShm = get_boolean_resource(dpy,  "useSHM", "Boolean" );
-
-       if( pBumps->bUseShm )
-       {
-               pBumps->pXImage = create_xshm_image( pBumps->dpy, XWinAttribs.visual, XWinAttribs.depth,
-                                                                                        ZPixmap, NULL, &pBumps->XShmInfo, iDiameter, iDiameter );
-               if( !pBumps->pXImage )
-               {
-                       fprintf( stderr, "%s: Unable to create XShmImage.\n", progname );
-                       pBumps->bUseShm = False;
-               }
-       }
-#endif /* HAVE_XSHM_EXTENSION */
-       if( !pBumps->pXImage )
-       {
-               pBumps->pXImage = XCreateImage( pBumps->dpy, XWinAttribs.visual, XWinAttribs.depth, 
-                                                                       ZPixmap, 0, NULL, iDiameter, iDiameter, BitmapPad( pBumps->dpy ), 0 );
-               pBumps->pXImage->data = malloc( pBumps->pXImage->bytes_per_line * pBumps->pXImage->height * sizeof(int8_t) );
-       }
+       pBumps->pXImage = create_xshm_image( pBumps->dpy, XWinAttribs.visual, XWinAttribs.depth,
+                                            ZPixmap, &pBumps->XShmInfo, iDiameter, iDiameter );
 
        /* For speed, access the XImage data directly using my own PutPixel routine. */
        switch( pBumps->pXImage->bits_per_pixel )
@@ -318,12 +296,7 @@ static void CreateBumps( SBumps *pBumps, Display *dpy, Window NewWin )
 
                default:
                        fprintf( stderr, "%s: Unknown XImage depth.", progname );
-#ifdef HAVE_XSHM_EXTENSION
-                       if( pBumps->bUseShm )
-                               destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo );
-                       else
-#endif /* HAVE_XSHM_EXTENSION */
-                               XDestroyImage( pBumps->pXImage );
+                       destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo );
                        exit( 1 );
        }
        
@@ -433,7 +406,7 @@ static void InitBumpMap_2(Display *dpy, SBumps *pBumps)
     XWindowAttributes XWinAttribs;
     XGetWindowAttributes( pBumps->dpy, pBumps->Win, &XWinAttribs );
 
-    pBumps->start_time = time ((time_t) 0);
+    pBumps->start_time = time ((time_t *) 0);
 
        pScreenImage = XGetImage( pBumps->dpy, pBumps->source, 0, 0, 
                               pBumps->iWinWidth, pBumps->iWinHeight,
@@ -622,14 +595,8 @@ static void Execute( SBumps *pBumps )
                nY -= ( nLightYPos + nY ) - pBumps->iWinHeight;
        }
        
-#ifdef HAVE_XSHM_EXTENSION
-       if( pBumps->bUseShm )
-               XShmPutImage( pBumps->dpy, pBumps->Win, pBumps->GraphicsContext, pBumps->pXImage, iLightX, iLightY, nLightXPos, nLightYPos,
-                                         nX, nY, False);
-       else
-#endif /* HAVE_XSHM_EXTENSION */
-               XPutImage( pBumps->dpy, pBumps->Win, pBumps->GraphicsContext, pBumps->pXImage, iLightX, iLightY, nLightXPos, nLightYPos,
-                                  nX, nY );
+       put_xshm_image( pBumps->dpy, pBumps->Win, pBumps->GraphicsContext, pBumps->pXImage, iLightX, iLightY, nLightXPos, nLightYPos,
+                       nX, nY, &pBumps->XShmInfo);
 }
 
 
@@ -641,12 +608,7 @@ static void DestroyBumps( SBumps *pBumps )
        DestroySpotLight( &pBumps->SpotLight );
        free( pBumps->aColors );
        free( pBumps->aBumpMap );
-#ifdef HAVE_XSHM_EXTENSION
-       if( pBumps->bUseShm )
-               destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo );
-       else
-#endif /* HAVE_XSHM_EXTENSION */
-               XDestroyImage( pBumps->pXImage );
+       destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo );
 }
 
 
@@ -666,7 +628,7 @@ bumps_init (Display *dpy, Window Win)
     Bumps->duration = get_integer_resource (dpy, "duration", "Seconds");
     if (Bumps->delay < 0) Bumps->delay = 0;
     if (Bumps->duration < 1) Bumps->duration = 1;
-    Bumps->start_time = time ((time_t) 0);
+    Bumps->start_time = time ((time_t *) 0);
     return Bumps;
 }
 
@@ -684,7 +646,7 @@ bumps_draw (Display *dpy, Window window, void *closure)
     }
 
   if (!Bumps->img_loader &&
-      Bumps->start_time + Bumps->duration < time ((time_t) 0)) {
+      Bumps->start_time + Bumps->duration < time ((time_t *) 0)) {
     Bumps->img_loader = load_image_async_simple (0, Bumps->screen,
                                                  Bumps->Win, Bumps->source, 
                                                  0, 0);