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

diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index 41613c7d..fe08d2ea 100644
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -1,4 +1,4 @@
-/* xscreensaver-command, Copyright (c) 1991-2003 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver-command, Copyright (c) 1991-2004 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
@@ -48,11 +48,16 @@ static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
 static Atom XA_RESTART, XA_PREFS, XA_THROTTLE, XA_UNTHROTTLE;
 
 static char *screensaver_version;
+# ifdef __GNUC__
+  __extension__   /* don't warn about "string length is greater than the
+                     length ISO C89 compilers are required to support" in the
+                     usage string... */
+# endif
 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\
@@ -104,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\
@@ -133,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)
@@ -148,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, '/');
@@ -182,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)
@@ -296,7 +301,7 @@ main (int argc, char **argv)
 
   XSync (dpy, 0);
 
-  if (cmd == (Atom *) &watch)
+  if (cmd == &XA_WATCH)
     {
       i = watch (dpy);
       exit (i);
@@ -337,28 +342,29 @@ watch (Display *dpy)
 	  Atom type;
 	  int format;
 	  unsigned long nitems, bytesafter;
-	  CARD32 *data = 0;
+          unsigned char *dataP = 0;
 
 	  if (XGetWindowProperty (dpy,
                                   RootWindow (dpy, 0),  /* always screen #0 */
 				  XA_SCREENSAVER_STATUS,
 				  0, 999, False, XA_INTEGER,
 				  &type, &format, &nitems, &bytesafter,
-				  (unsigned char **) &data)
+				  &dataP)
 	      == Success
 	      && type
-	      && data)
+	      && dataP)
 	    {
               time_t tt;
               char *s;
               Bool changed = False;
               Bool running = False;
+              CARD32 *data = (CARD32 *) dataP;
 
               if (type != XA_INTEGER || nitems < 3)
                 {
                 STATUS_LOSE:
-                  if (last) free (last);
-                  if (data) free (data);
+                  if (last) XFree (last);
+                  if (data) XFree (data);
                   fprintf (stderr, "%s: bad status format on root window.\n",
                            progname);
                   return -1;
@@ -410,13 +416,13 @@ watch (Display *dpy)
 
               fflush (stdout);
 
-              if (last) free (last);
+              if (last) XFree (last);
               last = data;
 	    }
 	  else
 	    {
-	      if (last) free (last);
-	      if (data) free (data);
+	      if (last) XFree (last);
+	      if (dataP) XFree (dataP);
 	      fprintf (stderr, "%s: no saver status on root window.\n",
 		       progname);
 	      return -1;