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

diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index 8ace1506..a267f4e7 100644
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -1,5 +1,4 @@
-/* xscreensaver-command, Copyright (c) 1991-1998
- *  by Jamie Zawinski <jwz@netscape.com>
+/* 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
@@ -10,14 +9,15 @@
  * implied warranty.
  */
 
-#define STANDALONE
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
@@ -31,184 +31,33 @@
 
 #include <X11/Intrinsic.h>	/* only needed to get through xscreensaver.h */
 
+#include "remote.h"
 #include "version.h"
 
-#ifdef STANDALONE
-  static char *progname;
-  static Atom XA_VROOT;
-  static Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_TIME;
-#else  /* !STANDALONE */
-# include "xscreensaver.h"
-#endif /* !STANDALONE */
-
-
 #ifdef _VROOT_H_
 ERROR! you must not include vroot.h in this file
 #endif
 
-static Window
-find_screensaver_window (Display *dpy, char **version)
-{
-  int i;
-  Window root = RootWindowOfScreen (DefaultScreenOfDisplay (dpy));
-  Window root2, parent, *kids;
-  unsigned int nkids;
-
-  if (version) *version = 0;
-
-  if (! XQueryTree (dpy, root, &root2, &parent, &kids, &nkids))
-    abort ();
-  if (root != root2)
-    abort ();
-  if (parent)
-    abort ();
-  if (! (kids && nkids))
-    abort ();
-  for (i = 0; i < nkids; i++)
-    {
-      Atom type;
-      int format;
-      unsigned long nitems, bytesafter;
-      char *v;
-
-      if (XGetWindowProperty (dpy, kids[i],
-			      XA_SCREENSAVER_VERSION,
-			      0, 200, False, XA_STRING,
-			      &type, &format, &nitems, &bytesafter,
-			      (unsigned char **) &v)
-	  == Success
-	  && type != None)
-	{
-	  if (version)
-	    *version = v;
-	  return kids[i];
-	}
-    }
-  fprintf (stderr, "%s: no screensaver is running on display %s\n", progname,
-	   DisplayString (dpy));
-  exit (1);
-}
-
-
-void
-xscreensaver_command (Display *dpy, Atom command)
-{
-  char *v = 0;
-  Window window = find_screensaver_window (dpy, &v);
-
-  if (command == XA_SCREENSAVER_TIME ||
-      command == XA_SCREENSAVER_VERSION)
-    {
-      XClassHint hint;
-      memset (&hint, 0, sizeof(hint));
-      if (!v || !*v)
-	{
-	  fprintf (stderr, "%s: version property not set on window 0x%x?\n",
-		   progname, (unsigned int) window);
-	  exit (1);
-	}
-
-      XGetClassHint(dpy, window, &hint);
-      if (!hint.res_class)
-	{
-	  fprintf (stderr, "%s: class hints not set on window 0x%x?\n",
-		   progname, (unsigned int) window);
-	  exit (1);
-	}
-
-      fprintf (stdout, "%s %s", hint.res_class, v);
-
-      if (command != XA_SCREENSAVER_TIME)
-	{
-	  fprintf (stdout, "\n");
-	}
-      else
-	{
-	  Atom type;
-	  int format;
-	  unsigned long nitems, bytesafter;
-	  unsigned char *data = 0;
-	  XWindowAttributes xgwa;
-	  Bool active_p = False;
-
-	  xgwa.map_state = IsViewable;
-	  XGetWindowAttributes (dpy, window, &xgwa);
-
-	  if (XGetWindowProperty (dpy, window, XA_VROOT,
-				  0, 0, False, XA_WINDOW,
-				  &type, &format, &nitems, &bytesafter,
-				  &data)
-	      == Success
-	      && type != None)
-	    active_p = True;
-
-	  if (data) free (data);
-	  data = 0;
-
-	  if (XGetWindowProperty (dpy, window,
-				  XA_SCREENSAVER_TIME,
-				  0, 1, False, XA_INTEGER,
-				  &type, &format, &nitems, &bytesafter,
-				  &data)
-	      == Success
-	      && type == XA_INTEGER
-	      && data)
-	    {
-	      CARD32 time32 = *((CARD32 *)data);
-	      time_t tt = (time_t) time32;
-
-	      if (active_p)
-		fprintf (stdout, ": screen blanked since ");
-	      else
-		/* suggestions for a better way to phrase this are welcome. */
-		fprintf (stdout, ": screen non-blanked since ");
-	      fprintf (stdout, "%s", ctime(&tt));
-	      if (data) free (data);
-	    }
-	  else
-	    {
-	      if (data) free (data);
-	      fprintf (stdout, "\n");
-	      fflush (stdout);
-	      fprintf (stderr, "%s: no time on window 0x%x (%s %s).\n",
-		       progname, (unsigned int) window,
-		       hint.res_class, (v ? v : "???"));
-	      exit (1);
-	    }
-	}
-    }
-  else
-    {
-      XEvent event;
-      event.xany.type = ClientMessage;
-      event.xclient.display = dpy;
-      event.xclient.window = window;
-      event.xclient.message_type = XA_SCREENSAVER;
-      event.xclient.format = 32;
-      event.xclient.data.l[0] = (long) command;
-      if (! XSendEvent (dpy, window, False, 0L, &event))
-	{
-	  fprintf (stderr, "%s: XSendEvent(dpy, 0x%x ...) failed.\n",
-		   progname, (unsigned int) window);
-	  exit (1);
-	}
-    }
-  XSync (dpy, 0);
-}
-
+char *progname;
 
