http://ftp.x.org/contrib/applications/xscreensaver-2.23.tar.gz

[xscreensaver] / hacks / xlockmore.h

diff --git a/hacks/xlockmore.h b/hacks/xlockmore.h
index f09248b7ec1535489a30f5b55ab61ae5b39b4d1f..b0b7ec41cf005c1ead15c6753746862d6bd7a5ca 100644 (file)
--- a/hacks/xlockmore.h
+++ b/hacks/xlockmore.h
@@ -1,5 +1,5 @@
 /* xlockmore.h --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997 Jamie Zawinski <jwz@netscape.com>
+ * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@netscape.com>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -34,7 +34,8 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 
 #ifdef USE_GL
 # include <GL/glx.h>
-  extern GLXContext init_GL (ModeInfo *);
+  extern GLXContext *init_GL (ModeInfo *);
+# define FreeAllGL(dpy) /* */
 #endif
 
 /* Accessor macros for the ModeInfo structure
@@ -73,6 +74,19 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 #define MI_BATCHCOUNT(MI)      ((MI)->batchcount)
 #define MI_SIZE(MI)            ((MI)->size)
 
+#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)))
+#define MI_IS_WIREFRAME(MI)    (MI_WIN_IS_WIREFRAME((MI)))
+#define MI_IS_MONO(MI)         (MI_WIN_IS_MONO((MI)))
+#define MI_COUNT(MI)           (MI_BATCHCOUNT((MI)))
+#define MI_BLACK_PIXEL(MI)     (MI_WIN_BLACK_PIXEL(MI))
+#define MI_WHITE_PIXEL(MI)     (MI_WIN_WHITE_PIXEL(MI))
+#define MI_IS_FULLRANDOM(MI)   (MI_WIN_IS_FULLRANDOM(MI))
+#define MI_IS_VERBOSE(MI)      (MI_WIN_IS_VERBOSE(MI))
+
+#define MI_CLEARWINDOW(mi) XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi))
+
 /* Some other utility macros.
  */
 #define SINF(n)                        ((float)sin((double)(n)))