X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fbumps.c;h=fa728e6c0a247a6ae846f272fe06176d410ead58;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=28c58aacd5089dd6d43f010a9efea471350a132c;hpb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5;p=xscreensaver diff --git a/hacks/bumps.c b/hacks/bumps.c index 28c58aac..fa728e6c 100644 --- a/hacks/bumps.c +++ b/hacks/bumps.c @@ -1,5 +1,5 @@ /* -*- mode: C; tab-width: 4 -*- - * Bumps, Copyright (c) 2002 Shane Smit + * Bumps, Copyright (c) 2002, 2006 Shane Smit * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -20,48 +20,155 @@ * 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 - * 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 + * for code optimization. + * [10/09/2016] - Dave Odell: Updated for new xshm.c. + * Y2K compliance. */ -#include "bumps.h" + +#include +#include +#include +#include "screenhack.h" +#include "xshm.h" + + +/* Defines: */ +/* #define VERBOSE */ +#define RANDOM() ((int) (random() & 0X7FFFFFFFL)) + +typedef unsigned char BOOL; + + +/* Globals: */ + +static const char *bumps_defaults [] = { + ".background: black", + ".foreground: white", + "*fpsSolid: true", + "*color: random", + "*colorcount: 64", + "*delay: 30000", + "*duration: 120", + "*soften: 1", + "*invert: FALSE", +#ifdef __sgi /* really, HAVE_READ_DISPLAY_EXTENSION */ + "*visualID: Best", +#endif +#ifdef HAVE_XSHM_EXTENSION + "*useSHM: True", +#endif /* HAVE_XSHM_EXTENSION */ +#ifdef HAVE_MOBILE + "*ignoreRotation: True", + "*rotateImages: True", +#endif + 0 +}; + +static XrmOptionDescRec bumps_options [] = { + { "-color", ".color", XrmoptionSepArg, 0 }, + { "-colorcount", ".colorcount", XrmoptionSepArg, 0 }, + { "-duration", ".duration", XrmoptionSepArg, 0 }, + { "-delay", ".delay", XrmoptionSepArg, 0 }, + { "-soften", ".soften", XrmoptionSepArg, 0 }, + { "-invert", ".invert", XrmoptionNoArg, "TRUE" }, +#ifdef HAVE_XSHM_EXTENSION + { "-shm", ".useSHM", XrmoptionNoArg, "True" }, + { "-no-shm", ".useSHM", XrmoptionNoArg, "False" }, +#endif /* HAVE_XSHM_EXTENSION */ + + { 0, 0, 0, 0 } +}; + + +/* This structure handles everything to do with the spotlight, and is designed to be + * a member of TBumps. */ +typedef struct +{ + uint8_t *aLightMap; + uint16_t nFalloffDiameter, nFalloffRadius; + uint16_t nLightDiameter, nLightRadius; + float nAccelX, nAccelY; + float nAccelMax; + float nVelocityX, nVelocityY; + float nVelocityMax; + float nXPos, nYPos; +} SSpotLight; + + +/* The entire program's operation is contained within this structure. */ +typedef struct +{ + /* XWindows specific variables. */ + Display *dpy; + Window Win; + Screen *screen; + Pixmap source; + GC GraphicsContext; + XColor *xColors; + unsigned long *aColors; + XImage *pXImage; + XShmSegmentInfo XShmInfo; + + uint8_t nColorCount; /* Number of colors used. */ + uint8_t bytesPerPixel; + uint16_t iWinWidth, iWinHeight; + uint16_t *aBumpMap; /* The actual bump map. */ + SSpotLight SpotLight; + + int delay; + int duration; + time_t start_time; + + async_load_state *img_loader; +} SBumps; + + +static void SetPalette(Display *, SBumps *, XWindowAttributes * ); +static void InitBumpMap(Display *, SBumps *, XWindowAttributes * ); +static void InitBumpMap_2(Display *, SBumps *); +static void SoftenBumpMap( SBumps * ); + + + /* This function pointer will point to the appropriate PutPixel*() function below. */ -void (*MyPutPixel)( int8_ *, uint32_ ); +static void (*MyPutPixel)( int8_t *, uint32_t ); -void PutPixel32( int8_ *pData, uint32_ pixel ) +static void PutPixel32( int8_t *pData, uint32_t pixel ) { - *(uint32_ *)pData = pixel; + *(uint32_t *)pData = pixel; } -void PutPixel24( int8_ *pData, uint32_ pixel ) +static void PutPixel24( int8_t *pData, uint32_t pixel ) { pData[ 2 ] = ( pixel & 0x00FF0000 ) >> 16; pData[ 1 ] = ( pixel & 0x0000FF00 ) >> 8; pData[ 0 ] = ( pixel & 0x000000FF ); } -void PutPixel16( int8_ *pData, uint32_ pixel ) +static void PutPixel16( int8_t *pData, uint32_t pixel ) { - *(uint16_ *)pData = (uint16_)pixel; + *(uint16_t *)pData = (uint16_t)pixel; } -void PutPixel8( int8_ *pData, uint32_ pixel ) +static void PutPixel8( int8_t *pData, uint32_t pixel ) { - *(uint8_ *)pData = (uint8_)pixel; + *(uint8_t *)pData = (uint8_t)pixel; } /* Creates the light map, which is a circular image... going from black around the edges * to white in the center. */ -void CreateSpotLight( SSpotLight *pSpotLight, uint16_ iDiameter, uint16_ nColorCount ) +static void CreateSpotLight( SSpotLight *pSpotLight, uint16_t iDiameter, uint16_t nColorCount ) { double nDist; - int16_ iDistX, iDistY; - uint8_ *pLOffset; + int16_t iDistX, iDistY; + uint8_t *pLOffset; pSpotLight->nFalloffDiameter = iDiameter; pSpotLight->nFalloffRadius = pSpotLight->nFalloffDiameter / 2; @@ -72,7 +179,7 @@ void CreateSpotLight( SSpotLight *pSpotLight, uint16_ iDiameter, uint16_ nColorC printf( "%s: Spot Light Diameter: %d\n", progclass, pSpotLight->nLightDiameter ); #endif - pSpotLight->aLightMap = malloc( pSpotLight->nLightDiameter * pSpotLight->nLightDiameter * sizeof(uint8_) ); + pSpotLight->aLightMap = malloc( pSpotLight->nLightDiameter * pSpotLight->nLightDiameter * sizeof(uint8_t) ); pLOffset = pSpotLight->aLightMap; for( iDistY=-pSpotLight->nLightRadius; iDistYnLightRadius; ++iDistY ) @@ -81,7 +188,7 @@ void CreateSpotLight( SSpotLight *pSpotLight, uint16_ iDiameter, uint16_ nColorC { nDist = sqrt( pow( iDistX+0.5F, 2 ) + pow( iDistY+0.5F, 2 ) ); if( nDist / pSpotLight->nLightRadius <= 1.0f ) - *pLOffset = (uint8_)(nColorCount - ( ( nDist / pSpotLight->nLightRadius ) * ( nColorCount - 1 ) )); + *pLOffset = (uint8_t)(nColorCount - ( ( nDist / pSpotLight->nLightRadius ) * ( nColorCount - 1 ) )); else *pLOffset = 0; @@ -98,7 +205,7 @@ void CreateSpotLight( SSpotLight *pSpotLight, uint16_ iDiameter, uint16_ nColorC /* Calculates the position of the spot light on the screen. */ -void CalcLightPos( SBumps *pBumps ) +static void CalcLightPos( SBumps *pBumps ) { SSpotLight *pSpotLight = &pBumps->SpotLight; float nGravity; @@ -136,47 +243,33 @@ void CalcLightPos( SBumps *pBumps ) /* Main initialization function. */ -void CreateBumps( SBumps *pBumps, Display *pNewDisplay, Window NewWin ) +static void CreateBumps( SBumps *pBumps, Display *dpy, Window NewWin ) { XWindowAttributes XWinAttribs; XGCValues GCValues; - int32_ nGCFlags; - uint16_ iDiameter; + int32_t nGCFlags; + uint16_t iDiameter; /* Make size and velocity a function of window size, so it appears the same at 100x60 as it does in 3200x1200. */ - XGetWindowAttributes( pNewDisplay, NewWin, &XWinAttribs ); + XGetWindowAttributes( dpy, NewWin, &XWinAttribs ); pBumps->iWinWidth = XWinAttribs.width; pBumps->iWinHeight = XWinAttribs.height; pBumps->SpotLight.nXPos = XWinAttribs.width / 2.0f; pBumps->SpotLight.nYPos = XWinAttribs.height / 2.0f; pBumps->SpotLight.nVelocityMax = ( ( XWinAttribs.width < XWinAttribs.height ) ? XWinAttribs.width : XWinAttribs.height ) / 140.0f; pBumps->SpotLight.nAccelMax = pBumps->SpotLight.nVelocityMax / 10.0f; - pBumps->pDisplay = pNewDisplay; + pBumps->dpy = dpy; pBumps->Win = NewWin; - pBumps->pXImage = NULL; + pBumps->screen = XWinAttribs.screen; iDiameter = ( ( pBumps->iWinWidth < pBumps->iWinHeight ) ? pBumps->iWinWidth : pBumps->iWinHeight ) / 2; -#ifdef HAVE_XSHM_EXTENSION - pBumps->bUseShm = get_boolean_resource( "useSHM", "Boolean" ); + /* jwz: sometimes we get tearing if this lands on the wrong bounaary; + constraining it to be a multiple of 8 seems to fix it. */ + iDiameter = ((iDiameter+7)/8)*8; - if( pBumps->bUseShm ) - { - pBumps->pXImage = create_xshm_image( pBumps->pDisplay, 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->pDisplay, XWinAttribs.visual, XWinAttribs.depth, - ZPixmap, 0, NULL, iDiameter, iDiameter, BitmapPad( pBumps->pDisplay ), 0 ); - pBumps->pXImage->data = malloc( pBumps->pXImage->bytes_per_line * pBumps->pXImage->height * sizeof(int8_) ); - } + 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 ) @@ -203,40 +296,32 @@ void CreateBumps( SBumps *pBumps, Display *pNewDisplay, Window NewWin ) default: fprintf( stderr, "%s: Unknown XImage depth.", progname ); -#ifdef HAVE_XSHM_EXTENSION - if( pBumps->bUseShm ) - destroy_xshm_image( pBumps->pDisplay, pBumps->pXImage, &pBumps->XShmInfo ); - else -#endif /* HAVE_XSHM_EXTENSION */ - XDestroyImage( pBumps->pXImage ); + destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo ); exit( 1 ); } GCValues.function = GXcopy; GCValues.subwindow_mode = IncludeInferiors; - nGCFlags = GCForeground | GCFunction; + nGCFlags = GCFunction; if( use_subwindow_mode_p( XWinAttribs.screen, pBumps->Win ) ) /* See grabscreen.c */ nGCFlags |= GCSubwindowMode; - pBumps->GraphicsContext = XCreateGC( pBumps->pDisplay, pBumps->Win, nGCFlags, &GCValues ); + pBumps->GraphicsContext = XCreateGC( pBumps->dpy, pBumps->Win, nGCFlags, &GCValues ); - SetPalette( pBumps, &XWinAttribs ); + SetPalette(dpy, pBumps, &XWinAttribs ); CreateSpotLight( &pBumps->SpotLight, iDiameter, pBumps->nColorCount ); - InitBumpMap( pBumps, &XWinAttribs ); - - XSetWindowBackground( pBumps->pDisplay, pBumps->Win, pBumps->aColors[ 0 ] ); - XClearWindow (pBumps->pDisplay, pBumps->Win); + InitBumpMap(dpy, pBumps, &XWinAttribs ); } /* Creates a specialized phong shade palette. */ -void SetPalette( SBumps *pBumps, XWindowAttributes *pXWinAttribs ) +static void SetPalette(Display *dpy, SBumps *pBumps, XWindowAttributes *pXWinAttribs ) { XColor BaseColor; XColor Color; char *sColor; /* Spotlight Color */ - int16_ iColor; + int16_t iColor; - sColor = get_string_resource( "color", "Color" ); + sColor = get_string_resource(dpy, "color", "Color" ); BaseColor.red = RANDOM() % 0xFFFF; BaseColor.green = RANDOM() % 0xFFFF; @@ -250,18 +335,18 @@ void SetPalette( SBumps *pBumps, XWindowAttributes *pXWinAttribs ) case 2: BaseColor.blue = 0xFFFF; break; } - if( strcasecmp( sColor, "random" ) && !XParseColor( pBumps->pDisplay, pXWinAttribs->colormap, sColor, &BaseColor ) ) + if( strcasecmp( sColor, "random" ) && !XParseColor( pBumps->dpy, pXWinAttribs->colormap, sColor, &BaseColor ) ) fprintf( stderr, "%s: color %s not found in database. Choosing random...\n", progname, sColor ); #ifdef VERBOSE printf( "%s: Spotlight color is <%d,%d,%d> RGB.\n", progclass, BaseColor.red, BaseColor.green, BaseColor.blue ); #endif /* VERBOSE */ - pBumps->nColorCount = get_integer_resource( "colorcount", "Integer" ); + pBumps->nColorCount = get_integer_resource(dpy, "colorcount", "Integer" ); if( pBumps->nColorCount < 2 ) pBumps->nColorCount = 2; if( pBumps->nColorCount > 128 ) pBumps->nColorCount = 128; - pBumps->aColors = malloc( pBumps->nColorCount * sizeof(uint32_ ) ); + pBumps->aColors = malloc( pBumps->nColorCount * sizeof(unsigned long) ); /* Creates a phong shade: / BaseColor \ Index/ColorCount * PhongShade = | ------------ | Index + ( 65535 - BaseColor )^ @@ -269,15 +354,15 @@ void SetPalette( SBumps *pBumps, XWindowAttributes *pXWinAttribs ) pBumps->nColorCount--; for( iColor=0; iColor<=pBumps->nColorCount; iColor++ ) { - Color.red = (uint16_)( ( ( BaseColor.red / (double)pBumps->nColorCount ) * iColor ) + pow( 0xFFFF - BaseColor.red, iColor/(double)pBumps->nColorCount ) ); - Color.green = (uint16_)( ( ( BaseColor.green / (double)pBumps->nColorCount ) * iColor ) + pow( 0xFFFF - BaseColor.green, iColor/(double)pBumps->nColorCount ) ); - Color.blue = (uint16_)( ( ( BaseColor.blue / (double)pBumps->nColorCount ) * iColor ) + pow( 0xFFFF - BaseColor.blue, iColor/(double)pBumps->nColorCount ) ); + Color.red = (uint16_t)( ( ( BaseColor.red / (double)pBumps->nColorCount ) * iColor ) + pow( 0xFFFF - BaseColor.red, iColor/(double)pBumps->nColorCount ) ); + Color.green = (uint16_t)( ( ( BaseColor.green / (double)pBumps->nColorCount ) * iColor ) + pow( 0xFFFF - BaseColor.green, iColor/(double)pBumps->nColorCount ) ); + Color.blue = (uint16_t)( ( ( BaseColor.blue / (double)pBumps->nColorCount ) * iColor ) + pow( 0xFFFF - BaseColor.blue, iColor/(double)pBumps->nColorCount ) ); - if( !XAllocColor( pBumps->pDisplay, pXWinAttribs->colormap, &Color ) ) + if( !XAllocColor( pBumps->dpy, pXWinAttribs->colormap, &Color ) ) { - XFreeColors( pBumps->pDisplay, pXWinAttribs->colormap, pBumps->aColors, iColor, 0 ); + XFreeColors( pBumps->dpy, pXWinAttribs->colormap, pBumps->aColors, iColor, 0 ); free( pBumps->aColors ); - pBumps->aColors = malloc( pBumps->nColorCount * sizeof(uint32_) ); + pBumps->aColors = malloc( pBumps->nColorCount * sizeof(unsigned long) ); pBumps->nColorCount--; iColor = -1; } @@ -290,91 +375,103 @@ void SetPalette( SBumps *pBumps, XWindowAttributes *pXWinAttribs ) printf( "%s: Allocated %d colors.\n", progclass, pBumps->nColorCount ); #endif /* VERBOSE */ - XSetWindowBackground( pBumps->pDisplay, pBumps->Win, pBumps->aColors[ 0 ] ); + XSetWindowBackground( pBumps->dpy, pBumps->Win, pBumps->aColors[ 0 ] ); } /* Grabs the current contents of the window to use an intensity-based bump map. */ -void InitBumpMap( SBumps *pBumps, XWindowAttributes *pXWinAttribs ) +static void InitBumpMap(Display *dpy, SBumps *pBumps, XWindowAttributes *pXWinAttribs ) +{ + pBumps->xColors = (XColor*)malloc( pBumps->iWinWidth * sizeof(XColor) ); + + if (pBumps->source) abort(); + pBumps->source = XCreatePixmap(pBumps->dpy, pBumps->Win, + pXWinAttribs->width, pXWinAttribs->height, + pXWinAttribs->depth); + pBumps->img_loader = load_image_async_simple (0, pXWinAttribs->screen, + pBumps->Win, pBumps->source, 0, 0); +} + +static void InitBumpMap_2(Display *dpy, SBumps *pBumps) { XImage *pScreenImage; - XColor *aColors, *pColor; - uint8_ nSoften; - uint16_ iWidth, iHeight; - uint32_ nAverager; - uint16_ *pBump; - uint16_ maxHeight; + XColor *pColor; + uint8_t nSoften; + uint16_t iWidth, iHeight; + uint32_t nAverager; + uint16_t *pBump; + uint16_t maxHeight; double softenMultiplier = 1.0f; - BOOL bInvert = (BOOL)get_boolean_resource( "invert", "Boolean" ); - Pixmap p; + BOOL bInvert = (BOOL)get_boolean_resource(dpy, "invert", "Boolean" ); + XWindowAttributes XWinAttribs; + XGetWindowAttributes( pBumps->dpy, pBumps->Win, &XWinAttribs ); - aColors = (XColor*)malloc( pBumps->iWinWidth * sizeof(XColor) ); + pBumps->start_time = time ((time_t *) 0); - p = XCreatePixmap(pBumps->pDisplay, pBumps->Win, - pXWinAttribs->width, pXWinAttribs->height, - pXWinAttribs->depth); - load_random_image (pXWinAttribs->screen, pBumps->Win, p); + pScreenImage = XGetImage( pBumps->dpy, pBumps->source, 0, 0, + pBumps->iWinWidth, pBumps->iWinHeight, + ~0L, ZPixmap ); +/* XFreePixmap (pBumps->dpy, pBumps->source); + pBumps->source = 0;*/ - pScreenImage = XGetImage( pBumps->pDisplay, p, 0, 0, pBumps->iWinWidth, pBumps->iWinHeight, ~0L, ZPixmap ); - XFreePixmap (pBumps->pDisplay, p); + XSetWindowBackground( pBumps->dpy, pBumps->Win, pBumps->aColors[ 0 ] ); + XClearWindow (pBumps->dpy, pBumps->Win); + XSync (pBumps->dpy, 0); - /* jwz: get the grabbed bits off the screen fast */ - XClearWindow (pBumps->pDisplay, pBumps->Win); - XSync (pBumps->pDisplay, 0); - - pBumps->aBumpMap = malloc( pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_) ); + pBumps->aBumpMap = malloc( pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_t) ); - nSoften = get_integer_resource( "soften", "Integer" ); + nSoften = get_integer_resource(dpy, "soften", "Integer" ); while( nSoften-- ) softenMultiplier *= 1.0f + ( 1.0f / 3.0f ); /* Softening takes the max height down, so scale up to compensate. */ maxHeight = pBumps->SpotLight.nLightRadius * softenMultiplier; - nAverager = ( 3 * 0xFFFF ) / maxHeight; + nAverager = maxHeight ? ( 3 * 0xFFFF ) / maxHeight : 0; pBump = pBumps->aBumpMap; if( bInvert ) /* Funny, it's actually the 'else' that inverts the bump map... */ { for( iHeight=0; iHeightiWinHeight; iHeight++ ) { - pColor = aColors; + pColor = pBumps->xColors; for( iWidth=0; iWidthiWinWidth; iWidth++ ) (pColor++)->pixel = XGetPixel( pScreenImage, iWidth, iHeight ); - XQueryColors( pBumps->pDisplay, pXWinAttribs->colormap, aColors, pBumps->iWinWidth ); + XQueryColors( pBumps->dpy, XWinAttribs.colormap, pBumps->xColors, pBumps->iWinWidth ); - pColor = aColors; + pColor = pBumps->xColors; for( iWidth=pBumps->iWinWidth; iWidth; --iWidth, ++pColor, ++pBump ) - *pBump = ( ( pColor->red + pColor->green + pColor->blue ) / nAverager ); + *pBump = ( nAverager ? ( pColor->red + pColor->green + pColor->blue ) / nAverager : 0 ); } } else { for( iHeight=0; iHeightiWinHeight; iHeight++ ) { - pColor = aColors; + pColor = pBumps->xColors; for( iWidth=0; iWidthiWinWidth; iWidth++ ) (pColor++)->pixel = XGetPixel( pScreenImage, iWidth, iHeight ); - XQueryColors( pBumps->pDisplay, pXWinAttribs->colormap, aColors, pBumps->iWinWidth ); + XQueryColors( pBumps->dpy, XWinAttribs.colormap, pBumps->xColors, pBumps->iWinWidth ); - pColor = aColors; + pColor = pBumps->xColors; for( iWidth=pBumps->iWinWidth; iWidth; --iWidth, ++pColor, ++pBump ) - *pBump = ( maxHeight - ( ( pColor->red + pColor->green + pColor->blue ) / nAverager ) ); + *pBump = ( maxHeight - ( nAverager ? ( pColor->red + pColor->green + pColor->blue ) / nAverager : 0 ) ); } } XDestroyImage( pScreenImage ); - nSoften = get_integer_resource( "soften", "Integer" ); + nSoften = get_integer_resource(dpy, "soften", "Integer" ); #ifdef VERBOSE if( nSoften ) printf( "%s: Softening Bump Map %d time(s)...\n", progclass, nSoften ); #endif while( nSoften-- ) SoftenBumpMap( pBumps ); - free( aColors ); +/* free( pBumps->xColors ); + pBumps->xColors = 0;*/ } -/* Soften the bump map. This is to avoid pixellated-looking ridges. +/* Soften the bump map. This is to avoid pixelated-looking ridges. * |-----|-----|-----| * | 0% |12.5%| 0% | The adjacent pixels are averaged together * |-----|-----|-----| first. Then than value is averaged with @@ -383,12 +480,12 @@ void InitBumpMap( SBumps *pBumps, XWindowAttributes *pXWinAttribs ) * | 0% |12.5%| 0% | * |-----|-----|-----| */ -void SoftenBumpMap( SBumps *pBumps ) +static void SoftenBumpMap( SBumps *pBumps ) { - uint16_ *pOffset, *pTOffset; - uint32_ nHeight; - uint32_ iWidth, iHeight; - uint16_ *aTempBuffer = malloc( pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_) ); + uint16_t *pOffset, *pTOffset; + uint32_t nHeight; + uint32_t iWidth, iHeight; + uint16_t *aTempBuffer = malloc( pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_t) ); pOffset = pBumps->aBumpMap; pTOffset = aTempBuffer; @@ -414,22 +511,22 @@ void SoftenBumpMap( SBumps *pBumps ) } } - memcpy( pBumps->aBumpMap, aTempBuffer, pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_) ); + memcpy( pBumps->aBumpMap, aTempBuffer, pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_t) ); free( aTempBuffer ); } /* This is where we slap down some pixels... */ -void Execute( SBumps *pBumps ) +static void Execute( SBumps *pBumps ) { - int32_ nLightXPos, nLightYPos; - int32_ iScreenX, iScreenY; - int32_ iLightX, iLightY; - uint16_ *pBOffset; - int8_ *pDOffset; - int32_ nX, nY; - uint16_ nColor; - int32_ nLightOffsetFar = pBumps->SpotLight.nFalloffDiameter - pBumps->SpotLight.nLightRadius; + int32_t nLightXPos, nLightYPos; + int32_t iScreenX, iScreenY; + int32_t iLightX, iLightY; + uint16_t *pBOffset; + int8_t *pDOffset; + int32_t nX, nY; + uint16_t nColor; + int32_t nLightOffsetFar = pBumps->SpotLight.nFalloffDiameter - pBumps->SpotLight.nLightRadius; CalcLightPos( pBumps ); @@ -442,7 +539,9 @@ void Execute( SBumps *pBumps ) if( iScreenY < 0 ) continue; else if( iScreenY >= pBumps->iWinHeight ) break; - pDOffset = &pBumps->pXImage->data[ (iLightY+pBumps->SpotLight.nLightRadius) * pBumps->pXImage->bytes_per_line ]; + /* warning: pointer targets in assignment differ in signedness + Should pDOffset be a int8? I can't tell. -jwz, 22-Jul-2003 */ + pDOffset = (int8_t *) &pBumps->pXImage->data[ (iLightY+pBumps->SpotLight.nLightRadius) * pBumps->pXImage->bytes_per_line ]; pBOffset = pBumps->aBumpMap + ( iScreenY * pBumps->iWinWidth ) + nLightXPos; for( iScreenX=nLightXPos, iLightX=-pBumps->SpotLight.nLightRadius; iLightXbytesPerPixel ) { @@ -496,67 +595,106 @@ void Execute( SBumps *pBumps ) nY -= ( nLightYPos + nY ) - pBumps->iWinHeight; } -#ifdef HAVE_XSHM_EXTENSION - if( pBumps->bUseShm ) - XShmPutImage( pBumps->pDisplay, pBumps->Win, pBumps->GraphicsContext, pBumps->pXImage, iLightX, iLightY, nLightXPos, nLightYPos, - nX, nY, False); - else -#endif /* HAVE_XSHM_EXTENSION */ - XPutImage( pBumps->pDisplay, pBumps->Win, pBumps->GraphicsContext, pBumps->pXImage, iLightX, iLightY, nLightXPos, nLightYPos, - nX, nY ); - - XSync( pBumps->pDisplay, False ); + put_xshm_image( pBumps->dpy, pBumps->Win, pBumps->GraphicsContext, pBumps->pXImage, iLightX, iLightY, nLightXPos, nLightYPos, + nX, nY, &pBumps->XShmInfo); } +static void DestroySpotLight( SSpotLight *pSpotLight ) { free( pSpotLight->aLightMap ); } + /* Clean up */ -void DestroyBumps( SBumps *pBumps ) +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->pDisplay, pBumps->pXImage, &pBumps->XShmInfo ); - else -#endif /* HAVE_XSHM_EXTENSION */ - XDestroyImage( pBumps->pXImage ); + destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo ); } /* All messages to the screensaver are processed here. */ -void screenhack( Display *pDisplay, Window Win ) +static void * +bumps_init (Display *dpy, Window Win) { - SBumps Bumps; - uint32_ iDelay; + SBumps *Bumps = (SBumps *) calloc (1, sizeof(SBumps)); + #ifdef VERBOSE time_t Time = time( NULL ); - uint16_ iFrame = 0; + uint16_t iFrame = 0; #endif /* VERBOSE */ - CreateBumps( &Bumps, pDisplay, Win ); - iDelay = get_integer_resource( "delay", "Integer" ); + CreateBumps( Bumps, dpy, Win ); + Bumps->delay = get_integer_resource(dpy, "delay", "Integer" ); + 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); + return Bumps; +} - while( 1 ) - { - screenhack_handle_events( pDisplay ); - Execute( &Bumps ); - usleep( iDelay ); +static unsigned long +bumps_draw (Display *dpy, Window window, void *closure) +{ + SBumps *Bumps = (SBumps *) closure; + + if (Bumps->img_loader) /* still loading */ + { + Bumps->img_loader = load_image_async_simple (Bumps->img_loader, 0, 0, 0, 0, 0); + if (! Bumps->img_loader) /* just finished */ + InitBumpMap_2(dpy, Bumps); + return Bumps->delay; + } + + if (!Bumps->img_loader && + 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); + } + + Execute( Bumps ); #ifdef VERBOSE - iFrame++; - if( Time - time( NULL ) ) - { - printf( "FPS: %d\n", iFrame ); - Time = time( NULL ); - iFrame = 0; - } + iFrame++; + if( Time - time( NULL ) ) + { + printf( "FPS: %d\n", iFrame ); + Time = time( NULL ); + iFrame = 0; + } #endif /* VERBOSE */ - } - DestroyBumps( &Bumps ); + return Bumps->delay; +} + +static void +bumps_reshape (Display *dpy, Window window, void *closure, + unsigned int w, unsigned int h) +{ } - +static Bool +bumps_event (Display *dpy, Window window, void *closure, XEvent *event) +{ + SBumps *Bumps = (SBumps *) closure; + if (screenhack_event_helper (dpy, window, event)) + { + Bumps->start_time = 0; + return True; + } + + return False; +} + +static void +bumps_free (Display *dpy, Window window, void *closure) +{ + SBumps *Bumps = (SBumps *) closure; + DestroyBumps( Bumps ); +} + + +XSCREENSAVER_MODULE ("Bumps", bumps) + /* vim: ts=4 */