X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fprefs.h;h=eeb272ef1dc0a443773461791ee206ff16dba6cf;hp=c0c047babbf062851419d37b869b1df1da16f82d;hb=c494fd2e6b3b25582375d62e40f4f5cc984ca424;hpb=07faf451b99879183ed7e909e43a0e065be1ee7f

diff --git a/driver/prefs.h b/driver/prefs.h
index c0c047ba..eeb272ef 100644
--- a/driver/prefs.h
+++ b/driver/prefs.h
@@ -12,113 +12,7 @@
 #ifndef __XSCREENSAVER_PREFS_H__
 #define __XSCREENSAVER_PREFS_H__
 
-typedef struct screenhack screenhack;
-struct screenhack {
-  Bool enabled_p;
-  char *visual;
-  char *name;
-  char *command;
-};
-
-typedef enum {
-  RANDOM_HACKS, ONE_HACK, BLANK_ONLY, DONT_BLANK, RANDOM_HACKS_SAME
-} saver_mode;
-
-typedef enum {
-  TEXT_DATE, TEXT_LITERAL, TEXT_FILE, TEXT_PROGRAM, TEXT_URL
-} text_mode;
-
-typedef struct saver_preferences saver_preferences;
-
-
-/* This structure holds all the user-specified parameters, read from the
-   command line, the resource database, or entered through a dialog box.
- */
-struct saver_preferences {
-
-  XrmDatabase db;		/* The resource database into which the
-				   init file is merged, and out of which the
-				   preferences are parsed. */
-
-  time_t init_file_date;	/* The date (from stat()) of the .xscreensaver
-				   file the last time this process read or
-				   wrote it. */
-
-  Bool verbose_p;		/* whether to print out lots of status info */
-  Bool timestamp_p;		/* whether to mark messages with a timestamp */
-  Bool capture_stderr_p;	/* whether to redirect stdout/stderr  */
-  Bool ignore_uninstalled_p;	/* whether to avoid displaying or complaining
-                                   about hacks that are not on $PATH */
-  Bool debug_p;			/* pay no mind to the man behind the curtain */
-  Bool xsync_p;			/* whether XSynchronize has been called */
-
-  Bool lock_p;			/* whether to lock as well as save */
-
-  Bool fade_p;			/* whether to fade to black, if possible */
-  Bool unfade_p;		/* whether to fade from black, if possible */
-  Time fade_seconds;		/* how long that should take */
-  int fade_ticks;		/* how many ticks should be used */
-  Bool splash_p;		/* whether to do a splash screen at startup */
-
-  Bool install_cmap_p;		/* whether we should use our own colormap
-				   when using the screen's default visual. */
-
-# ifdef QUAD_MODE
-  Bool quad_p;			/* whether to run four savers per monitor */
-# endif /* QUAD_MODE */
-
-  screenhack **screenhacks;	/* the programs to run */
-  int screenhacks_count;
-
-  saver_mode mode;		/* hack-selection mode */
-  int selected_hack;		/* in one_hack mode, this is the one */
-
-  int nice_inferior;		/* nice value for subprocs */
-  int inferior_memory_limit;	/* setrlimit(LIMIT_AS) value for subprocs */
-
-  Time initial_delay;		/* how long to sleep after launch */
-  Time splash_duration;		/* how long the splash screen stays up */
-  Time timeout;			/* how much idle time before activation */
-  Time lock_timeout;		/* how long after activation locking starts */
-  Time cycle;			/* how long each hack should run */
-  Time passwd_timeout;		/* how much time before pw dialog goes down */
-  Time pointer_timeout;		/* how often to check mouse position */
-  Time notice_events_timeout;	/* how long after window creation to select */
-  Time watchdog_timeout;	/* how often to re-raise and re-blank screen */
-  int pointer_hysteresis;	/* mouse motions less than N/sec are ignored */
-
-  Bool dpms_enabled_p;		/* Whether to power down the monitor */
-  Time dpms_standby;		/* how long until monitor goes black */
-  Time dpms_suspend;		/* how long until monitor power-saves */
-  Time dpms_off;		/* how long until monitor powers down */
-
-  Bool grab_desktop_p;		/* These are not used by "xscreensaver" */
-  Bool grab_video_p;		/*  itself: they are used by the external */
-  Bool random_image_p;		/*  "xscreensaver-getimage" program, and set */
-  char *image_directory;	/*  by the "xscreensaver-demo" configurator. */
-
-  text_mode tmode;		/* How we generate text to display. */
-  char *text_literal;		/* used when tmode is TEXT_LITERAL. */
-  char *text_file;		/* used when tmode is TEXT_FILE.    */
-  char *text_program;		/* used when tmode is TEXT_PROGRAM. */
-  char *text_url;		/* used when tmode is TEXT_URL.     */
-
-  Bool use_xidle_extension;	/* which extension to use, if possible */
-  Bool use_mit_saver_extension;
-  Bool use_sgi_saver_extension;
-  Bool use_proc_interrupts;
-
-  Bool getviewport_full_of_lies_p; /* XFree86 bug #421 */
-
-  char *shell;			/* where to find /bin/sh */
-
-  char *demo_command;		/* How to enter demo mode. */
-  char *prefs_command;		/* How to edit preferences. */
-  char *help_url;		/* Where the help document resides. */
-  char *load_url_command;	/* How one loads URLs. */
-  char *new_login_command;	/* Command for the "New Login" button. */
-};
-
+#include "types.h"
 
 extern void load_init_file (Display *, saver_preferences *);
 extern Bool init_file_changed_p (saver_preferences *);