X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Feruption.c;h=5749aa6d7692e0f720f3ee50b6025068fcc66449;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hp=14809b9f7d80095788707c93001ed5b08b8da5eb;hpb=07faf451b99879183ed7e909e43a0e065be1ee7f;p=xscreensaver

diff --git a/hacks/eruption.c b/hacks/eruption.c
index 14809b9f..5749aa6d 100644
--- a/hacks/eruption.c
+++ b/hacks/eruption.c
@@ -298,7 +298,7 @@ static void Initialize( struct state *st )
 {
 	XGCValues gcValues;
 	XWindowAttributes XWinAttribs;
-	int iBitsPerPixel, i;
+	int /*iBitsPerPixel,*/ i;
 
 	/* Create the Image for drawing */
 	XGetWindowAttributes( st->dpy, st->window, &XWinAttribs );
@@ -310,7 +310,7 @@ static void Initialize( struct state *st )
 		for( i=0; i<pfvc; i++ )
 			if( pfv[ i ].depth == XWinAttribs.depth )
 			{
-				iBitsPerPixel = pfv[ i ].bits_per_pixel;
+				/*iBitsPerPixel = pfv[ i ].bits_per_pixel;*/
 				break;
 			}
 		if( pfv )
@@ -346,7 +346,6 @@ eruption_init (Display *dpy, Window window)
 	time_t nTime = time( NULL );
 	unsigned short iFrame = 0;
 #endif  /*  VERBOSE */
-        int i;
 
   st->dpy = dpy;
   st->window = window;
@@ -397,7 +396,6 @@ eruption_init (Display *dpy, Window window)
 
 	st->delay = get_integer_resource(st->dpy,  "delay", "Integer" );
 	st->cycles = get_integer_resource(st->dpy,  "cycles", "Integer" );
-	i = st->cycles;
 
 	cache(st);
 	
@@ -451,6 +449,21 @@ static void
 eruption_reshape (Display *dpy, Window window, void *closure, 
                  unsigned int w, unsigned int h)
 {
+#if 0
+  struct state *st = (struct state *) closure;
+  int i;
+  for (i = 0; i < st->iWinHeight; ++i)
+    free (st->fire[i]);
+
+  st->iWinWidth = w;
+  st->iWinHeight = h;
+
+  free (st->fire);
+  st->fire = calloc( st->iWinHeight, sizeof(unsigned char*));
+  for (i = 0; i < st->iWinHeight; ++i)
+    st->fire[i] = calloc( st->iWinWidth, sizeof(unsigned char));
+  st->draw_i = -1;
+#endif
 }
 
 static Bool
@@ -478,6 +491,7 @@ eruption_free (Display *dpy, Window window, void *closure)
 static const char *eruption_defaults [] = {
   ".background: black",
   ".foreground: white",
+  "*fpsTop:	true",
   "*cycles:   80",
   "*ncolors:  256",
   "*delay:    10000",