X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=0e0b2060b7080fff329ed633ddc82a5bf3b516b6;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hp=cd797d47593ae07d3f2b57a4c9e309da5bf12c88;hpb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;p=xscreensaver diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h index cd797d47..0e0b2060 100644 --- a/driver/xscreensaver.h +++ b/driver/xscreensaver.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1993-1998 Jamie Zawinski +/* xscreensaver, Copyright (c) 1993-2003 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; @@ -84,6 +88,8 @@ 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. */ @@ -182,6 +188,7 @@ struct saver_info { struct saver_screen_info { saver_info *global; + int number; Screen *screen; Widget toplevel_shell; @@ -201,9 +208,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. */ @@ -265,7 +274,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 *); @@ -301,6 +310,7 @@ extern void unblank_screen (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); @@ -316,7 +326,9 @@ extern Bool passwd_valid_p (const char *typed_passwd, Bool verbose_p); #endif /* NO_LOCKING */ extern void set_locked_p (saver_info *si, Bool locked_p); -extern int move_mouse_grab (saver_info *si, Window to, Cursor cursor); +extern int move_mouse_grab (saver_info *si, Window to, Cursor cursor, + int to_screen_no); +extern int mouse_screen (saver_info *si); /* ======================================================================= @@ -340,7 +352,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); /* ======================================================================= @@ -353,6 +364,7 @@ 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 sleep_until_idle (saver_info *si, Bool until_idle_p); +extern void reset_timers (saver_info *si); /* ======================================================================= remote control @@ -365,6 +377,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); @@ -376,6 +395,8 @@ 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 @@ -386,6 +407,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); /* ======================================================================= @@ -402,8 +424,10 @@ 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_STATUS, XA_LOCK, XA_BLANK; extern Atom XA_DEMO, XA_PREFS;