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 f0ce93d7c163fe1ee2e6dbf0505036bf9ec99beb..bb631b29be4839289b207776b0083cdc8fb53f0f 100644 (file)
--- a/hacks/lissie.c
+++ b/hacks/lissie.c
@@ -31,31 +31,32 @@ static const char sccsid[] = "@(#)lissie.c  5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_lissie
-#define PROGCLASS "Lissie"
-#define HACK_INIT init_lissie
-#define HACK_DRAW draw_lissie
-#define lissie_opts xlockmore_opts
-#define DEFAULTS "*delay: 10000 \n" \
- "*count: 1 \n" \
- "*cycles: 20000 \n" \
- "*size: -200 \n" \
- "*ncolors: 200 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"         /* in xscreensaver distribution */
+# define MODE_lissie
+# define DEFAULTS      "*delay: 10000 \n" \
+                                       "*count: 1 \n" \
+                                       "*cycles: 20000 \n" \
+                                       "*size: -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 */
 #else /* STANDALONE */
-#include "xlock.h"             /* in xlockmore distribution */
+# include "xlock.h"            /* in xlockmore distribution */
 #endif /* STANDALONE */
 
 #ifdef MODE_lissie
 
-ModeSpecOpt lissie_opts =
+ENTRYPOINT ModeSpecOpt lissie_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #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};
 
@@ -211,24 +212,23 @@ 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);
 }
 
-void
-init_lissie(ModeInfo * mi)
+ENTRYPOINT void
+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_JWXYZ
+    jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
+#endif
+
        lp->height = MI_HEIGHT(mi);
 
        lp->nlissies = MI_COUNT(mi);
@@ -256,8 +256,8 @@ init_lissie(ModeInfo * mi)
 
 }
 
-void
-draw_lissie(ModeInfo * mi)
+ENTRYPOINT void
+draw_lissie (ModeInfo * mi)
 {
        register unsigned char ball;
        lissstruct *lp;
@@ -279,26 +279,23 @@ draw_lissie(ModeInfo * mi)
        }
 }
 
-void
-release_lissie(ModeInfo * mi)
+ENTRYPOINT void
+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; */
        }
 }
 
-void
+#ifndef STANDALONE
+ENTRYPOINT void
 refresh_lissie(ModeInfo * mi)
 {
        int         i;
@@ -318,5 +315,8 @@ refresh_lissie(ModeInfo * mi)
                }
        }
 }
+#endif
+
+XSCREENSAVER_MODULE ("Lissie", lissie)
 
 #endif /* MODE_lissie */