{
saver_info *si = global_si_kludge; /* I hate C so much... */
int i;
+ Bool fatal_p;
if (!real_stderr) real_stderr = stderr;
for (i = 0; i < si->nscreens; i++)
fprintf (real_stderr, "%s: screen %d: 0x%x, 0x%x, 0x%x\n",
blurb(), i,
- RootWindowOfScreen (si->screens[i].screen),
- si->screens[i].real_vroot,
- si->screens[i].screensaver_window);
+ (unsigned int) RootWindowOfScreen (si->screens[i].screen),
+ (unsigned int) si->screens[i].real_vroot,
+ (unsigned int) si->screens[i].screensaver_window);
fprintf (real_stderr, "\n"
"#######################################"
"#######################################\n\n");
- if (XmuPrintDefaultErrorMessage (dpy, error, real_stderr))
+ fatal_p = XmuPrintDefaultErrorMessage (dpy, error, real_stderr);
+
+ fatal_p = True; /* The only time I've ever seen a supposedly nonfatal error,
+ it has been BadImplementation / Xlib sequence lost, which
+ are in truth pretty damned fatal.
+ */
+
+ fprintf (real_stderr, "\n");
+
+ if (! fatal_p)
+ fprintf (real_stderr, "%s: nonfatal error.\n\n", blurb());
+ else
{
- fprintf (real_stderr, "\n");
if (si->prefs.xsync_p)
{
saver_exit (si, -1, "because of synchronous X Error");
saver_exit (si, -1, 0);
}
}
- else
- fprintf (real_stderr, " (nonfatal.)\n");
+
return 0;
}
si->nolock_reason = "running under GDM";
}
#endif /* NO_LOCKING */
-
- hack_uid (si);
}
char *d = getenv ("DISPLAY");
if (!d || !*d)
{
- char ndpy[] = "DISPLAY=:0.0";
+ char *ndpy = strdup("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 ();
+ /* don't free (ndpy) -- some implementations of putenv (BSD 4.4,
+ glibc 2.0) copy the argument, but some (libc4,5, glibc 2.1.2)
+ do not. So we must leak it (and/or the previous setting). Yay.
+ */
}
#endif /* HAVE_PUTENV */
while (1)
{
Bool was_locked = False;
+
+ if (p->verbose_p)
+ fprintf (stderr, "%s: awaiting idleness.\n", blurb());
+
+ check_for_leaks ("unblanked A");
sleep_until_idle (si, True);
+ check_for_leaks ("unblanked B");
if (p->verbose_p)
{
ok_to_unblank = True;
do {
+ check_for_leaks ("blanked A");
sleep_until_idle (si, False); /* until not idle */
+ check_for_leaks ("blanked B");
+
maybe_reload_init_file (si);
#ifndef NO_LOCKING
}
XSync (si->dpy, False);
}
-
- if (p->verbose_p)
- fprintf (stderr, "%s: awaiting idleness.\n", blurb());
}
}
static void analyze_display (saver_info *si);
+static void fix_fds (void);
int
main (int argc, char **argv)
memset(si, 0, sizeof(*si));
global_si_kludge = si; /* I hate C so much... */
+ fix_fds();
+
# undef ya_rand_init
ya_rand_init (0);
return 0;
}
+static void
+fix_fds (void)
+{
+ /* Bad Things Happen if stdin, stdout, and stderr have been closed
+ (as by the `sh incantation "xscreensaver >&- 2>&-"). When you do
+ that, the X connection gets allocated to one of these fds, and
+ then some random library writes to stderr, and random bits get
+ stuffed down the X pipe, causing "Xlib: sequence lost" errors.
+ So, we cause the first three file descriptors to be open to
+ /dev/null if they aren't open to something else already. This
+ must be done before any other files are opened (or the closing
+ of that other file will again free up one of the "magic" first
+ three FDs.)
+
+ We do this by opening /dev/null three times, and then closing
+ those fds, *unless* any of them got allocated as #0, #1, or #2,
+ in which case we leave them open. Gag.
+
+ Really, this crap is technically required of *every* X program,
+ if you want it to be robust in the face of "2>&-".
+ */
+ int fd0 = open ("/dev/null", O_RDWR);
+ int fd1 = open ("/dev/null", O_RDWR);
+ int fd2 = open ("/dev/null", O_RDWR);
+ if (fd0 > 2) close (fd0);
+ if (fd1 > 2) close (fd1);
+ if (fd2 > 2) close (fd2);
+}
+
+
\f
/* Processing ClientMessage events.
*/
else
{
char buf[100];
- sprintf (buf, "<<undefined atom 0x%04X>>", (unsigned long) atom);
+ sprintf (buf, "<<undefined atom 0x%04X>>", (unsigned int) atom);
return strdup (buf);
}
}
}
return !not_on_console;
}
+
+
+/* Do a little bit of heap introspection...
+ */
+void
+check_for_leaks (const char *where)
+{
+#ifdef HAVE_SBRK
+ static unsigned long last_brk = 0;
+ int b = (unsigned long) sbrk(0);
+ if (last_brk && last_brk < b)
+ fprintf (stderr, "%s: %s: brk grew by %luK.\n",
+ blurb(), where,
+ (((b - last_brk) + 1023) / 1024));
+ last_brk = b;
+#endif /* HAVE_SBRK */
+}