X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxlockmore.h;h=3b390f039a16783bae5754b60c226538434865f3;hb=13dbc569cdc6e29019722c0ef9b932a925efbcad;hp=d39119abd38e40968a13ed1d85d8ce8161e3ea0d;hpb=f54438ea00f152166e68073e98000fd3a00f65cd;p=xscreensaver

diff --git a/hacks/xlockmore.h b/hacks/xlockmore.h
index d39119ab..3b390f03 100644
--- a/hacks/xlockmore.h
+++ b/hacks/xlockmore.h
@@ -1,5 +1,5 @@
 /* xlockmore.h --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997-2002 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
@@ -35,8 +35,11 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 #ifdef USE_GL
 # include <GL/glx.h>
   extern GLXContext *init_GL (ModeInfo *);
+  extern void clear_gl_error (void);
+  extern void check_gl_error (const char *type);
+  extern void do_fps (ModeInfo *);
 # define FreeAllGL(dpy) /* */
-#endif
+#endif /* !USE_GL */
 
 /* Accessor macros for the ModeInfo structure
  */
@@ -74,10 +77,11 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 #define MI_BATCHCOUNT(MI)	((MI)->batchcount)
 #define MI_SIZE(MI)		((MI)->size)
 #define MI_IS_DRAWN(MI)		((MI)->is_drawn)
-#define MI_IS_DRAWN(MI)		((MI)->is_drawn)
+#define MI_IS_FPS(MI)		((MI)->fps_p)
 #define MI_NCOLORS(MI)		((MI)->npixels)
 #define MI_NAME(MI)		(progname)
 
+#define MI_COLORMAP(MI)	        (MI_WIN_COLORMAP((MI)))
 #define MI_WIDTH(MI)		(MI_WIN_WIDTH((MI)))
 #define MI_HEIGHT(MI)		(MI_WIN_HEIGHT((MI)))
 #define MI_IS_ICONIC(MI)	(MI_WIN_IS_ICONIC((MI)))
@@ -90,6 +94,7 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 #define MI_IS_VERBOSE(MI)	(MI_WIN_IS_VERBOSE(MI))
 #define MI_IS_INSTALL(MI)	(MI_WIN_IS_INSTALL(MI))
 #define MI_IS_DEBUG(MI)		(False)
+#define MI_IS_MOUSE(MI)		(False)
 
 #define MI_CLEARWINDOW(mi) XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi))
 
@@ -125,6 +130,18 @@ extern void HACK_DRAW(ModeInfo *);
 # define HACK_FREE 0
 #endif
 
+#ifdef HACK_RESHAPE
+  extern void HACK_RESHAPE(ModeInfo *, int width, int height);
+#else
+# define HACK_RESHAPE 0
+#endif
+
+#ifdef HACK_HANDLE_EVENT
+  extern Bool HACK_HANDLE_EVENT(ModeInfo *, XEvent *e);
+#else
+# define HACK_HANDLE_EVENT 0
+#endif
+
 
 /* Emit code for the entrypoint used by screenhack.c, and pass control
    down into xlockmore.c with the appropriate parameters.
@@ -160,8 +177,16 @@ void screenhack (Display *dpy, Window window)
 			False,
 #endif
 
+#ifdef EVENT_MASK
+			EVENT_MASK,
+#else
+			0,
+#endif
+
 			HACK_INIT,
 			HACK_DRAW,
+			HACK_RESHAPE,
+			HACK_HANDLE_EVENT,
 			HACK_FREE);
 }