X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=utils%2Fgrabscreen.c;h=99b7cae652c0a22effca6675b8b1d99ff95ac3ef;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hp=d9a520976c00b52234c01485427e77cab27bc5e1;hpb=bbd0773f2adde4927a6196361d4061e70bf48cd9;p=xscreensaver

diff --git a/utils/grabscreen.c b/utils/grabscreen.c
index d9a52097..99b7cae6 100644
--- a/utils/grabscreen.c
+++ b/utils/grabscreen.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1997, 1998, 2003
+/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1997, 1998, 2003, 2004, 2006
  *  Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -117,12 +117,12 @@ xscreensaver_window_p (Display *dpy, Window window)
   Atom type;
   int format;
   unsigned long nitems, bytesafter;
-  char *version;
+  unsigned char *version;
   if (XGetWindowProperty (dpy, window,
 			  XInternAtom (dpy, "_SCREENSAVER_VERSION", False),
 			  0, 1, False, XA_STRING,
 			  &type, &format, &nitems, &bytesafter,
-			  (unsigned char **) &version)
+			  &version)
       == Success
       && type != None)
     return True;
@@ -223,7 +223,7 @@ use_subwindow_mode_p(Screen *screen, Window window)
 static void
 install_screen_colormaps (Screen *screen)
 {
-  int i;
+  unsigned int i;
   Display *dpy = DisplayOfScreen (screen);
   Window real_root;
   Window parent, *kids = 0;
@@ -260,7 +260,7 @@ install_screen_colormaps (Screen *screen)
 
 
 void
-grab_screen_image (Screen *screen, Window window)
+grab_screen_image_internal (Screen *screen, Window window)
 {
   Display *dpy = DisplayOfScreen (screen);
   XWindowAttributes xgwa;
@@ -291,12 +291,12 @@ grab_screen_image (Screen *screen, Window window)
       double unmap = 0;
       if (saver_p)
 	{
-	  unmap = get_float_resource("grabRootDelay", "Seconds");
+	  unmap = get_float_resource(dpy, "grabRootDelay", "Seconds");
 	  if (unmap <= 0.00001 || unmap > 20) unmap = 2.5;
 	}
       else
 	{
-	  unmap = get_float_resource("grabWindowDelay", "Seconds");
+	  unmap = get_float_resource(dpy, "grabWindowDelay", "Seconds");
 	  if (unmap <= 0.00001 || unmap > 20) unmap = 0.66;
 	}
       unmap_time = unmap * 100000;