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

[xscreensaver] / hacks / sphere.c

diff --git a/hacks/sphere.c b/hacks/sphere.c
index 2484effcc690cb05a76e6af9ad172e8b6c3e91dc..d35720e9e66d21ee3b89513f15c257bd5d0814a5 100644 (file)
--- a/hacks/sphere.c
+++ b/hacks/sphere.c
@@ -58,11 +58,14 @@ static const char sccsid[] = "@(#)sphere.c  5.00 2000/11/01 xlockmore";
 
 #ifdef STANDALONE
 # define MODE_sphere
-#define DEFAULTS       "*delay: 1000 \n" \
+#define DEFAULTS       "*delay: 20000 \n" \
                                        "*cycles: 20 \n" \
                                        "*size: 0 \n" \
-                                       "*ncolors: 64 \n"
+                                       "*ncolors: 64 \n" \
+                                       "*fpsSolid: true \n" \
+
 # define BRIGHT_COLORS
+# define release_sphere 0
 # define reshape_sphere 0
 # define sphere_handle_event 0
 # include "xlockmore.h"                /* from the xscreensaver distribution */
@@ -77,8 +80,8 @@ ENTRYPOINT ModeSpecOpt sphere_opts =
 
 #ifdef USE_MODULES
 ModStruct   sphere_description =
-{"sphere", "init_sphere", "draw_sphere", "release_sphere",
- "refresh_sphere", "init_sphere", (char *) NULL, &sphere_opts,
+{"sphere", "init_sphere", "draw_sphere", (char *) NULL,
+ "refresh_sphere", "init_sphere", "free_sphere", &sphere_opts,
  5000, 1, 20, 0, 64, 1.0, "",
  "Shows a bunch of shaded spheres", 0, NULL};
 
@@ -113,11 +116,7 @@ init_sphere(ModeInfo * mi)
 {
        spherestruct *sp;
 
-       if (spheres == NULL) {
-               if ((spheres = (spherestruct *) calloc(MI_NUM_SCREENS(mi),
-                                            sizeof (spherestruct))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, spheres);
        sp = &spheres[MI_SCREEN(mi)];
 
        if (sp->points != NULL) {
@@ -269,24 +268,21 @@ draw_sphere(ModeInfo * mi)
 }
 
 ENTRYPOINT void
-release_sphere(ModeInfo * mi)
+free_sphere(ModeInfo * mi)
 {
-       if (spheres != NULL) {
-               int         screen;
+       spherestruct *sp;
 
-               for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-                       spherestruct *sp = &spheres[screen];
+       if (spheres == NULL)
+               return;
+       sp = &spheres[MI_SCREEN(mi)];
 
-                       if (sp->points) {
-                               (void) free((void *) sp->points);
-                               /* sp->points = NULL; */
-                       }
-               }
-               (void) free((void *) spheres);
-               spheres = (spherestruct *) NULL;
+       if (sp->points) {
+               (void) free((void *) sp->points);
+               /* sp->points = NULL; */
        }
 }
 
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_sphere(ModeInfo * mi)
 {
@@ -300,6 +296,7 @@ refresh_sphere(ModeInfo * mi)
 
        sp->x = -sp->radius;
 }
+#endif
 
 XSCREENSAVER_MODULE ("Sphere", sphere)