X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=347963a8cd211a07a1274c0616f4d904a01d7677;hb=c6b273ef7292ba10943694df1656b05203d7b62f;hp=2650215cb6bad4d29d4365d5ecb5fd2b284d8d9f;hpb=5b7bc6e70fb439cf4c4bf771ae9f94077fe4fe08;p=xscreensaver

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 2650215c..347963a8 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1993-1997 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1993-1998 Jamie Zawinski <jwz@netscape.com>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -112,6 +112,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 */
 
 
   /* =======================================================================
@@ -124,7 +126,6 @@ struct saver_info {
   Bool dbox_up_p;		/* Whether the demo-mode or passwd dialogs
 				   are currently visible */
 
-
   /* =======================================================================
      demoing
      ======================================================================= */
@@ -134,6 +135,15 @@ struct saver_info {
 				   dialog box, which should be run next. */
 
 
+  /* =======================================================================
+     asking questions
+     ======================================================================= */
+
+  Bool question_up_p;		/* Whether the question dialog is currently
+				   visible. */
+  Widget question_dialog;	/* The question dialog, if any. */
+
+
   /* =======================================================================
      timers
      ======================================================================= */
@@ -248,7 +258,7 @@ struct saver_screen_info {
 
 extern void restore_real_vroot (saver_info *si);
 extern void disable_builtin_screensaver (saver_info *si, Bool turn_off_p);
-extern void ensure_no_screensaver_running (Display *, Screen *);
+extern Bool ensure_no_screensaver_running (Display *, Screen *);
 
 #ifdef HAVE_MIT_SAVER_EXTENSION
 extern Bool query_mit_saver_extension (saver_info *);
@@ -268,8 +278,8 @@ extern void raise_window (saver_info *si,
 			    Bool dont_clear);
 extern void blank_screen (saver_info *si);
 extern void unblank_screen (saver_info *si);
-extern void grab_keyboard_and_mouse (Display *, Window, Cursor);
-extern void ungrab_keyboard_and_mouse (Display *dpy);
+extern void grab_keyboard_and_mouse (saver_info *si, Window, Cursor);
+extern void ungrab_keyboard_and_mouse (saver_info *si);
 
 /* =======================================================================
    locking
@@ -370,7 +380,7 @@ extern Bool window_exists_p (Display *dpy, Window window);
 extern char *timestring (void);
 
 extern Atom XA_VROOT, XA_XSETROOT_ID;
-extern Atom XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID;
+extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID;
 extern Atom XA_SCREENSAVER_TIME;
 
 #endif /* __XSCREENSAVER_H__ */