X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FxlockmoreI.h;h=75909784974fefa3e7bdf3cebce4839f4443b651;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=7632a00cc94d81dc90e88aa9e87b9106e5e49f92;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/xlockmoreI.h b/hacks/xlockmoreI.h
index 7632a00c..75909784 100644
--- a/hacks/xlockmoreI.h
+++ b/hacks/xlockmoreI.h
@@ -1,5 +1,5 @@
 /* xlockmore.h --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997-2008 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997-2012 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
@@ -41,13 +41,23 @@ typedef struct ModeInfo ModeInfo;
 # endif /* !HAVE_MESA_GL */
 
 # ifdef HAVE_COCOA
-#  include <OpenGL/gl.h>
+#  ifndef USE_IPHONE
+#   include <OpenGL/gl.h>
+#   include <OpenGL/glu.h>
+#  endif
 # else
 #  include <GL/gl.h>
+#  include <GL/glu.h>
 #  include <GL/glx.h>
 # endif
 
+# ifdef HAVE_JWZGLES
+#  include "jwzgles.h"
+# endif /* HAVE_JWZGLES */
+
+
   extern GLXContext *init_GL (ModeInfo *);
+  extern void xlockmore_reset_gl_state(void);
   extern void clear_gl_error (void);
   extern void check_gl_error (const char *type);
 
@@ -65,6 +75,7 @@ extern void xlockmore_gl_draw_fps (ModeInfo *);
 
 
 extern void xlockmore_setup (struct xscreensaver_function_table *, void *);
+extern void xlockmore_do_fps (Display *, Window, fps_state *, void *);
 
 
 /* Compatibility with the xlockmore RNG API
@@ -108,7 +119,8 @@ struct ModeInfo {
   /* Used only by OpenGL programs, since FPS is tricky there. */
   fps_state *fpst;
   Bool fps_p;
-  unsigned long polygon_count;
+  unsigned long polygon_count;  /* These values are for -fps display only */
+  double recursion_depth;
 
 #ifdef HAVE_XSHM_EXTENSION
   Bool use_shm;
@@ -153,6 +165,8 @@ struct xlockmore_function_table {
   void (*hack_free) (ModeInfo *);
   Bool (*hack_handle_events) (ModeInfo *, XEvent *);
   ModeSpecOpt *opts;
+
+  unsigned screen_count; /* Only used on the OS X and iOS ports. */
 };
 
 #endif /* __XLOCKMORE_INTERNAL_H__ */