X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=3ab14eaaab69e29863c5448c78cd6ed18e1f47cf;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=0c190f55d52de255c46630b84b2cb488b7abd7e6;hpb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;p=xscreensaver

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 0c190f55..3ab14eaa 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -84,6 +84,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 +184,7 @@ struct saver_info {
 struct saver_screen_info {
   saver_info *global;
 
+  int number;
   Screen *screen;
   Widget toplevel_shell;
 
@@ -303,6 +306,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);
 
 
@@ -318,7 +322,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);
 
 
 /* =======================================================================
@@ -342,9 +348,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 xscreensaver_logo (Display *,Drawable,Colormap, Bool next_frame_p);
-extern void draw_logo (saver_info *si, Window, int x, int y, int w, int h,
-                       Bool first_time_p);
 
 
 /* =======================================================================
@@ -357,6 +360,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
@@ -369,6 +373,8 @@ extern void maybe_reload_init_file (saver_info *);
    subprocs
    ======================================================================= */
 
+extern void block_sigchld (void);
+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);