-/* xscreensaver-command, Copyright (c) 1991-2004 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver-command, Copyright (c) 1991-2013 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
# 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-2003 Jamie Zawinski <jwz@jwz.org>.\n\
+ Version %s, copyright (c) 1991-%s 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\
- the same command line arguments as last time. Do this after\n\
- you've changed your X resource settings, to cause\n\
- xscreensaver to notice the changes.\n\
+ the same command line arguments as last time. You shouldn't\n\
+ really need to do this, since xscreensaver notices when the\n\
+ .xscreensaver file has changed and re-reads it as needed.\n\
\n\
-lock Tells the running xscreensaver process to lock the screen\n\
immediately. This is like -activate, but forces locking as\n\
well, even if locking is not the default. If the saver is\n\
already active, this causes it to be locked as well.\n\
-\n\
- -throttle Temporarily switch to ``blank screen'' mode, and don't run\n\
- any display modes at all, until the screensaver is next\n\
- de-activated. This is useful if you're using a machine\n\
- remotely, and you find that some display modes are using too\n\
- much CPU.\n\
-\n\
- -unthrottle Turn `-throttle' off and resume normal behavior.\n\
\n\
-version Prints the version of xscreensaver that is currently running\n\
on the display -- that is, the actual version number of the\n\
some way.\n\
\n\
See the man page for more details.\n\
- For updates, check http://www.jwz.org/xscreensaver/\n\
+ For updates, check https://www.jwz.org/xscreensaver/\n\
\n";
+/* Note: The "-throttle" command is deprecated -- it predates the XDPMS
+ extension. Instead of using -throttle, users should instead just
+ power off the monitor (e.g., "xset dpms force off".) In a few
+ minutes, the xscreensaver daemon will notice that the monitor is
+ off, and cease running hacks.
+ */
+
#define USAGE() do { \
- fprintf (stderr, usage, progname, screensaver_version); exit (1); \
+ fprintf (stderr, usage, progname, screensaver_version, year); exit (1); \
} while(0)
static int watch (Display *);
Atom *cmd = 0;
long arg = 0L;
char *s;
+ Atom XA_WATCH = 0; /* kludge: not really an atom */
+ char year[5];
progname = argv[0];
s = strrchr (progname, '/');
memcpy (screensaver_version, screensaver_id + 17, 4);
screensaver_version [4] = 0;
+ s = strchr (screensaver_id, '-');
+ s = strrchr (s, '-');
+ s++;
+ strncpy (year, s, 4);
+ year[4] = 0;
+
for (i = 1; i < argc; i++)
{
const char *s = argv [i];
else if (!strncmp (s, "-unthrottle", L)) cmd = &XA_UNTHROTTLE;
else if (!strncmp (s, "-version", L)) cmd = &XA_SCREENSAVER_VERSION;
else if (!strncmp (s, "-time", L)) cmd = &XA_SCREENSAVER_STATUS;
- else if (!strncmp (s, "-watch", L)) cmd = (Atom *) &watch;
+ else if (!strncmp (s, "-watch", L)) cmd = &XA_WATCH;
else USAGE ();
if (cmd == &XA_SELECT || cmd == &XA_DEMO)
XSync (dpy, 0);
- if (cmd == (Atom *) &watch)
+ if (cmd == &XA_WATCH)
{
i = watch (dpy);
exit (i);
if (*cmd == XA_ACTIVATE || *cmd == XA_LOCK ||
*cmd == XA_NEXT || *cmd == XA_PREV || *cmd == XA_SELECT)
/* People never guess that KeyRelease deactivates the screen saver too,
- so if we're issuing an activation command, wait a second. */
- sleep (1);
+ so if we're issuing an activation command, wait a second.
+ No need to do this if stdin is not a tty, meaning we're not being
+ run from the command line.
+ */
+ if (isatty(0))
+ sleep (1);
i = xscreensaver_command (dpy, *cmd, arg, True, NULL);
if (i < 0) exit (i);
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)
{
projects / xscreensaver / blobdiff