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

[xscreensaver] / hacks / lissie.c

diff --git a/hacks/lissie.c b/hacks/lissie.c
index 4138428d53d5750576ad3201f6ba5cdce25e7833..bb631b29be4839289b207776b0083cdc8fb53f0f 100644 (file)
--- a/hacks/lissie.c
+++ b/hacks/lissie.c
@@ -36,8 +36,11 @@ static const char sccsid[] = "@(#)lissie.c   5.00 2000/11/01 xlockmore";
                                        "*count: 1 \n" \
                                        "*cycles: 20000 \n" \
                                        "*size: -200 \n" \
-                                       "*ncolors: 200 \n"
+                                       "*ncolors: 200 \n" \
+                                       "*fpsSolid: true \n" \
+
 # define SMOOTH_COLORS
+# define release_lissie 0
 # define reshape_lissie 0
 # define lissie_handle_event 0
 # include "xlockmore.h"                /* in xscreensaver distribution */
@@ -52,8 +55,8 @@ ENTRYPOINT ModeSpecOpt lissie_opts =
 
 #ifdef USE_MODULES
 ModStruct   lissie_description =
-{"lissie", "init_lissie", "draw_lissie", "release_lissie",
- "refresh_lissie", "init_lissie", (char *) NULL, &lissie_opts,
+{"lissie", "init_lissie", "draw_lissie", (char *) NULL,
+ "refresh_lissie", "init_lissie", "free_lissie", &lissie_opts,
  10000, 1, 2000, -200, 64, 0.6, "",
  "Shows lissajous worms", 0, NULL};
 
@@ -209,8 +212,6 @@ initlissie(ModeInfo * mi, lissiestruct * lissie)
 
        for (i = 0; i < MAXLISSIELEN; i++)
                lissie->loc[i].x = lissie->loc[i].y = 0;
-       /* Draw lissie */
-       drawlissie(mi, lissie);
 }
 
 ENTRYPOINT void
@@ -219,16 +220,12 @@ init_lissie (ModeInfo * mi)
        lissstruct *lp;
        unsigned char ball;
 
-       if (lisses == NULL) {
-               if ((lisses = (lissstruct *) calloc(MI_NUM_SCREENS(mi),
-                                              sizeof (lissstruct))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, lisses);
        lp = &lisses[MI_SCREEN(mi)];
 
        lp->width = MI_WIDTH(mi);
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
     jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
 #endif
 
@@ -283,24 +280,21 @@ draw_lissie (ModeInfo * mi)
 }
 
 ENTRYPOINT void
-release_lissie (ModeInfo * mi)
+free_lissie (ModeInfo * mi)
 {
-       if (lisses != NULL) {
-               int         screen;
+       lissstruct *lp;
 
-               for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-                       lissstruct *lp = &lisses[screen];
+       if (lisses == NULL)
+               return;
+       lp = &lisses[MI_SCREEN(mi)];
 
-                       if (lp->lissie != NULL) {
-                               (void) free((void *) lp->lissie);
-                               /* lp->lissie = NULL; */
-                       }
-               }
-               (void) free((void *) lisses);
-               lisses = (lissstruct *) NULL;
+       if (lp->lissie != NULL) {
+               (void) free((void *) lp->lissie);
+               /* lp->lissie = NULL; */
        }
 }
 
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_lissie(ModeInfo * mi)
 {
@@ -321,6 +315,7 @@ refresh_lissie(ModeInfo * mi)
                }
        }
 }
+#endif
 
 XSCREENSAVER_MODULE ("Lissie", lissie)