X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=be09025f7da5f3da5d648fe7902da7db7df89d74;hb=f65151994eba80ecabcdac6eef6fa0dde7e2d45b;hp=467932f6aa4550ff66bce40fcbb3cfe2c6af3afe;hpb=c31d10b6605cd8dc1a7b61fef4256f06198767e5;p=xscreensaver

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 467932f6..be09025f 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -62,6 +62,10 @@ struct saver_info {
      server extension info
      ======================================================================= */
 
+  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*.    */
+
 # ifdef HAVE_MIT_SAVER_EXTENSION
   int mit_saver_ext_event_number;
   int mit_saver_ext_error_number;
@@ -172,9 +176,11 @@ struct saver_screen_info {
 				   destroy and recreate it on different
 				   visuals. */
   Colormap cmap;		/* The colormap that goes with the window. */
-  Bool install_cmap_p;		/* whether we should use our own colormap.
-				   This can be overridden on a per-hack basis.
-				 */
+  Bool install_cmap_p;		/* Whether this screen should have its own
+                                   colormap installed, for whichever of several
+                                   reasons.  This is definitive (even a false
+                                   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. */
@@ -271,8 +277,8 @@ extern void ungrab_keyboard_and_mouse (saver_info *si);
 
 #ifndef NO_LOCKING
 extern Bool unlock_p (saver_info *si);
-extern Bool lock_init (int argc, char **argv);
-extern Bool passwd_valid_p (const char *typed_passwd);
+extern Bool lock_init (int argc, char **argv, Bool verbose_p);
+extern Bool passwd_valid_p (const char *typed_passwd, Bool verbose_p);
 
 extern void make_passwd_window (saver_info *si);
 extern void draw_passwd_window (saver_info *si);