X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdistort.c;h=b9f6cee75ecdb9a6b3b4715a536792944627dc4b;hb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5;hp=ffaaa53e6b186539bfac5a44d77f4a5c8f76bda1;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/hacks/distort.c b/hacks/distort.c
index ffaaa53e..b9f6cee7 100644
--- a/hacks/distort.c
+++ b/hacks/distort.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; tab-width: 4 -*-
- * xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997, 1998
+ * xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997, 1998, 2002, 2003
  * Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -208,6 +208,18 @@ static void init_distort(Display *dpy, Window window)
           radius = xgwa.width/8;
 	}
 
+    /* never allow the radius to be too close to the min window dimension
+     */
+    if (radius >= xgwa.width  * 0.45) radius = xgwa.width  * 0.45;
+    if (radius >= xgwa.height * 0.45) radius = xgwa.height * 0.45;
+
+
+    /* -swamp mode consumes vast amounts of memory, proportional to radius --
+       so throttle radius to a small-ish value (60 => ~30MB.)
+     */
+    if (effect == &swamp_thing && radius > 60)
+      radius = 60;
+
 	if (delay < 0)
 		delay = 0;
 	if (radius <= 0)
@@ -236,7 +248,7 @@ static void init_distort(Display *dpy, Window window)
 		gcflags |= GCSubwindowMode;
 	gc = XCreateGC (dpy, window, gcflags, &gcv);
 
-	grab_screen_image (xgwa.screen, window);
+    load_random_image (xgwa.screen, window, window);
 
 	buffer_map = 0;
 	orig_map = XGetImage(dpy, window, 0, 0, xgwa.width, xgwa.height,
@@ -568,6 +580,7 @@ static void reflect_draw(int k)
 		ly = i - cy;
 		lysq = ly * ly;
 		ny = xy_coo[k].y + i;
+		if (ny >= orig_map->height) ny = orig_map->height-1;
 		for(j = 0 ; j < 2*radius+speed+2 ; j++) {
 			lx = j - cx;
 			dist = lx * lx + lysq;