-/* xscreensaver, Copyright (c) 1991-1993 Jamie Zawinski <jwz@lucid.com>
+/* xscreensaver, Copyright (c) 1991-1994 Jamie Zawinski <jwz@mcom.com>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include "xscreensaver.h"
-#if defined(SVR4) || defined(SYSV)
+#if defined(SVR4) || defined(SYSV) || defined(VMS)
# define srandom(i) srand((unsigned int)(i))
#else
+# ifndef __linux
extern void srandom P((int)); /* srand() is in stdlib.h... */
+# endif
#endif
extern char *get_string_resource P((char *, char *));
extern Time timeout;
extern Time cycle;
+#ifndef NO_LOCKING
extern Time passwd_timeout;
+#endif
extern Time pointer_timeout;
extern Time notice_events_timeout;
extern XtIntervalId lock_id, cycle_id;
#ifdef NO_MOTIF /* kludge */
Bool demo_mode_p = 0;
Bool dbox_up_p = 0;
+#ifndef NO_LOCKING
Time passwd_timeout = 0;
#endif
+#endif
\f
#ifdef NO_DEMO_MODE
{ "-timeout", ".timeout", XrmoptionSepArg, 0 },
{ "-idelay", ".initialDelay",XrmoptionSepArg, 0 },
{ "-cycle", ".cycle", XrmoptionSepArg, 0 },
- { "-visual", ".visual", XrmoptionSepArg, 0 },
+ { "-visual", ".visualID", XrmoptionSepArg, 0 },
{ "-lock-timeout", ".lockTimeout", XrmoptionSepArg, 0 },
{ "-verbose", ".verbose", XrmoptionNoArg, "on" },
{ "-silent", ".verbose", XrmoptionNoArg, "off" },
};
static char *defaults[] = {
+#ifndef VMS
#include "XScreenSaver.ad.h"
+#else
+#include "XScreenSaver_ad.h"
+#endif
0
};
static void
-do_help ()
+do_help P((void))
{
printf ("\
-xscreensaver %s, copyright (c) 1991-1993 by Jamie Zawinski <jwz@lucid.com>.\n\
+xscreensaver %s, copyright (c) 1991-1994 by Jamie Zawinski <jwz@mcom.com>.\n\
The standard Xt command-line options are accepted; other options include:\n\
\n\
-timeout <minutes> when the screensaver should activate\n\
static void
-get_screenhacks ()
+get_screenhacks P((void))
{
char *data[3];
int i, hacks_size = 10;
static void
-get_resources ()
+get_resources P((void))
{
- visual = get_visual_resource (dpy, "visual", "Visual");
+ /* Note: we can't use the resource ".visual" because Xt is SO FUCKED. */
+ visual = get_visual_resource (dpy, "visualID", "VisualID");
timeout = 1000 * get_minutes_resource ("timeout", "Time");
cycle = 1000 * get_minutes_resource ("cycle", "Time");
lock_timeout = 1000 * get_minutes_resource ("lockTimeout", "Time");
fade_ticks = get_integer_resource ("fadeTicks", "Integer");
shell = get_string_resource ("bourneShell", "BourneShell");
initial_delay = get_seconds_resource ("initialDelay", "Time");
- passwd_timeout = 1000 * get_seconds_resource ("passwdTimeout", "Time");
pointer_timeout = 1000 * get_seconds_resource ("pointerPollTime", "Time");
notice_events_timeout = 1000 * get_seconds_resource ("windowCreationTimeout",
"Time");
- if (timeout < 10000) timeout = 10000;
- if (cycle < 2000) cycle = 2000;
+#ifndef NO_LOCKING
+ passwd_timeout = 1000 * get_seconds_resource ("passwdTimeout", "Time");
if (passwd_timeout == 0) passwd_timeout = 30000;
+#endif
+ if (timeout < 10000) timeout = 10000;
+ if (cycle != 0 && cycle < 2000) cycle = 2000;
if (pointer_timeout == 0) pointer_timeout = 5000;
if (notice_events_timeout == 0) notice_events_timeout = 10000;
if (fade_seconds == 0 || fade_ticks == 0) fade_p = False;
}
char *
-timestring ()
+timestring P((void))
{
long now = time ((time_t *) 0);
char *str = (char *) ctime (&now);
extern Bool lock_init P((void));
#endif
-static void initialize ();
-static void main_loop ();
-static void initialize ();
+static void initialize P((int argc, char **argv));
+static void main_loop P((void));
+#ifndef VMS
void
+#else
+int
+#endif
main (argc, argv)
int argc;
char **argv;
static void
+#if __STDC__
+initialize_connection (int argc, char **argv)
+#else
initialize_connection (argc, argv)
int argc;
char **argv;
+#endif
{
toplevel_shell = XtAppInitialize (&app, progclass,
options, XtNumber (options),
}
save_argv (argc, argv);
initialize_connection (argc, argv);
+ ensure_no_screensaver_running ();
+ if (verbose_p)
+ printf ("\
+%s %s, copyright (c) 1991-1994 by Jamie Zawinski <jwz@mcom.com>.\n\
+ pid = %d.\n", progname, screensaver_version, getpid ());
ensure_no_screensaver_running ();
+
demo_mode_p = initial_demo_mode_p;
screensaver_window = 0;
cursor = 0;
cycle_id = 0;
lock_id = 0;
locked_p = False;
+
if (use_xidle)
{
#ifdef HAVE_XIDLE
init_sigchld ();
- if (verbose_p)
- printf ("\
-%s %s, copyright (c) 1991-1993 by Jamie Zawinski <jwz@lucid.com>.\n\
- pid = %d.\n", progname, screensaver_version, getpid ());
-
disable_builtin_screensaver ();
if (initial_demo_mode_p)
blank_screen ();
spawn_screenhack (True);
if (cycle)
- cycle_id = XtAppAddTimeOut (app, cycle, cycle_timer, 0);
+ cycle_id = XtAppAddTimeOut (app, cycle, (XtPointer)cycle_timer, 0);
#ifndef NO_LOCKING
if (lock_p && lock_timeout == 0)
locked_p = True;
if (lock_p && !locked_p)
/* locked_p might be true already because of ClientMessage */
- lock_id = XtAppAddTimeOut (app,lock_timeout,activate_lock_timer,0);
+ lock_id = XtAppAddTimeOut (app,lock_timeout,
+ (XtPointer)activate_lock_timer,0);
#endif
PASSWD_INVALID:
Bool val;
if (locking_disabled_p) abort ();
dbox_up_p = True;
- ungrab_keyboard_and_mouse ();
+
+ /* We used to ungrab the keyboard here, before calling unlock_p()
+ to pop up the dialog box. This left the keyboard ungrabbed
+ for a small window, during an insecure state. Bennett Todd
+ was seeing the bahavior that, when the load was high, he could
+ actually get characters through to a shell under the saver
+ window (he accidentally typed his password there...)
+
+ So the ungrab has been moved down into pop_passwd_dialog()
+ just after the server is grabbed, closing this window
+ entirely.
+ */
+ /* ungrab_keyboard_and_mouse (); */
+
suspend_screenhack (True);
XUndefineCursor (dpy, screensaver_window);
if (verbose_p)
dbox_up_p = False;
XDefineCursor (dpy, screensaver_window, cursor);
suspend_screenhack (False);
+
+ /* I think this grab is now redundant, but it shouldn't hurt. */
grab_keyboard_and_mouse ();
+
if (! val)
goto PASSWD_INVALID;
locked_p = False;
projects / xscreensaver / blobdiff