X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-command.c;h=f4a855df167037655f68772f3dc4b5cea1af7c1e;hb=39809ded547bdbb08207d3e514950425215b4410;hp=f35a30d933228c477e9a9d0b8f2e17c64048ce57;hpb=ff35d056d723c9a5ffe728dbba5f1c25e141be04;p=xscreensaver

diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index f35a30d9..f4a855df 100644
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -130,11 +130,11 @@ usage: %s -<option>\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
@@ -324,8 +324,12 @@ main (int argc, char **argv)
   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);