X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fvines.c;h=c24807803c7d90e5e5b951dc9174e01a5ba03edb;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=f4151cd4c254604b70125f3d02cebde5ab581fd8;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver

diff --git a/hacks/vines.c b/hacks/vines.c
index f4151cd4..c2480780 100644
--- a/hacks/vines.c
+++ b/hacks/vines.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* vines --- vine fractals */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)vines.c	5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -45,23 +44,23 @@ static const char sccsid[] = "@(#)vines.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_vines
-#define PROGCLASS "Vines"
-#define HACK_INIT init_vines
-#define HACK_DRAW draw_vines
-#define vines_opts xlockmore_opts
-#define DEFAULTS "*delay: 200000 \n" \
- "*count: 0 \n" \
- "*ncolors: 64 \n"
-#include "xlockmore.h"		/* in xscreensaver distribution */
-#include "erase.h"
+# define MODE_vines
+# define DEFAULTS	"*delay: 200000 \n" \
+					"*count: 0 \n" \
+					"*ncolors: 64 \n" \
+					"*fpsSolid: true \n" \
+
+# include "xlockmore.h"		/* in xscreensaver distribution */
+# define reshape_vines 0
+# define vines_handle_event 0
+# include "erase.h"
 #else /* STANDALONE */
-#include "xlock.h"		/* in xlockmore distribution */
+# include "xlock.h"		/* in xlockmore distribution */
 #endif /* STANDALONE */
 
 #ifdef MODE_vines
 
-ModeSpecOpt vines_opts =
+ENTRYPOINT ModeSpecOpt vines_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #ifdef USE_MODULES
@@ -86,17 +85,20 @@ typedef struct {
 	int         ang;
 	int         centerx;
 	int         centery;
+#ifdef STANDALONE
+  eraser_state *eraser;
+#endif
 } vinestruct;
 
 static vinestruct *vines = (vinestruct *) NULL;
 
-void
+ENTRYPOINT void
 refresh_vines(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }				/* refresh_vines */
 
-void
+ENTRYPOINT void
 init_vines(ModeInfo * mi)
 {
 	vinestruct *fp;
@@ -113,10 +115,12 @@ init_vines(ModeInfo * mi)
 	fp->length = 0;
 	fp->iterations = 30 + NRAND(100);
 
+#ifndef STANDALONE
 	MI_CLEARWINDOW(mi);
+#endif
 }				/* init_vines */
 
-void
+ENTRYPOINT void
 draw_vines(ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
@@ -128,11 +132,18 @@ draw_vines(ModeInfo * mi)
 		return;
 	fp = &vines[MI_SCREEN(mi)];
 
+#ifdef STANDALONE
+    if (fp->eraser) {
+      fp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), fp->eraser);
+      return;
+    }
+#endif
+
 	/* MI_IS_DRAWN(mi) = True; */
 	if (fp->i >= fp->length) {
 		if (--(fp->iterations) == 0) {
 #ifdef STANDALONE
-	  erase_full_window(MI_DISPLAY(mi), MI_WINDOW(mi));
+	  fp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), fp->eraser);
 #endif /* STANDALONE */
 			init_vines(mi);
 		}
@@ -177,7 +188,7 @@ draw_vines(ModeInfo * mi)
 	}
 }				/* draw_vines */
 
-void
+ENTRYPOINT void
 release_vines(ModeInfo * mi)
 {
 	if (vines != NULL) {
@@ -186,4 +197,7 @@ release_vines(ModeInfo * mi)
 	}
 }				/* release_vines */
 
+
+XSCREENSAVER_MODULE ("Vines", vines)
+
 #endif /* MODE_vines */