X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-command.c;h=9b86557b85f4ca541910d14e7001f37591380e26;hb=de041722414a2e31c1c04caa10aaec9d6952e9b4;hp=2a33799c63d88213b0af65ce70701534fb429bd0;hpb=88134d551a9911995c013c5ed06a32c2b1044b85;p=xscreensaver diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c index 2a33799c..9b86557b 100644 --- a/driver/xscreensaver-command.c +++ b/driver/xscreensaver-command.c @@ -1,4 +1,5 @@ -/* xscreensaver-command, Copyright (c) 1991-1994 Jamie Zawinski +/* xscreensaver-command, Copyright (c) 1991-2001 + * 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 @@ -9,142 +10,417 @@ * 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 -