itself.
*/
+#define WHICH 0
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "xscreensaver.h"
#include "resources.h"
#include "version.h"
+#include "visual.h"
char *progname = 0;
char *progclass = 0;
FILE *real_stderr, *real_stdout;
-void reset_stderr(saver_screen_info *ssi) {}
-void clear_stderr(saver_screen_info *ssi) {}
-void reset_watchdog_timer(saver_info *si, Bool on_p) {}
void monitor_power_on (saver_info *si) {}
-void ungrab_keyboard_and_mouse (saver_info *si) {}
-Bool select_visual (saver_screen_info *ssi, const char *v) { return False; }
-void raise_window (saver_info *si, Bool i, Bool b, Bool d) {}
-void restore_real_vroot (saver_info *si) {}
-void saver_exit (saver_info *si, int status, const char *core) { exit(status);}
-const char * signal_name(int signal) { return "???"; }
Bool monitor_powered_on_p (saver_info *si) { return True; }
-void start_notice_events_timer (saver_info *si, Window w) {}
void initialize_screensaver_window (saver_info *si) {}
+void raise_window (saver_info *si, Bool i, Bool b, Bool d) {}
void blank_screen (saver_info *si) {}
void unblank_screen (saver_info *si) {}
+Bool select_visual (saver_screen_info *ssi, const char *v) { return False; }
+Bool window_exists_p (Display *dpy, Window window) {return True;}
+void start_notice_events_timer (saver_info *si, Window w, Bool) {}
Bool handle_clientmessage (saver_info *si, XEvent *e, Bool u) { return False; }
int BadWindow_ehandler (Display *dpy, XErrorEvent *error) { exit(1); }
+const char *signal_name(int signal) { return "???"; }
+void restore_real_vroot (saver_info *si) {}
+void saver_exit (saver_info *si, int status, const char *core) { exit(status);}
const char *blurb(void) { return progname; }
+Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
+
void
idle_timer (XtPointer closure, XtIntervalId *id)
}
-static char *
-reformat_hack(const char *hack)
-{
- int i;
- const char *in = hack;
- int indent = 13;
- char *h2 = (char *) malloc(strlen(in) + indent + 2);
- char *out = h2;
-
- while (isspace(*in)) in++; /* skip whitespace */
- while (*in && !isspace(*in) && *in != ':')
- *out++ = *in++; /* snarf first token */
- while (isspace(*in)) in++; /* skip whitespace */
-
- if (*in == ':')
- *out++ = *in++; /* copy colon */
- else
- {
- in = hack;
- out = h2; /* reset to beginning */
- }
-
- *out = 0;
-
- while (isspace(*in)) in++; /* skip whitespace */
- for (i = strlen(h2); i < indent; i++) /* indent */
- *out++ = ' ';
-
- while (*in) *out++ = *in++; /* copy rest of line */
- *out = 0;
-
- return h2;
-}
-
-
-static void
-get_screenhacks (saver_info *si)
-{
- saver_preferences *p = &si->prefs;
- int i = 0;
- int hacks_size = 60;
- int size;
- char *d;
-
- d = get_string_resource ("monoPrograms", "MonoPrograms");
- if (d && !*d) { free(d); d = 0; }
- if (!d)
- d = get_string_resource ("colorPrograms", "ColorPrograms");
- if (d && !*d) { free(d); d = 0; }
-
- if (d)
- {
- fprintf (stderr,
- "%s: the `monoPrograms' and `colorPrograms' resources are obsolete;\n\
- see the manual for details.\n", blurb());
- free(d);
- }
-
- d = get_string_resource ("programs", "Programs");
-
- size = d ? strlen (d) : 0;
- p->screenhacks = (char **) malloc (sizeof (char *) * hacks_size);
- p->screenhacks_count = 0;
-
- while (i < size)
- {
- int end, start = i;
- if (d[i] == ' ' || d[i] == '\t' || d[i] == '\n' || d[i] == 0)
- {
- i++;
- continue;
- }
- if (hacks_size <= p->screenhacks_count)
- p->screenhacks = (char **) realloc (p->screenhacks,
- (hacks_size = hacks_size * 2) *
- sizeof (char *));
- p->screenhacks [p->screenhacks_count++] = d + i;
- while (d[i] != 0 && d[i] != '\n')
- i++;
- end = i;
- while (i > start && (d[i-1] == ' ' || d[i-1] == '\t'))
- i--;
- d[i] = 0;
- i = end + 1;
- }
-
- /* shrink all whitespace to one space, for the benefit of the "demo"
- mode display. We only do this when we can easily tell that the
- whitespace is not significant (no shell metachars).
- */
- for (i = 0; i < p->screenhacks_count; i++)
- {
- char *s = p->screenhacks [i];
- char *s2;
- int L = strlen (s);
- int j, k;
- for (j = 0; j < L; j++)
- {
- switch (s[j])
- {
- case '\'': case '"': case '`': case '\\':
- goto DONE;
- case '\t':
- s[j] = ' ';
- case ' ':
- k = 0;
- for (s2 = s+j+1; *s2 == ' ' || *s2 == '\t'; s2++)
- k++;
- if (k > 0)
- {
- for (s2 = s+j+1; s2[k]; s2++)
- *s2 = s2[k];
- *s2 = 0;
- }
- break;
- }
- }
- DONE:
- p->screenhacks[i] = reformat_hack(s); /* mallocs */
- }
-
- if (p->screenhacks_count)
- {
- /* Shrink down the screenhacks array to be only as big as it needs to.
- This doesn't really matter at all. */
- p->screenhacks = (char **)
- realloc (p->screenhacks, ((p->screenhacks_count + 1) *
- sizeof(char *)));
- p->screenhacks [p->screenhacks_count] = 0;
- }
- else
- {
- free (p->screenhacks);
- p->screenhacks = 0;
- }
-}
-
+static char *fallback[] = {
+#include "XScreenSaver_ad.h"
+ 0
+};
int
main (int argc, char **argv)
set_auth_parameters(argc, argv);
# endif /* SCO */
- if (! lock_init (argc, argv)) /* before hack_uid() for proper permissions */
+ /* before hack_uid() for proper permissions */
+ if (! lock_init (argc, argv, True))
{
si->locking_disabled_p = True;
si->nolock_reason = "error getting password";
progclass = "XScreenSaver";
toplevel_shell = XtAppInitialize (&si->app, progclass, 0, 0,
- &argc, argv, 0, 0, 0);
+ &argc, argv, fallback,
+ 0, 0);
si->dpy = XtDisplay (toplevel_shell);
- si->db = XtDatabase (si->dpy);
+ p->db = XtDatabase (si->dpy);
si->default_screen->toplevel_shell = toplevel_shell;
si->default_screen->screen = XtScreen(toplevel_shell);
si->default_screen->default_visual =
DefaultVisualOfScreen(si->default_screen->screen);
si->default_screen->screensaver_window =
RootWindowOfScreen(si->default_screen->screen);
+ si->default_screen->current_depth =
+ visual_depth(si->default_screen->screen,
+ si->default_screen->current_visual);
- db = si->db;
+ db = p->db;
XtGetApplicationNameAndClass (si->dpy, &progname, &progclass);
- p->debug_p = True;
- p->verbose_p = True;
- p->lock_p = True;
- p->passwd_timeout = 1000 * get_seconds_resource ("passwdTimeout", "Time");
-
- get_screenhacks(si);
-
- hack_uid_warn (si);
+ load_init_file (&si->prefs);
while (1)
{
-#if 0
+#if WHICH == 0
if (unlock_p (si))
fprintf (stderr, "%s: password correct\n", progname);
else
XSync(si->dpy, False);
sleep (3);
-#else
- si->demo_mode_p = True;
- make_screenhack_dialog (si);
- XtAppMainLoop(si->app);
+#elif WHICH == 1
+ {
+ XEvent event;
+ make_splash_dialog (si);
+ XtAppAddTimeOut (si->app, p->splash_duration + 1000,
+ idle_timer, (XtPointer) si);
+ while (si->splash_dialog)
+ {
+ XtAppNextEvent (si->app, &event);
+ if (event.xany.window == si->splash_dialog)
+ handle_splash_event (si, &event);
+ XtDispatchEvent (&event);
+ }
+ XSync (si->dpy, False);
+ sleep (1);
+ }
#endif
}
}