-
-#ifdef STANDALONE
+Atom XA_VROOT;
+Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE;
+Atom XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO, XA_EXIT;
+Atom XA_BLANK, XA_LOCK;
 static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV;
-static Atom XA_EXIT, XA_RESTART, XA_DEMO, XA_LOCK;
+static Atom XA_RESTART, XA_PREFS, XA_THROTTLE, XA_UNTHROTTLE;
 
-static char *progname;
 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 -<switch>\n\
+usage: %s -<option>\n\
 \n\
   This program provides external control of a running xscreensaver process.\n\
-  Version %s, copyright (c) 1991-1997 Jamie Zawinski <jwz@netscape.com>.\n\
+  Version %s, copyright (c) 1991-2003 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\
@@ -216,6 +65,9 @@ usage: %s -<switch>\n\
   details.  These are the arguments understood by xscreensaver-command:\n\
 \n\
   -demo         Ask the xscreensaver process to enter interactive demo mode.\n\
+\n\
+  -prefs        Ask the xscreensaver process to bring up the preferences\n\
+                panel.\n\
 \n\
   -activate     Turn on the screensaver (blank the screen), as if the user\n\
                 had been idle for long enough.\n\
@@ -236,6 +88,12 @@ usage: %s -<switch>\n\
                 an easier way to accomplish that.)\n\
 \n\
   -prev         Like -next, but goes in the other direction.\n\
