X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=driver%2Fxscreensaver.h;h=75b4ab42d9e5c53604ff95416e36e5afebbc250a;hb=278c59e14c53fd412b734e699bd4f314f766f804;hp=7a61d166b2d306bf69e27af82ae6f31ba3f7942d;hpb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9;p=xscreensaver

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 7a61d166..75b4ab42 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -84,6 +84,9 @@ 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. */
 
 
   /* =======================================================================
@@ -135,8 +138,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 +202,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,6 +289,12 @@ 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
    ======================================================================= */
@@ -282,14 +304,10 @@ 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 int move_mouse_grab (saver_info *si, Window to, Cursor cursor);
 
-#endif /* NO_LOCKING */
 
 /* =======================================================================
    runtime privileges