# include <unistd.h>
#endif
-#include <X11/Xproto.h> /* for CARD32 */
+/* #include <X11/Xproto.h> / * for CARD32 */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h> /* for XGetClassHint() */
#include <X11/Intrinsic.h> /* only needed to get through xscreensaver.h */
+
+/* You might think that to read an array of 32-bit quantities out of a
+ server-side property, you would pass an array of 32-bit data quantities
+ into XGetWindowProperty(). You would be wrong. You have to use an array
+ of longs, even if long is 64 bits (using 32 of each 64.)
+ */
+typedef long PROP32;
+
#include "remote.h"
#include "version.h"
usage: %s -<option>\n\
\n\
This program provides external control of a running xscreensaver process.\n\
- Version %s, copyright (c) 1991-2005 Jamie Zawinski <jwz@jwz.org>.\n\
+ Version %s, copyright (c) 1991-2006 Jamie Zawinski <jwz@jwz.org>.\n\
\n\
The xscreensaver program is a daemon that runs in the background.\n\
You control a running xscreensaver process by sending it messages\n\
with a particular graphics demo. (The first element in the\n\
list is numbered 1, not 0.)\n\
\n\
- -exit Causes the xscreensaver process to exit gracefully. This is\n\
- roughly the same as killing the process with `kill', but it\n\
- is easier, since you don't need to first figure out the pid.\n\
+ -exit Causes the xscreensaver process to exit gracefully.\n\
+ This does nothing if the display is currently locked.\n\
(Note that one must *never* kill xscreensaver with -9!)\n\
\n\
-restart Causes the screensaver process to exit and then restart with\n\
Window window = RootWindow (dpy, 0);
XWindowAttributes xgwa;
XEvent event;
- CARD32 *last = 0;
+ PROP32 *last = 0;
if (v) free (v);
XGetWindowAttributes (dpy, window, &xgwa);
char *s;
Bool changed = False;
Bool running = False;
- CARD32 *data = (CARD32 *) dataP;
+ PROP32 *data = (PROP32 *) dataP;
if (type != XA_INTEGER || nitems < 3)
{