X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=646a5179c5afa570161a6f20661f21c235933b7e;hp=7860dfe4f41f8f15484d28e4901ebfc3ce20e352;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7 diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h index 7860dfe4..646a5179 100644 --- a/driver/xscreensaver.h +++ b/driver/xscreensaver.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1993-1998 Jamie Zawinski +/* xscreensaver, Copyright (c) 1993-2004 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -20,6 +20,10 @@ #include #include +#ifdef HAVE_SIGACTION +# include /* for sigset_t */ +#endif + #include "prefs.h" extern char *progname; @@ -62,6 +66,7 @@ struct saver_info { server extension info ======================================================================= */ + Bool xinerama_p; /* Whether Xinerama is in use. */ Bool using_xidle_extension; /* which extension is being used. */ Bool using_mit_saver_extension; /* Note that `p->use_*' is the *request*, */ Bool using_sgi_saver_extension; /* and `si->using_*' is the *reality*. */ @@ -75,6 +80,10 @@ struct saver_info { int sgi_saver_ext_event_number; int sgi_saver_ext_error_number; # endif +# ifdef HAVE_RANDR + int randr_event_number; + int randr_error_number; +# endif /* ======================================================================= @@ -84,6 +93,14 @@ struct saver_info { Bool screen_blanked_p; /* Whether the saver is currently active. */ Window mouse_grab_window; /* Window holding our mouse grab */ Window keyboard_grab_window; /* Window holding our keyboard grab */ + int mouse_grab_screen; /* The screen number the mouse grab is on */ + int keyboard_grab_screen; /* The screen number the keyboard grab is on */ + Bool fading_possible_p; /* Whether fading to/from black is possible. */ + Bool throttled_p; /* Whether we should temporarily just blank + the screen, not run hacks. */ + time_t blank_time; /* The time at which the screen was blanked + (if currently blanked) or unblanked (if + not blanked.) */ /* ======================================================================= @@ -112,6 +129,12 @@ struct saver_info { int unlock_failures; /* Counts failed login attempts while the screen is locked. */ + char *unlock_typeahead; /* If the screen is locked, and the user types + a character, we assume that it is the first + character of the password. It's stored here + for the password dialog to use to populate + itself. */ + /* ======================================================================= demoing @@ -134,9 +157,18 @@ struct saver_info { XtIntervalId watchdog_id; /* Timer to implement `prefs.watchdog */ XtIntervalId check_pointer_timer_id; /* `prefs.pointer_timeout' */ + XtIntervalId de_race_id; /* Timer to make sure screen un-blanks */ + int de_race_ticks; + time_t last_activity_time; /* Used only when no server exts. */ + time_t last_wall_clock_time; /* Used to detect laptop suspend. */ saver_screen_info *last_activity_screen; + Bool emergency_lock_p; /* Set when the wall clock has jumped + (presumably due to laptop suspend) and we + need to lock down right away instead of + waiting for the lock timer to go off. */ + /* ======================================================================= remote control @@ -164,7 +196,19 @@ struct saver_info { struct saver_screen_info { saver_info *global; - Screen *screen; + int number; /* The internal ordinal of this screen, + counting Xinerama rectangles as separate + screens. */ + int real_screen_number; /* The number of the underlying X screen on + which this rectangle lies. */ + Screen *screen; /* The X screen in question. */ + + int x, y, width, height; /* The size and position of this rectangle + on its underlying X screen. */ + + Bool real_screen_p; /* This will be true of exactly one ssi per + X screen. */ + Widget toplevel_shell; /* ======================================================================= @@ -183,9 +227,11 @@ struct saver_screen_info { value here overrides prefs->install_cmap_p.) */ Visual *current_visual; /* The visual of the window. */ - Visual *default_visual; /* visual to use when none other specified */ int current_depth; /* How deep the visual (and the window) are. */ + Visual *default_visual; /* visual to use when none other specified */ + Visual *best_gl_visual; /* visual to use for GL hacks */ + Window real_vroot; /* The original virtual-root window. */ Window real_vroot_value; /* What was in the __SWM_VROOT property. */ @@ -193,6 +239,13 @@ struct saver_screen_info { real root window. */ unsigned long black_pixel; /* Black, allocated from `cmap'. */ + int blank_vp_x, blank_vp_y; /* Where the virtual-scrolling viewport was + when the screen went blank. We need to + prevent the X server from letting the mouse + bump the edges to scroll while the screen + is locked, so we reset to this when it has + moved, and the lock dialog is up... */ + # ifdef HAVE_MIT_SAVER_EXTENSION Window server_mit_saver_window; # endif @@ -240,7 +293,7 @@ struct saver_screen_info { server extensions and virtual roots ======================================================================= */ -extern void restore_real_vroot (saver_info *si); +extern Bool restore_real_vroot (saver_info *si); extern void disable_builtin_screensaver (saver_info *, Bool unblank_screen_p); extern Bool ensure_no_screensaver_running (Display *, Screen *); @@ -253,6 +306,9 @@ extern Bool query_sgi_saver_extension (saver_info *); #ifdef HAVE_XIDLE_EXTENSION extern Bool query_xidle_extension (saver_info *); #endif +#ifdef HAVE_RANDR +extern Bool query_randr_extension (saver_info *); +#endif #ifdef HAVE_PROC_INTERRUPTS extern Bool query_proc_interrupts_available (saver_info *, const char **why); #endif @@ -272,6 +328,14 @@ extern void raise_window (saver_info *si, Bool dont_clear); extern Bool blank_screen (saver_info *si); extern void unblank_screen (saver_info *si); +extern void resize_screensaver_window (saver_info *si); + +extern void get_screen_viewport (saver_screen_info *ssi, + int *x_ret, int *y_ret, + int *w_ret, int *h_ret, + int target_x, int target_y, + Bool verbose_p); + /* ======================================================================= locking @@ -279,16 +343,16 @@ extern void unblank_screen (saver_info *si); #ifndef NO_LOCKING extern Bool unlock_p (saver_info *si); +extern Bool lock_priv_init (int argc, char **argv, Bool verbose_p); extern Bool lock_init (int argc, char **argv, Bool verbose_p); extern Bool passwd_valid_p (const char *typed_passwd, Bool verbose_p); +#endif /* NO_LOCKING */ -extern void make_passwd_window (saver_info *si); -extern void draw_passwd_window (saver_info *si); -extern void update_passwd_window (saver_info *si, const char *printed_passwd, - float ratio); -extern void destroy_passwd_window (saver_info *si); +extern void set_locked_p (saver_info *si, Bool locked_p); +extern int move_mouse_grab (saver_info *si, Window to, Cursor cursor, + int to_screen_no); +extern int mouse_screen (saver_info *si); -#endif /* NO_LOCKING */ /* ======================================================================= runtime privileges @@ -311,7 +375,6 @@ extern int string_width (XFontStruct *font, char *s); extern void make_splash_dialog (saver_info *si); extern void handle_splash_event (saver_info *si, XEvent *e); -extern void skull (Display *, Window, GC, GC, int, int, int, int); /* ======================================================================= @@ -323,7 +386,11 @@ extern void cycle_timer (XtPointer si, XtIntervalId *id); extern void activate_lock_timer (XtPointer si, XtIntervalId *id); extern void reset_watchdog_timer (saver_info *si, Bool on_p); extern void idle_timer (XtPointer si, XtIntervalId *id); +extern void de_race_timer (XtPointer si, XtIntervalId *id); extern void sleep_until_idle (saver_info *si, Bool until_idle_p); +extern void reset_timers (saver_info *si); +extern void schedule_wakeup_event (saver_info *si, Time when, Bool verbose_p); + /* ======================================================================= remote control @@ -336,6 +403,13 @@ extern void maybe_reload_init_file (saver_info *); subprocs ======================================================================= */ +extern void handle_signals (saver_info *si); +#ifdef HAVE_SIGACTION + extern sigset_t block_sigchld (void); +#else /* !HAVE_SIGACTION */ + extern int block_sigchld (void); +#endif /* !HAVE_SIGACTION */ +extern void unblock_sigchld (void); extern void hack_environment (saver_info *si); extern void hack_subproc_environment (saver_screen_info *ssi); extern void init_sigchld (void); @@ -345,7 +419,10 @@ extern void suspend_screenhack (saver_info *si, Bool suspend_p); extern Bool screenhack_running_p (saver_info *si); extern void emergency_kill_subproc (saver_info *si); extern Bool select_visual (saver_screen_info *ssi, const char *visual_name); +extern void store_saver_status (saver_info *si); extern const char *signal_name (int signal); +extern void exec_command (const char *shell, const char *command, + int nice_level); /* ======================================================================= subprocs diagnostics @@ -356,6 +433,7 @@ extern FILE *real_stdout; extern void initialize_stderr (saver_info *si); extern void reset_stderr (saver_screen_info *ssi); extern void clear_stderr (saver_screen_info *ssi); +extern void shutdown_stderr (saver_info *si); /* ======================================================================= @@ -372,10 +450,12 @@ extern int BadWindow_ehandler (Display *dpy, XErrorEvent *error); extern Bool window_exists_p (Display *dpy, Window window); extern char *timestring (void); extern Bool display_is_on_console_p (saver_info *si); +extern Visual *get_best_gl_visual (saver_screen_info *ssi); +extern void check_for_leaks (const char *where); -extern Atom XA_VROOT, XA_XSETROOT_ID; +extern Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID; extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID; -extern Atom XA_SCREENSAVER_TIME; +extern Atom XA_SCREENSAVER_STATUS, XA_LOCK, XA_BLANK; extern Atom XA_DEMO, XA_PREFS; #endif /* __XSCREENSAVER_H__ */