X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fbumps.c;h=c65d46f0c507f73248e714d5a01a18b54d009e25;hp=094d31306c95485df70edd3e947ab0f35a72dcf2;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96

diff --git a/hacks/bumps.c b/hacks/bumps.c
index 094d3130..c65d46f0 100644
--- a/hacks/bumps.c
+++ b/hacks/bumps.c
@@ -28,7 +28,110 @@
  * 							 for code optimization.
  */
 
-#include "bumps.h"
+
+#include <math.h>
+#include "screenhack.h"
+
+#ifdef HAVE_XSHM_EXTENSION
+#include "xshm.h"
+#endif /* HAVE_XSHM_EXTENSION */
+
+
+/* Defines: */
+/* #define VERBOSE */
+#define RANDOM() ((int) (random() & 0X7FFFFFFFL))
+
+typedef signed char		int8_;
+typedef unsigned char	uint8_;
+typedef short			int16_;
+typedef unsigned short	uint16_;
+typedef long			int32_;
+typedef unsigned long	uint32_;
+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 */
+  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_ *aLightMap;
+	uint16_ nFalloffDiameter, nFalloffRadius;
+	uint16_ 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;
+	uint32_ *aColors;
+	XImage *pXImage;
+#ifdef HAVE_XSHM_EXTENSION
+	XShmSegmentInfo XShmInfo;
+	Bool	bUseShm;
+#endif /* HAVE_XSHM_EXTENSION */
+
+	uint8_ nColorCount;				/* Number of colors used. */
+	uint8_ bytesPerPixel;
+	uint16_ iWinWidth, iWinHeight;
+	uint16_ *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 * );