X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.c;h=fc8b89a47e4cd542f838f0e1636503b19b5abc54;hb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;hp=c88f36cc9fed32fbc009d333a6f6cc7ab2a13d39;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c index c88f36cc..fc8b89a4 100644 --- a/driver/xscreensaver.c +++ b/driver/xscreensaver.c @@ -59,7 +59,7 @@ * This program accepts ClientMessages of type SCREENSAVER; these messages * may contain the atom ACTIVATE or DEACTIVATE, meaning to turn the * screensaver on or off now, regardless of the idleness of the user, - * and a few other things. The included "xscreensaver_command" program + * and a few other things. The included "xscreensaver-command" program * sends these messsages. * * If we don't have the XIdle, MIT-SCREEN-SAVER, or SGI SCREEN_SAVER @@ -70,8 +70,9 @@ * KeyPress on windows which don't select them, because that would * interfere with event propagation. This will break if any program * changes its event mask to contain KeyRelease or PointerMotion more than - * 30 seconds after creating the window, but that's probably pretty rare. - * + * 30 seconds after creating the window, but such programs do not seem to + * occur in nature (I've never seen it happen in all these years.) + * * The reason that we can't select KeyPresses on windows that don't have * them already is that, when dispatching a KeyPress event, X finds the * lowest (leafmost) window in the hierarchy on which *any* client selects @@ -110,13 +111,13 @@ * to keep your emacs window alive even when xscreensaver has grabbed. * - Go read the code related to `debug_p'. * - You probably can't set breakpoints in functions that are called on - * the other side of a call to fork() -- if your clients are dying - * with signal 5, Trace/BPT Trap, you're losing in this way. + * the other side of a call to fork() -- if your subprocesses are + * dying with signal 5, Trace/BPT Trap, you're losing in this way. * - If you aren't using a server extension, don't leave this stopped * under the debugger for very long, or the X input buffer will get * huge because of the keypress events it's selecting for. This can * make your X server wedge with "no more input buffers." - * + * * ======================================================================== */ #ifdef HAVE_CONFIG_H @@ -162,9 +163,9 @@ XrmDatabase db = 0; static Atom XA_SCREENSAVER_RESPONSE; static Atom XA_ACTIVATE, XA_DEACTIVATE, XA_CYCLE, XA_NEXT, XA_PREV; -static Atom XA_EXIT, XA_RESTART, XA_LOCK, XA_SELECT; +static Atom XA_RESTART, XA_SELECT; static Atom XA_THROTTLE, XA_UNTHROTTLE; -Atom XA_DEMO, XA_PREFS; +Atom XA_DEMO, XA_PREFS, XA_EXIT, XA_LOCK, XA_BLANK; static XrmOptionDescRec options [] = { @@ -314,15 +315,17 @@ saver_ehandler (Display *dpy, XErrorEvent *error) "#######################################" "#######################################\n\n"); fprintf (real_stderr, - " If at all possible, please re-run xscreensaver with the command line\n" - " arguments `-sync -verbose', and reproduce this bug. That will cause\n" - " xscreensaver to dump a `core' file to the current directory. Please\n" - " include the stack trace from that core file in your bug report.\n" + " If at all possible, please re-run xscreensaver with the command\n" + " line arguments `-sync -verbose -no-capture', and reproduce this\n" + " bug. That will cause xscreensaver to dump a `core' file to the\n" + " current directory. Please include the stack trace from that core\n" + " file in your bug report. *DO NOT* mail the core file itself!\n" + " That won't work.\n" "\n" - " http://www.jwz.org/xscreensaver/bugs.html explains how to create the\n" - " most useful bug reports, and how to examine core files.\n" + " http://www.jwz.org/xscreensaver/bugs.html explains how to create\n" + " the most useful bug reports, and how to examine core files.\n" "\n" - " The more information you can provide, the better. But please report\n" + " The more information you can provide, the better. But please\n" " report this bug, regardless!\n" "\n"); fprintf (real_stderr, @@ -368,12 +371,13 @@ startup_ehandler (String name, String type, String class, describe_uids (si, stderr); fprintf (stderr, "\n" - "%s: Errors at startup are usually authorization problems.\n" - " Did you read the manual? Specifically, the parts\n" - " that talk about XAUTH, XDM, and root logins?\n" - "\n" - " http://www.jwz.org/xscreensaver/man.html\n" - "\n", + "%s: Errors at startup are usually authorization problems.\n" + " Did you read the manual and the FAQ? Specifically,\n" + " the parts of the manual that talk about XAUTH, XDM,\n" + " and root logins?\n" + "\n" + " http://www.jwz.org/xscreensaver/man.html\n" + "\n", blurb()); fflush (stderr); @@ -479,7 +483,7 @@ connect_to_server (saver_info *si, int *argc, char **argv) XA_SCREENSAVER = XInternAtom (si->dpy, "SCREENSAVER", False); XA_SCREENSAVER_VERSION = XInternAtom (si->dpy, "_SCREENSAVER_VERSION",False); XA_SCREENSAVER_ID = XInternAtom (si->dpy, "_SCREENSAVER_ID", False); - XA_SCREENSAVER_TIME = XInternAtom (si->dpy, "_SCREENSAVER_TIME", False); + XA_SCREENSAVER_STATUS = XInternAtom (si->dpy, "_SCREENSAVER_STATUS", False); XA_SCREENSAVER_RESPONSE = XInternAtom (si->dpy, "_SCREENSAVER_RESPONSE", False); XA_XSETROOT_ID = XInternAtom (si->dpy, "_XSETROOT_ID", False); @@ -494,6 +498,7 @@ connect_to_server (saver_info *si, int *argc, char **argv) XA_DEMO = XInternAtom (si->dpy, "DEMO", False); XA_PREFS = XInternAtom (si->dpy, "PREFS", False); XA_LOCK = XInternAtom (si->dpy, "LOCK", False); + XA_BLANK = XInternAtom (si->dpy, "BLANK", False); XA_THROTTLE = XInternAtom (si->dpy, "THROTTLE", False); XA_UNTHROTTLE = XInternAtom (si->dpy, "UNTHROTTLE", False); @@ -1083,7 +1088,10 @@ main (int argc, char **argv) if (p->verbose_p) analyze_display (si); initialize_server_extensions (si); + + si->blank_time = time ((time_t) 0); /* must be before ..._window */ initialize_screensaver_window (si); + select_events (si); init_sigchld (); disable_builtin_screensaver (si, True); @@ -1523,7 +1531,8 @@ analyze_display (saver_info *si) { "DOUBLE-BUFFER", "Double-Buffering" }, { "DPMS", "Power Management" }, { "GLX", "GLX" }, - { "XFree86-VidModeExtension", "XF86 Video-Mode" } + { "XFree86-VidModeExtension", "XF86 Video-Mode" }, + { "XINERAMA", "Xinerama" } }; fprintf (stderr, "%s: running on display \"%s\"\n", blurb(),