-/* xscreensaver, Copyright (c) 1991-2002 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2003 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include <stdio.h>
#include <ctype.h>
#include <X11/Xlib.h>
+
+#include <X11/Xlibint.h>
+
#include <X11/Xatom.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
fflush (stdout);
fflush (stderr);
fprintf (stdout, "\
-xscreensaver %s, copyright (c) 1991-2002 by Jamie Zawinski <jwz@jwz.org>\n\
+xscreensaver %s, copyright (c) 1991-2003 by Jamie Zawinski <jwz@jwz.org>\n\
\n\
All xscreensaver configuration is via the `~/.xscreensaver' file.\n\
Rather than editing that file by hand, just run `xscreensaver-demo':\n\
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"
"#######################################"
si->locking_disabled_p = True;
si->nolock_reason = "running under GDM";
}
+
+ /* If the server is XDarwin (MacOS X) then disable locking.
+ (X grabs only affect X programs, so you can use Command-Tab
+ to bring any other Mac program to the front, e.g., Terminal.)
+ */
+ if (!si->locking_disabled_p)
+ {
+ int op = 0, event = 0, error = 0;
+ Bool macos_p = False;
+
+#ifdef __APPLE__
+ /* Disable locking if *running* on Apple hardware, since we have no
+ reliable way to determine whether the server is running on MacOS.
+ Hopefully __APPLE__ means "MacOS" and not "Linux on Mac hardware"
+ but I'm not really sure about that.
+ */
+ macos_p = True;
+#endif
+
+ if (!macos_p)
+ /* This extension exists on the Apple X11 server, but not
+ on earlier versions of the XDarwin server. */
+ macos_p = XQueryExtension (si->dpy, "Apple-DRI", &op, &event, &error);
+
+ if (macos_p)
+ {
+ si->locking_disabled_p = True;
+ si->nolock_reason = "Cannot lock securely on MacOS X";
+ }
+ }
+
#endif /* NO_LOCKING */
}
if (p->verbose_p)
fprintf (stderr,
- "%s %s, copyright (c) 1991-2002 "
+ "%s %s, copyright (c) 1991-2003 "
"by Jamie Zawinski <jwz@jwz.org>.\n",
progname, si->version);
fprintf (stderr, "%s: in process %lu.\n", blurb(),
(unsigned long) getpid());
}
+}
+
+static void
+print_lock_failure_banner (saver_info *si)
+{
+ saver_preferences *p = &si->prefs;
/* If locking was not able to be initalized for some reason, explain why.
(This has to be done after we've read the lock_p resource.)
*/
- if (p->lock_p && si->locking_disabled_p)
+ if (si->locking_disabled_p)
{
p->lock_p = False;
fprintf (stderr, "%s: locking is disabled (%s).\n", blurb(),
"\t See the manual for details.\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);
exit (1);
lock_initialization (si, &argc, argv);
+ print_lock_failure_banner (si);
if (p->xsync_p) XSynchronize (si->dpy, True);
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);
}
}
# endif
}, { "XINERAMA", "Xinerama",
True
+ }, { "Apple-DRI", "Apple-DRI (XDarwin)",
+ True
},
};
projects / xscreensaver / blobdiff