-/* xscreensaver-command, Copyright (c) 1991-2002
- * by 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
#include <stdio.h>
#include <stdlib.h>
+#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
# include <unistd.h>
#endif
-#include <X11/Xproto.h> /* for CARD32 */
+/* #include <X11/Xproto.h> / * for CARD32 */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h> /* for XGetClassHint() */
#include <X11/Intrinsic.h> /* only needed to get through xscreensaver.h */
+
+/* You might think that to read an array of 32-bit quantities out of a
+ server-side property, you would pass an array of 32-bit data quantities
+ into XGetWindowProperty(). You would be wrong. You have to use an array
+ of longs, even if long is 64 bits (using 32 of each 64.)
+ */
+typedef long PROP32;
+
#include "remote.h"
#include "version.h"
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-2002 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\
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\
- is easier, since you don't need to first figure out the pid.\n\
+ -exit Causes the xscreensaver process to exit gracefully.\n\
+ This does nothing if the display is currently locked.\n\
(Note that one must *never* kill xscreensaver with -9!)\n\
\n\
-restart Causes the screensaver process to exit and then restart with\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\
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)
Atom *cmd = 0;
long arg = 0L;
char *s;
+ Atom XA_WATCH = 0; /* kludge: not really an atom */
progname = argv[0];
s = strrchr (progname, '/');
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)
XSync (dpy, 0);
- if (cmd == (Atom *) &watch)
+ if (cmd == &XA_WATCH)
{
i = watch (dpy);
exit (i);
Window window = RootWindow (dpy, 0);
XWindowAttributes xgwa;
XEvent event;
- CARD32 *last = 0;
+ PROP32 *last = 0;
if (v) free (v);
XGetWindowAttributes (dpy, window, &xgwa);
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;
+ PROP32 *data = (PROP32 *) 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;
if (running && changed)
{
int i;
- fprintf (stdout, "RUN", s);
+ fprintf (stdout, "RUN");
for (i = 2; i < nitems; i++)
fprintf (stdout, " %d", (int) data[i]);
fprintf (stdout, "\n");
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;
projects / xscreensaver / blobdiff