X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=646a5179c5afa570161a6f20661f21c235933b7e;hp=0e0b2060b7080fff329ed633ddc82a5bf3b516b6;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=6a1da724858673ac40aa13a9612340d8bed8c7b9

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 0e0b2060..646a5179 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1993-2003 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1993-2004 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -66,6 +66,7 @@ struct saver_info {
      server extension info
      ======================================================================= */
 
+  Bool xinerama_p;		   /* Whether Xinerama is in use.            */
   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*.    */
@@ -79,6 +80,10 @@ struct saver_info {
   int sgi_saver_ext_event_number;
   int sgi_saver_ext_error_number;
 # endif
+# ifdef HAVE_RANDR
+  int randr_event_number;
+  int randr_error_number;
+# endif
 
 
   /* =======================================================================
@@ -152,6 +157,9 @@ struct saver_info {
   XtIntervalId watchdog_id;	/* Timer to implement `prefs.watchdog */
   XtIntervalId check_pointer_timer_id;	/* `prefs.pointer_timeout' */
 
+  XtIntervalId de_race_id;	/* Timer to make sure screen un-blanks */
+  int de_race_ticks;
+
   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;
@@ -188,8 +196,19 @@ struct saver_info {
 struct saver_screen_info {
   saver_info *global;
 
-  int number;
-  Screen *screen;
+  int number;			/* The internal ordinal of this screen,
+                                   counting Xinerama rectangles as separate
+                                   screens. */
+  int real_screen_number;	/* The number of the underlying X screen on
+                                   which this rectangle lies. */
+  Screen *screen;		/* The X screen in question. */
+
+  int x, y, width, height;	/* The size and position of this rectangle
+                                   on its underlying X screen. */
+
+  Bool real_screen_p;		/* This will be true of exactly one ssi per
+                                   X screen. */
+
   Widget toplevel_shell;
 
   /* =======================================================================
@@ -287,6 +306,9 @@ extern Bool query_sgi_saver_extension (saver_info *);
 #ifdef HAVE_XIDLE_EXTENSION
 extern Bool query_xidle_extension (saver_info *);
 #endif
+#ifdef HAVE_RANDR
+extern Bool query_randr_extension (saver_info *);
+#endif
 #ifdef HAVE_PROC_INTERRUPTS
 extern Bool query_proc_interrupts_available (saver_info *, const char **why);
 #endif
@@ -306,6 +328,7 @@ extern void raise_window (saver_info *si,
 			    Bool dont_clear);
 extern Bool blank_screen (saver_info *si);
 extern void unblank_screen (saver_info *si);
+extern void resize_screensaver_window (saver_info *si);
 
 extern void get_screen_viewport (saver_screen_info *ssi,
                                  int *x_ret, int *y_ret,
@@ -363,8 +386,11 @@ extern void cycle_timer (XtPointer si, XtIntervalId *id);
 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 de_race_timer (XtPointer si, XtIntervalId *id);
 extern void sleep_until_idle (saver_info *si, Bool until_idle_p);
 extern void reset_timers (saver_info *si);
+extern void schedule_wakeup_event (saver_info *si, Time when, Bool verbose_p);
+
 
 /* =======================================================================
    remote control