ftp://ftp.swin.edu.au/slackware/slackware-9.1/source/xap/xscreensaver/xscreensaver...

[xscreensaver] / hacks / screenhack.c

diff --git a/hacks/screenhack.c b/hacks/screenhack.c
index 1a6cd69f879f8dbcd68accfe65730e4336f8da0c..79a58cde9792e2d0c5fdcf29403742d11c69e1cc 100644 (file)
--- a/hacks/screenhack.c
+++ b/hacks/screenhack.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1995, 1997, 1998, 2001, 2002
+/* xscreensaver, Copyright (c) 1992, 1995, 1997, 1998, 2001, 2002, 2003
  *  Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -57,6 +57,10 @@
 #include "version.h"
 #include "vroot.h"
 
+#ifndef _XSCREENSAVER_VROOT_H_
+# error Error!  You have an old version of vroot.h!  Check -I args.
+#endif /* _XSCREENSAVER_VROOT_H_ */
+
 #ifndef isupper
 # define isupper(c)  ((c) >= 'A' && (c) <= 'Z')
 #endif
@@ -547,7 +551,7 @@ main (int argc, char **argv)
   else if (root_p)
     {
       XWindowAttributes xgwa;
-      window = RootWindowOfScreen (XtScreen (toplevel));
+      window = VirtualRootWindowOfScreen (XtScreen (toplevel));
       XtDestroyWidget (toplevel);
       XGetWindowAttributes (dpy, window, &xgwa);
       cmap = xgwa.colormap;
@@ -576,7 +580,7 @@ main (int argc, char **argv)
          unsigned int bg, bd;
          Widget new;
 
-         cmap = XCreateColormap (dpy, RootWindowOfScreen(screen),
+         cmap = XCreateColormap (dpy, VirtualRootWindowOfScreen(screen),
                                  visual, AllocNone);
          bg = get_pixel_resource ("background", "Background", dpy, cmap);
          bd = get_pixel_resource ("borderColor", "Foreground", dpy, cmap);
@@ -592,7 +596,7 @@ main (int argc, char **argv)
                                    XtNbackground, (Pixel) bg,
                                    XtNborderColor, (Pixel) bd,
                                    XtNinput, True,  /* for WM_HINTS */
-                                   0);
+                                   NULL);
          XtDestroyWidget (toplevel);
          toplevel = new;
          XtRealizeWidget (toplevel);
@@ -603,7 +607,7 @@ main (int argc, char **argv)
          XtVaSetValues (toplevel,
                          XtNmappedWhenManaged, False,
                          XtNinput, True,  /* for WM_HINTS */
-                         0);
+                         NULL);
          XtRealizeWidget (toplevel);
          window = XtWindow (toplevel);
 
@@ -623,7 +627,7 @@ main (int argc, char **argv)
 /*
       if (dont_map)
        {
-         XtVaSetValues (toplevel, XtNmappedWhenManaged, False, 0);
+         XtVaSetValues (toplevel, XtNmappedWhenManaged, False, NULL);
          XtRealizeWidget (toplevel);
        }
       else
@@ -632,7 +636,7 @@ main (int argc, char **argv)
          XtPopup (toplevel, XtGrabNone);
        }
 
-      XtVaSetValues(toplevel, XtNtitle, version, 0);
+      XtVaSetValues(toplevel, XtNtitle, version, NULL);
 
       /* For screenhack_handle_events(): select KeyPress, and
          announce that we accept WM_DELETE_WINDOW. */