From http://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz

[xscreensaver] / hacks / glx / glschool.c

diff --git a/hacks/glx/glschool.c b/hacks/glx/glschool.c
index eb522a031b2b0b7e9f256c2b1a1e5001d25974f6..49cfc1154a66025919fb6beaaac0804db1da5e4f 100644 (file)
--- a/hacks/glx/glschool.c
+++ b/hacks/glx/glschool.c
@@ -16,9 +16,9 @@
                     "*showFPS:      False       \n" \
                     "*wireframe:    False       \n" \
 
-#define refresh_glschool               (0)
+#define free_glschool                  (0)
 #define release_glschool               (0)
-#define glschool_handle_event  (0)
+#define glschool_handle_event  (xlockmore_no_events)
 
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -142,13 +142,7 @@ init_glschool(ModeInfo *mi)
        Bool                                    wire = MI_IS_WIREFRAME(mi);
        glschool_configuration  *sc;
 
-       if (!scs) {
-               scs = (glschool_configuration *)calloc(MI_NUM_SCREENS(mi), sizeof(glschool_configuration));
-               if (!scs) {
-                       perror("init_glschool: ");
-                       exit(1);
-               }
-       }
+       MI_INIT (mi, scs);
        sc = &scs[MI_SCREEN(mi)];
 
        sc->drawGoal = DoDrawGoal;
@@ -157,7 +151,7 @@ init_glschool(ModeInfo *mi)
        sc->nColors = 360;
        sc->context = init_GL(mi);
        sc->colors = (XColor *)calloc(sc->nColors, sizeof(XColor));
-       make_color_ramp(0, 0,
+       make_color_ramp(0, 0, 0,
                                        0.0, 1.0, 1.0,
                                        359.0, 1.0, 1.0,
                                        sc->colors, &sc->nColors,