X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-command.c;h=cd2ea714b22639f63e45ad137098782b93eeb1e4;hb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;hp=d0aced9414a101801994422f6eee57c3b35f7bd3;hpb=ccbc9f87eb59497b23bd0424ee1ed20ad7c7db54;p=xscreensaver diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c index d0aced94..cd2ea714 100644 --- a/driver/xscreensaver-command.c +++ b/driver/xscreensaver-command.c @@ -1,5 +1,5 @@ -/* xscreensaver-command, Copyright (c) 1991-1995 - * Jamie Zawinski +/* xscreensaver-command, Copyright (c) 1991-1999 + * by Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -10,142 +10,404 @@ * implied warranty. */ -#include "version.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include +#include +#include +#include + +#ifdef HAVE_UNISTD_H +# include +#endif + +#include /* for CARD32 */ #include #include +#include /* for XGetClassHint() */ #include -#if __STDC__ -# include -#endif + +#include /* only needed to get through xscreensaver.h */ + +#include "remote.h" +#include "version.h" #ifdef _VROOT_H_ ERROR! you must not include vroot.h in this file #endif +char *progname; + +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_RESTART, XA_PREFS, XA_THROTTLE, XA_UNTHROTTLE; + static char *screensaver_version; -static char *usage = "usage: %s -\n\ +static char *usage = "\n\ +usage: %s -