X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.c;h=08838dfa90d2b3c7b97677d1da02945635c3d413;hb=585e1a6717d1dd9b90fbb53acaaae82106354d33;hp=a799ab3ad585f93c0e260a9780246703b8aa9973;hpb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;p=xscreensaver diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c index a799ab3a..08838dfa 100644 --- a/driver/xscreensaver.c +++ b/driver/xscreensaver.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1991-1999 Jamie Zawinski +/* xscreensaver, Copyright (c) 1991-2001 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 @@ -219,7 +219,7 @@ do_help (saver_info *si) fflush (stdout); fflush (stderr); fprintf (stdout, "\ -xscreensaver %s, copyright (c) 1991-1999 by Jamie Zawinski \n\ +xscreensaver %s, copyright (c) 1991-2001 by Jamie Zawinski \n\ The standard Xt command-line options are accepted; other options include:\n\ \n\ -timeout When the screensaver should activate.\n\ @@ -315,7 +315,7 @@ saver_ehandler (Display *dpy, XErrorEvent *error) "#######################################" "#######################################\n\n"); fprintf (real_stderr, - " If at all possible, please re-run xscreensaver with the command\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" @@ -370,15 +370,32 @@ startup_ehandler (String name, String type, String class, fprintf (stderr, "\n"); describe_uids (si, stderr); - fprintf (stderr, "\n" + + if (si->orig_uid && !strncmp (si->orig_uid, "root/", 5)) + { + fprintf (stderr, "\n" + "%s: This is probably because you're logging in as root. You\n" +" shouldn't log in as root: you should log in as a normal user,\n" +" and then `su' as needed. If you insist on logging in as\n" +" root, you will have to turn off X's security features before\n" +" xscreensaver will work.\n" + "\n" +" Please read the manual and FAQ for more information:\n", + blurb()); + } + else + { + fprintf (stderr, "\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", +" But you're not logging in as root (good!) so something\n" +" else must be wrong. Did you read the manual and the FAQ?\n", blurb()); + } + + fprintf (stderr, "\n" + " http://www.jwz.org/xscreensaver/faq.html\n" + " http://www.jwz.org/xscreensaver/man.html\n" + "\n"); fflush (stderr); fflush (stdout); @@ -462,6 +479,20 @@ connect_to_server (saver_info *si, int *argc, char **argv) { Widget toplevel_shell; +#ifdef HAVE_PUTENV + char *d = getenv ("DISPLAY"); + if (!d || !*d) + { + char ndpy[] = "DISPLAY=:0.0"; + /* if (si->prefs.verbose_p) */ /* sigh, too early to test this... */ + fprintf (stderr, + "%s: warning: $DISPLAY is not set: defaulting to \"%s\".\n", + blurb(), ndpy+8); + if (putenv (ndpy)) + abort (); + } +#endif /* HAVE_PUTENV */ + XSetErrorHandler (saver_ehandler); XtAppSetErrorMsgHandler (si->app, startup_ehandler); @@ -593,7 +624,7 @@ print_banner (saver_info *si) if (p->verbose_p) fprintf (stderr, - "%s %s, copyright (c) 1991-1999 " + "%s %s, copyright (c) 1991-2001 " "by Jamie Zawinski .\n", progname, si->version); @@ -649,7 +680,7 @@ print_banner (saver_info *si) /* Examine all of the display's screens, and populate the `saver_screen_info' - structures. + structures. Make sure this is called after hack_environment() sets $PATH. */ static void initialize_per_screen_info (saver_info *si, Widget toplevel_shell) @@ -676,6 +707,9 @@ initialize_per_screen_info (saver_info *si, Widget toplevel_shell) ssi->current_visual = ssi->default_visual; ssi->current_depth = visual_depth (ssi->screen, ssi->current_visual); + /* Execute a subprocess to find the GL visual. */ + ssi->best_gl_visual = get_best_gl_visual (ssi); + if (ssi == si->default_screen) /* Since this is the default screen, use the one already created. */ ssi->toplevel_shell = toplevel_shell; @@ -706,6 +740,10 @@ initialize_per_screen_info (saver_info *si, Widget toplevel_shell) } si->fading_possible_p = found_any_writable_cells; + +#ifdef HAVE_XF86VMODE_GAMMA + si->fading_possible_p = True; /* if we can gamma fade, go for it */ +#endif } @@ -863,6 +901,14 @@ maybe_reload_init_file (saver_info *si) /* If a server extension is in use, and p->timeout has changed, we need to inform the server of the new timeout. */ disable_builtin_screensaver (si, False); + + /* If the DPMS settings in the init file have changed, + change the settings on the server to match. */ + sync_server_dpms_settings (si->dpy, p->dpms_enabled_p, + p->dpms_standby / 1000, + p->dpms_suspend / 1000, + p->dpms_off / 1000, + False); } } @@ -996,6 +1042,20 @@ main_loop (saver_info *si) si->dbox_up_p = False; XDefineCursor (si->dpy, ssi->screensaver_window, ssi->cursor); suspend_screenhack (si, False); /* resume */ + + if (!ok_to_unblank && + !screenhack_running_p (si)) + { + /* If the lock dialog has been dismissed and we're not about to + unlock the screen, and there is currently no hack running, + then launch one. (There might be no hack running if DPMS + had kicked in. But DPMS is off now, so bring back the hack) + */ + if (si->cycle_id) + XtRemoveTimeOut (si->cycle_id); + si->cycle_id = 0; + cycle_timer ((XtPointer) si, 0); + } } #endif /* !NO_LOCKING */ @@ -1057,7 +1117,7 @@ main (int argc, char **argv) global_si_kludge = si; /* I hate C so much... */ # undef ya_rand_init - ya_rand_init ((int) time ((time_t *) 0)); + ya_rand_init (0); save_argv (argc, argv); set_version_string (si, &argc, argv); @@ -1095,7 +1155,14 @@ main (int argc, char **argv) select_events (si); init_sigchld (); + disable_builtin_screensaver (si, True); + sync_server_dpms_settings (si->dpy, p->dpms_enabled_p, + p->dpms_standby / 1000, + p->dpms_suspend / 1000, + p->dpms_off / 1000, + False); + initialize_stderr (si); make_splash_dialog (si); @@ -1108,6 +1175,42 @@ main (int argc, char **argv) /* Processing ClientMessage events. */ + +static int +ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error) +{ + return 0; +} + +/* Sometimes some systems send us ClientMessage events with bogus atoms in + them. We only look up the atom names for printing warning messages, + so don't bomb out when it happens... + */ +static char * +XGetAtomName_safe (Display *dpy, Atom atom) +{ + char *result; + XErrorHandler old_handler; + if (!atom) return 0; + + XSync (dpy, False); + old_handler = XSetErrorHandler (ignore_all_errors_ehandler); + result = XGetAtomName (dpy, atom); + XSync (dpy, False); + XSetErrorHandler (old_handler); + XSync (dpy, False); + + if (result) + return result; + else + { + char buf[100]; + sprintf (buf, "<>", (unsigned long) atom); + return strdup (buf); + } +} + + static void clientmessage_response (saver_info *si, Window w, Bool error, const char *stderr_msg, @@ -1144,7 +1247,7 @@ handle_clientmessage (saver_info *si, XEvent *event, Bool until_idle_p) if (event->xclient.message_type != XA_SCREENSAVER) { char *str; - str = XGetAtomName (si->dpy, event->xclient.message_type); + str = XGetAtomName_safe (si->dpy, event->xclient.message_type); fprintf (stderr, "%s: unrecognised ClientMessage type %s received\n", blurb(), (str ? str : "(null)")); if (str) XFree (str); @@ -1491,7 +1594,7 @@ handle_clientmessage (saver_info *si, XEvent *event, Bool until_idle_p) { char buf [1024]; char *str; - str = (type ? XGetAtomName(si->dpy, type) : 0); + str = XGetAtomName_safe (si->dpy, type); if (str) { @@ -1521,19 +1624,79 @@ static void analyze_display (saver_info *si) { int i, j; - static const char *exts[][2] = { - { "SCREEN_SAVER", "SGI Screen-Saver" }, - { "SCREEN-SAVER", "SGI Screen-Saver" }, - { "MIT-SCREEN-SAVER", "MIT Screen-Saver" }, - { "XIDLE", "XIdle" }, - { "SGI-VIDEO-CONTROL", "SGI Video-Control" }, - { "READDISPLAY", "SGI Read-Display" }, - { "MIT-SHM", "Shared Memory" }, - { "DOUBLE-BUFFER", "Double-Buffering" }, - { "DPMS", "Power Management" }, - { "GLX", "GLX" }, - { "XFree86-VidModeExtension", "XF86 Video-Mode" }, - { "XINERAMA", "Xinerama" } + static struct { + const char *name; const char *desc; Bool useful_p; + } exts[] = { + + { "SCREEN_SAVER", "SGI Screen-Saver", +# ifdef HAVE_SGI_SAVER_EXTENSION + True +# else + False +# endif + }, { "SCREEN-SAVER", "SGI Screen-Saver", +# ifdef HAVE_SGI_SAVER_EXTENSION + True +# else + False +# endif + }, { "MIT-SCREEN-SAVER", "MIT Screen-Saver", +# ifdef HAVE_MIT_SAVER_EXTENSION + True +# else + False +# endif + }, { "XIDLE", "XIdle", +# ifdef HAVE_XIDLE_EXTENSION + True +# else + False +# endif + }, { "SGI-VIDEO-CONTROL", "SGI Video-Control", +# ifdef HAVE_SGI_VC_EXTENSION + True +# else + False +# endif + }, { "READDISPLAY", "SGI Read-Display", +# ifdef HAVE_READ_DISPLAY_EXTENSION + True +# else + False +# endif + }, { "MIT-SHM", "Shared Memory", +# ifdef HAVE_XSHM_EXTENSION + True +# else + False +# endif + }, { "DOUBLE-BUFFER", "Double-Buffering", +# ifdef HAVE_DOUBLE_BUFFER_EXTENSION + True +# else + False +# endif + }, { "DPMS", "Power Management", +# ifdef HAVE_DPMS_EXTENSION + True +# else + False +# endif + }, { "GLX", "GLX", +# ifdef HAVE_GL + True +# else + False +# endif + }, { "XFree86-VidModeExtension", "XF86 Video-Mode", +# ifdef HAVE_XF86VMODE + True +# else + False +# endif + }, { "XINERAMA", "Xinerama", + True + }, }; fprintf (stderr, "%s: running on display \"%s\"\n", blurb(), @@ -1545,8 +1708,11 @@ analyze_display (saver_info *si) for (i = 0; i < countof(exts); i++) { int op = 0, event = 0, error = 0; - if (XQueryExtension (si->dpy, exts[i][0], &op, &event, &error)) - fprintf (stderr, "%s: %s\n", blurb(), exts[i][1]); + if (XQueryExtension (si->dpy, exts[i].name, &op, &event, &error)) + fprintf (stderr, "%s: %s%s\n", blurb(), + exts[i].desc, + (exts[i].useful_p ? "" : + " \t<== unsupported at compile-time!")); } for (i = 0; i < si->nscreens; i++)