+\n\
+  -select <N>   Like -activate, but runs the Nth element in the list of\n\
+                hacks.  By knowing what is in the `programs' list, and in\n\
+                what order, you can use this to activate the screensaver\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\
@@ -249,7 +107,16 @@ usage: %s -<switch>\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.\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\
@@ -260,13 +127,22 @@ usage: %s -<switch>\n\
                 deactivated (roughly, how long the user has been idle or\n\
                 non-idle -- but not quite, since it only tells you when the\n\
                 screen became blanked or un-blanked.)\n\
+\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\
 \n\
   See the man page for more details.\n\
-  For updates, check http://people.netscape.com/jwz/xscreensaver/\n\
+  For updates, check http://www.jwz.org/xscreensaver/\n\
 \n";
 
-#define USAGE() \
- { fprintf (stderr, usage, progname, screensaver_version); exit (1); }
+#define USAGE() do { \
+ fprintf (stderr, usage, progname, screensaver_version); exit (1); \
+ } while(0)
+
+static int watch (Display *);
 
 int
 main (int argc, char **argv)
@@ -275,8 +151,13 @@ main (int argc, char **argv)
   int i;
   char *dpyname = 0;
   Atom *cmd = 0;
+  long arg = 0L;
+  char *s;
 
   progname = argv[0];
+  s = strrchr (progname, '/');
+  if (s) progname = s+1;
+
   screensaver_version = (char *) malloc (5);
   memcpy (screensaver_version, screensaver_id + 17, 4);
   screensaver_version [4] = 0;
@@ -289,24 +170,106 @@ main (int argc, char **argv)
       L = strlen (s);
       if (L < 2) USAGE ();
       if (!strncmp (s, "-display", L))		dpyname = argv [++i];
-      else if (cmd) USAGE ()
+      else if (cmd) USAGE();
       else if (!strncmp (s, "-activate", L))   cmd = &XA_ACTIVATE;
       else if (!strncmp (s, "-deactivate", L)) cmd = &XA_DEACTIVATE;
       else if (!strncmp (s, "-cycle", L))      cmd = &XA_CYCLE;
       else if (!strncmp (s, "-next", L))       cmd = &XA_NEXT;
       else if (!strncmp (s, "-prev", L))       cmd = &XA_PREV;
+      else if (!strncmp (s, "-select", L))     cmd = &XA_SELECT;
       else if (!strncmp (s, "-exit", L))       cmd = &XA_EXIT;
       else if (!strncmp (s, "-restart", L))    cmd = &XA_RESTART;
       else if (!strncmp (s, "-demo", L))       cmd = &XA_DEMO;
+      else if (!strncmp (s, "-preferences",L)) cmd = &XA_PREFS;
+      else if (!strncmp (s, "-prefs",L))       cmd = &XA_PREFS;
       else if (!strncmp (s, "-lock", L))       cmd = &XA_LOCK;
+      else if (!strncmp (s, "-throttle", L))   cmd = &XA_THROTTLE;
+      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_TIME;
+      else if (!strncmp (s, "-time", L))       cmd = &XA_SCREENSAVER_STATUS;
+      else if (!strncmp (s, "-watch", L))      cmd = (Atom *) &watch;
       else USAGE ();
+
+      if (cmd == &XA_SELECT || cmd == &XA_DEMO)
+	{
+	  long a;
+	  char c;
+	  if (i+1 < argc && (1 == sscanf(argv[i+1], " %ld %c", &a, &c)))
+	    {
+	      arg = a;
+	      i++;
+	    }
+	}
     }
+
   if (!cmd)
     USAGE ();
 
+  if (arg < 0)
+    /* no command may have a negative argument. */
+    USAGE();
+  else if (arg == 0)
+    {
+      /* SELECT must have a non-zero argument. */
+      if (cmd == &XA_SELECT)
+	USAGE();
+    }
+  else /* arg > 0 */
+    {
+      /* no command other than SELECT and DEMO may have a non-zero argument. */
+      if (cmd != &XA_DEMO && cmd != &XA_SELECT)
+	USAGE();
+    }
+
+
+
+  /* For backward compatibility: -demo with no arguments used to send a
+     "DEMO 0" ClientMessage to the xscreensaver process, which brought up
+     the built-in demo mode dialog.  Now that the demo mode dialog is no
+     longer built in, we bring it up by just running the "xscreensaver-demo"
+     program.
+
+     Note that "-DEMO <n>" still sends a ClientMessage.
+   */
+  if (cmd == &XA_PREFS ||
+      (cmd == &XA_DEMO && arg == 0))
+    {
+      char buf [512];
+      char *new_argv[] = { "xscreensaver-demo", 0, 0, 0, 0, 0 };
+      int ac = 1;
+
+      if (dpyname)
+	{
+	  new_argv[ac++] = "-display";
+	  new_argv[ac++] = dpyname;
+	}
+
+      if (cmd == &XA_PREFS)
+	new_argv[ac++] = "-prefs";
+
+      fflush(stdout);
+      fflush(stderr);
+      execvp (new_argv[0], new_argv);	/* shouldn't return */
+
+      sprintf (buf, "%s: could not exec %s", progname, new_argv[0]);
+      perror(buf);
+      fflush(stdout);
+      fflush(stderr);
+      exit (-1);
+    }
+
+
+
   if (!dpyname) dpyname = (char *) getenv ("DISPLAY");
+
+  if (!dpyname)
+    {
+      dpyname = ":0.0";
+      fprintf (stderr,
+               "%s: warning: $DISPLAY is not set: defaulting to \"%s\".\n",
+               progname, dpyname);
+    }
+
   dpy = XOpenDisplay (dpyname);
   if (!dpy)
     {
@@ -317,23 +280,153 @@ main (int argc, char **argv)
 
   XA_VROOT = XInternAtom (dpy, "__SWM_VROOT", False);
   XA_SCREENSAVER = XInternAtom (dpy, "SCREENSAVER", False);
+  XA_SCREENSAVER_ID = XInternAtom (dpy, "_SCREENSAVER_ID", False);
   XA_SCREENSAVER_VERSION = XInternAtom (dpy, "_SCREENSAVER_VERSION",False);
-  XA_SCREENSAVER_TIME = XInternAtom (dpy, "_SCREENSAVER_TIME", False);
+  XA_SCREENSAVER_STATUS = XInternAtom (dpy, "_SCREENSAVER_STATUS", False);
+  XA_SCREENSAVER_RESPONSE = XInternAtom (dpy, "_SCREENSAVER_RESPONSE", False);
   XA_ACTIVATE = XInternAtom (dpy, "ACTIVATE", False);
   XA_DEACTIVATE = XInternAtom (dpy, "DEACTIVATE", False);
   XA_RESTART = XInternAtom (dpy, "RESTART", False);
   XA_CYCLE = XInternAtom (dpy, "CYCLE", False);
   XA_NEXT = XInternAtom (dpy, "NEXT", False);
   XA_PREV = XInternAtom (dpy, "PREV", False);
+  XA_SELECT = XInternAtom (dpy, "SELECT", False);
   XA_EXIT = XInternAtom (dpy, "EXIT", False);
   XA_DEMO = XInternAtom (dpy, "DEMO", False);
+  XA_PREFS = XInternAtom (dpy, "PREFS", False);
   XA_LOCK = XInternAtom (dpy, "LOCK", False);
+  XA_BLANK = XInternAtom (dpy, "BLANK", False);
+  XA_THROTTLE = XInternAtom (dpy, "THROTTLE", False);
+  XA_UNTHROTTLE = XInternAtom (dpy, "UNTHROTTLE", False);
+
+  XSync (dpy, 0);
+
+  if (cmd == (Atom *) &watch)
+    {
+      i = watch (dpy);
+      exit (i);
+    }
 
-  xscreensaver_command(dpy, *cmd);
+  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);
 
-  fflush (stdout);
-  fflush (stderr);
-  exit (0);
+  i = xscreensaver_command (dpy, *cmd, arg, True, NULL);
+  if (i < 0) exit (i);
+  else exit (0);
 }
 
-#endif /* STANDALONE */
+
+static int
+watch (Display *dpy)
+{
+  char *v = 0;
+  Window window = RootWindow (dpy, 0);
+  XWindowAttributes xgwa;
+  XEvent event;
+  CARD32 *last = 0;
+
+  if (v) free (v);
+  XGetWindowAttributes (dpy, window, &xgwa);
+  XSelectInput (dpy, window, xgwa.your_event_mask | PropertyChangeMask);
+
+  while (1)
+    {
+      XNextEvent (dpy, &event);
+      if (event.xany.type == PropertyNotify &&
+          event.xproperty.state == PropertyNewValue &&
+          event.xproperty.atom == XA_SCREENSAVER_STATUS)
+        {
+	  Atom type;
+	  int format;
+	  unsigned long nitems, bytesafter;
+          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,
+				  &dataP)
+	      == Success
+	      && type
+	      && 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) XFree (last);
+                  if (data) XFree (data);
+                  fprintf (stderr, "%s: bad status format on root window.\n",
+                           progname);
+                  return -1;
+                }
+                  
+              tt = (time_t) data[1];
+              if (tt <= (time_t) 666000000L) /* early 1991 */
+                goto STATUS_LOSE;
+
+              s = ctime(&tt);
+              if (s[strlen(s)-1] == '\n')
+                s[strlen(s)-1] = 0;
+
+              if (!last || data[0] != last[0])
+                {
+                  /* State changed. */
+                  if (data[0] == XA_BLANK)
+                    printf ("BLANK %s\n", s);
+                  else if (data[0] == XA_LOCK)
+                    printf ("LOCK %s\n", s);
+                  else if (data[0] == 0)
+                    printf ("UNBLANK %s\n", s);
+                  else
+                    goto STATUS_LOSE;
+                }
+
+              if (!last)
+                changed = True;
+              else
+                {
+                  int i;
+                  for (i = 2; i < nitems; i++)
+                    {
+                      if (data[i] != last[i])
+                        changed = True;
+                      if (data[i])
+                        running = True;
+                    }
+                }
+
+              if (running && changed)
+                {
+                  int i;
+                  fprintf (stdout, "RUN");
+                  for (i = 2; i < nitems; i++)
+                    fprintf (stdout, " %d", (int) data[i]);
+                  fprintf (stdout, "\n");
+                }
+
+              fflush (stdout);
+
+              if (last) XFree (last);
+              last = data;
+	    }
+	  else
+	    {
+	      if (last) XFree (last);
+	      if (dataP) XFree (dataP);
+	      fprintf (stderr, "%s: no saver status on root window.\n",
+		       progname);
+	      return -1;
+	    }
+        }
+    }
+}