X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.h;h=42cf7940b27bd0fda8ae78655a69e8dddafac4e8;hb=39809ded547bdbb08207d3e514950425215b4410;hp=6c7e31749d43516483f9637518874ac465b7abf4;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96;p=xscreensaver

diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index 6c7e3174..42cf7940 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1993-2008 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1993-2017 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
@@ -42,25 +42,18 @@ extern Bool restore_real_vroot (saver_info *si);
 extern void disable_builtin_screensaver (saver_info *, Bool unblank_screen_p);
 extern Bool ensure_no_screensaver_running (Display *, Screen *);
 
-#ifdef HAVE_MIT_SAVER_EXTENSION
-extern Bool query_mit_saver_extension (saver_info *);
-#endif
-#ifdef HAVE_SGI_SAVER_EXTENSION
-extern Bool query_sgi_saver_extension (saver_info *);
-#endif
-#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
 
+#ifdef HAVE_XINPUT
+extern Bool query_xinput_extension (saver_info *);
+extern void init_xinput_extension (saver_info *si);
+#endif
+
 /* Display Power Management System (DPMS) interface. */
 extern Bool monitor_powered_on_p (saver_info *si);
-extern void monitor_power_on (saver_info *si);
+extern void monitor_power_on (saver_info *si, Bool on_p);
 
 
 /* =======================================================================
@@ -123,6 +116,7 @@ extern int string_width (XFontStruct *font, char *s);
 
 extern void make_splash_dialog (saver_info *si);
 extern void handle_splash_event (saver_info *si, XEvent *e);
+extern XFontStruct *splash_load_font (Display *, char *name, char *class);
 
 
 /* =======================================================================
@@ -196,7 +190,8 @@ extern void restart_process (saver_info *si);
 extern int saver_ehandler (Display *dpy, XErrorEvent *error);
 extern int BadWindow_ehandler (Display *dpy, XErrorEvent *error);
 extern Bool window_exists_p (Display *dpy, Window window);
-extern char *timestring (void);
+extern Bool in_signal_handler_p;
+extern char *timestring (time_t);
 extern Bool display_is_on_console_p (saver_info *si);
 extern Visual *get_best_gl_visual (saver_info *si, Screen *screen);
 extern void check_for_leaks (const char *where);
@@ -207,6 +202,7 @@ Bool safe_XF86VidModeGetViewPort (Display *, int, int *, int *);
 #endif /* HAVE_XF86VMODE */
 
 extern Atom XA_VROOT, XA_XSETROOT_ID, XA_ESETROOT_PMAP_ID, XA_XROOTPMAP_ID;
+extern Atom XA_NET_WM_USER_TIME;
 extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_ID;
 extern Atom XA_SCREENSAVER_STATUS, XA_LOCK, XA_BLANK;
 extern Atom XA_DEMO, XA_PREFS;