X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Feruption.c;h=629cb8e1e5d2654e4b38a821212543f452bf7878;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=2084cbf27bc77cfd150c57f5d44f2c806e4cbab1;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/eruption.c b/hacks/eruption.c
index 2084cbf2..629cb8e1 100644
--- a/hacks/eruption.c
+++ b/hacks/eruption.c
@@ -116,6 +116,7 @@ static void Execute( struct state *st )
 	  else if (st->particles[i].xpos >= st->iWinWidth - 2)
 	    {
 	      st->particles[i].xpos = st->iWinWidth - 2;
+	      if (st->particles[i].xpos < 1) st->particles[i].xpos = 1;
 	      st->particles[i].xdir = -st->particles[i].xdir + 4;
 	      st->particles[i].colorindex = st->iColorCount;
 	    }
@@ -129,9 +130,11 @@ static void Execute( struct state *st )
 	  else if (st->particles[i].ypos >= st->iWinHeight - 3)
 	    {
 	      st->particles[i].ypos = st->iWinHeight- 3;
+	      if (st->particles[i].ypos < 1) st->particles[i].ypos = 1;
 	      st->particles[i].ydir = (-st->particles[i].ydir >> 2) - (random() % 2);
 	      st->particles[i].colorindex = st->iColorCount;
 	    }
+
 	  
 	  /* st->gravity kicks in */
 	  st->particles[i].ydir += st->gravity;
@@ -140,6 +143,7 @@ static void Execute( struct state *st )
 	  st->particles[i].colorindex--;
 	  
 	  /* draw particle */
+	  if (st->iWinHeight <= 2 || st->iWinWidth <= 2) continue;
 	  st->fire[st->particles[i].ypos][st->particles[i].xpos] = st->particles[i].colorindex;
 	  st->fire[st->particles[i].ypos][st->particles[i].xpos - 1] = st->particles[i].colorindex;
 	  st->fire[st->particles[i].ypos + 1][st->particles[i].xpos] = st->particles[i].colorindex;
@@ -294,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 );
@@ -306,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 )
@@ -342,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;
@@ -393,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);
 	
@@ -447,6 +449,28 @@ static void
 eruption_reshape (Display *dpy, Window window, void *closure, 
                  unsigned int w, unsigned int h)
 {
+  struct state *st = (struct state *) closure;
+  XWindowAttributes XWinAttribs;
+  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));
+
+  XDestroyImage( st->pImage );
+  XGetWindowAttributes( st->dpy, st->window, &XWinAttribs );
+  st->pImage = XCreateImage( st->dpy, XWinAttribs.visual, XWinAttribs.depth, ZPixmap, 0, NULL,
+							  XWinAttribs.width, XWinAttribs.height, BitmapPad( st->dpy ), 0 );
+  (st->pImage)->data = calloc((st->pImage)->bytes_per_line, (st->pImage)->height);
+
+  st->draw_i = -1;
 }
 
 static Bool
@@ -460,7 +484,6 @@ eruption_free (Display *dpy, Window window, void *closure)
 {
 #if 0
   struct state *st = (struct state *) closure;
-	free( st->pImage->data );
 	XDestroyImage( st->pImage );
 	free( st->aiColorVals );
 	for (i = 0; i < st->iWinHeight; ++i)
@@ -474,6 +497,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",