X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-command.c;h=fe08d2ea640a8efbe005a9576f4d688853c26055;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hp=a267f4e7538659fec2a1cc15a984f342bbd2a296;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver

diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index a267f4e7..fe08d2ea 100644
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -57,7 +57,7 @@ static char *usage = "\n\
 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-2005 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\
@@ -109,14 +109,6 @@ usage: %s -<option>\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\
@@ -138,6 +130,13 @@ usage: %s -<option>\n\
   For updates, check http://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); \
  } while(0)
@@ -153,6 +152,7 @@ main (int argc, char **argv)
   Atom *cmd = 0;
   long arg = 0L;
   char *s;
+  Atom XA_WATCH = 0;  /* kludge: not really an atom */
 
   progname = argv[0];
   s = strrchr (progname, '/');
@@ -187,7 +187,7 @@ main (int argc, char **argv)
       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)
@@ -301,7 +301,7 @@ main (int argc, char **argv)
 
   XSync (dpy, 0);
 
-  if (cmd == (Atom *) &watch)
+  if (cmd == &XA_WATCH)
     {
       i = watch (dpy);
       exit (i);