X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fslidescreen.c;h=78a30843fbb3485525402a6435811a02bbd0d427;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hp=e31bcf0dda9e60ba20d340c02f1c576e9ba83d5b;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/hacks/slidescreen.c b/hacks/slidescreen.c
index e31bcf0d..78a30843 100644
--- a/hacks/slidescreen.c
+++ b/hacks/slidescreen.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997, 1998, 2001 
+/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997, 1998, 2001, 2003 
  * Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -36,7 +36,7 @@ init_slide (Display *dpy, Window window)
   Visual *visual;
 
   XGetWindowAttributes (dpy, window, &xgwa);
-  grab_screen_image (xgwa.screen, window);
+  load_random_image (xgwa.screen, window, window, NULL);
   cmap = xgwa.colormap;
   visual = xgwa.visual;
   max_width = xgwa.width;
@@ -98,7 +98,7 @@ init_slide (Display *dpy, Window window)
 	for(i = 0; i < max; i++)
 	  {
 	    long rd, gd, bd;
-	    unsigned long d;
+	    unsigned long dd;
 	    if (!fg_ok)
 	      {
 		rd = (all[i].red   >> 8) - (fgc.red   >> 8);
@@ -107,12 +107,12 @@ init_slide (Display *dpy, Window window)
 		if (rd < 0) rd = -rd;
 		if (gd < 0) gd = -gd;
 		if (bd < 0) bd = -bd;
-		d = (rd << 1) + (gd << 2) + bd;
-		if (d < fgd)
+		dd = (rd << 1) + (gd << 2) + bd;
+		if (dd < fgd)
 		  {
-		    fgd = d;
+		    fgd = dd;
 		    fg = all[i].pixel;
-		    if (d == 0)
+		    if (dd == 0)
 		      fg_ok = True;
 		  }
 	      }
@@ -125,12 +125,12 @@ init_slide (Display *dpy, Window window)
 		if (rd < 0) rd = -rd;
 		if (gd < 0) gd = -gd;
 		if (bd < 0) bd = -bd;
-		d = (rd << 1) + (gd << 2) + bd;
-		if (d < bgd)
+		dd = (rd << 1) + (gd << 2) + bd;
+		if (dd < bgd)
 		  {
-		    bgd = d;
+		    bgd = dd;
 		    bg = all[i].pixel;
-		    if (d == 0)
+		    if (dd == 0)
 		      bg_ok = True;
 		  }
 	      }
@@ -146,7 +146,7 @@ init_slide (Display *dpy, Window window)
   if (delay < 0) delay = 0;
   if (delay2 < 0) delay2 = 0;
   if (pix_inc < 1) pix_inc = 1;
-  if (grid_size < 10) grid_size = 10;
+  if (grid_size < 1) grid_size = 1;
 
   gcv.foreground = fg;
   gcv.function = GXcopy;