-/* xscreensaver-command, Copyright (c) 1991-2008 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
usage: %s -<option>\n\
\n\
This program provides external control of a running xscreensaver process.\n\
- Version %s, copyright (c) 1991-2008 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\
-watch Prints a line each time the screensaver changes state: when\n\
the screen blanks, locks, unblanks, or when the running hack\n\
is changed. This option never returns; it is intended for\n\
- by shell scripts that want to react to the screensaver in\n\
- some way.\n\
+ use by shell scripts that want to react to the screensaver\n\
+ in 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
*/
#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 *);
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];
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);