X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FscreenhackI.h;h=3494684e4129b668f4ae8485e0f9e46b8ab46a8d;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hp=5cb59c0ae66b86fe78b87ed8d8948aa0e71fd868;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/screenhackI.h b/hacks/screenhackI.h
index 5cb59c0a..3494684e 100644
--- a/hacks/screenhackI.h
+++ b/hacks/screenhackI.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2016 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
@@ -60,6 +60,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <time.h>
 
 #ifdef __hpux
  /* Which of the ten billion standards does values.h belong to?
@@ -67,14 +68,23 @@
 # include <values.h>
 #endif
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # include "jwxyz.h"
-#else  /* !HAVE_COCOA -- real X11 */
+#else  /* real X11 */
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
 # include <X11/Xresource.h>
 # include <X11/Xos.h>
-#endif /* !HAVE_COCOA */
+#endif /* !HAVE_JWXYZ */
+
+#if defined(USE_IPHONE) || defined(HAVE_ANDROID)
+# define HAVE_MOBILE
+#endif
+
+#ifdef HAVE_ANDROID
+ /* So that hacks' debug output shows up in logcat... */
+# define fprintf(S, ...) Log(__VA_ARGS__)
+#endif
 
 /* M_PI ought to have been defined in math.h, but... */
 #ifndef M_PI
@@ -85,6 +95,11 @@
 # define M_PI_2 1.5707963267
 #endif
 
+#ifndef Button6
+# define Button6 6
+# define Button7 7
+#endif
+
 #include "yarandom.h"
 #include "usleep.h"
 #include "resources.h"
@@ -92,6 +107,7 @@
 #include "colors.h"
 #include "grabscreen.h"
 #include "visual.h"
+#include "fps.h"
 
 /* Be Posixly correct */
 #undef  bzero
@@ -120,6 +136,7 @@ struct xscreensaver_function_table {
                                 unsigned int w, unsigned int h);
   Bool           (*event_cb)   (Display *, Window, void *, XEvent *);
   void           (*free_cb)    (Display *, Window, void *);
+  void           (*fps_cb)     (Display *, Window, fps_state *, void *);
 
   Visual *       (*pick_visual_hook) (Screen *);
   Bool           (*validate_visual_hook) (Screen *, const char *, Visual *);