X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=cd797d47593ae07d3f2b57a4c9e309da5bf12c88;hb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;hp=7860dfe4f41f8f15484d28e4901ebfc3ce20e352;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7;p=xscreensaver

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 7860dfe4..cd797d47 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -84,6 +84,12 @@ 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 */
+  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 +118,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
@@ -135,8 +147,14 @@ struct saver_info {
   XtIntervalId check_pointer_timer_id;	/* `prefs.pointer_timeout' */
 
   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
@@ -193,6 +211,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
@@ -273,22 +298,26 @@ extern void raise_window (saver_info *si,
 extern Bool blank_screen (saver_info *si);
 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,
+                                 Bool verbose_p);
+
+
 /* =======================================================================
    locking
    ======================================================================= */
 
 #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);
 
-#endif /* NO_LOCKING */
 
 /* =======================================================================
    runtime privileges
@@ -345,6 +374,7 @@ 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);
 
 /* =======================================================================
@@ -375,7 +405,7 @@ extern Bool display_is_on_console_p (saver_info *si);
 
 extern Atom XA_VROOT, XA_XSETROOT_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__ */