X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fapollonian.c;h=4b28ac3fdcdb2651ed38c9a0328b1f552ef2b820;hp=6986e73eb3a14ad272032223dc9f1f26dbcf4ba8;hb=39809ded547bdbb08207d3e514950425215b4410;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba

diff --git a/hacks/apollonian.c b/hacks/apollonian.c
index 6986e73e..4b28ac3f 100644
--- a/hacks/apollonian.c
+++ b/hacks/apollonian.c
@@ -75,10 +75,10 @@ static const char sccsid[] = "@(#)apollonian.c	5.02 2001/07/01 xlockmore";
 					"*fpsSolid: true   \n" \
 					"*ignoreRotation: True" \
 
-# define refresh_apollonian 0
 # define release_apollonian 0
+# define reshape_apollonian 0
+# define apollonian_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
-# include "erase.h"
 #else /* STANDALONE */
 # include "xlock.h"		/* in xlockmore distribution */
 #endif /* STANDALONE */
@@ -119,7 +119,7 @@ extern XFontStruct *getFont(Display * display);
 #ifdef USE_MODULES
 ModStruct   apollonian_description =
 {"apollonian", "init_apollonian", "draw_apollonian", (char *) NULL,
- "init_apollonian", "init_apollonian", (char *) NULL, &apollonian_opts,
+ "init_apollonian", "init_apollonian", "free_apollonian", &apollonian_opts,
  1000000, 64, 20, 1, 64, 1.0, "",
  "Shows Apollonian Circles", 0, NULL};
 
@@ -299,9 +299,6 @@ typedef struct {
 #endif
 	int         time;
 	int         game;
-#ifdef STANDALONE
-  eraser_state *eraser;
-#endif
 } apollonianstruct;
 
 static apollonianstruct *apollonians = (apollonianstruct *) NULL;
@@ -682,7 +679,7 @@ init_apollonian (ModeInfo * mi)
 	apollonianstruct *cp;
 	int i;
 
-	MI_INIT (mi, apollonians, free_apollonian);
+	MI_INIT (mi, apollonians);
 	cp = &apollonians[MI_SCREEN(mi)];
 
 	cp->size = MAX(MIN(MI_WIDTH(mi), MI_HEIGHT(mi)) - 1, 1);
@@ -727,9 +724,7 @@ init_apollonian (ModeInfo * mi)
 			cquad(&(cp->c1), &(cp->c2), &(cp->c3), &(cp->c4));
 	}
 	cp->time = 0;
-#ifndef STANDALONE
 	MI_CLEARWINDOW(mi);
-#endif
 	if (cp->game != 0) {
 		double q123;
 
@@ -782,14 +777,6 @@ draw_apollonian (ModeInfo * mi)
 		return;
 	cp = &apollonians[MI_SCREEN(mi)];
 
-#ifdef STANDALONE
-    if (cp->eraser) {
-      cp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), cp->eraser);
-      if (!cp->eraser)
-        init_apollonian(mi);
-      return;
-    }
-#endif
 
 	MI_IS_DRAWN(mi) = True;
 
@@ -815,31 +802,7 @@ draw_apollonian (ModeInfo * mi)
 		}
 	}
 	if (++cp->time > MI_CYCLES(mi))
-      {
-#ifdef STANDALONE
-        cp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), cp->eraser);
-#else /* !STANDALONE */
 		init_apollonian(mi);
-#endif /* !STANDALONE */
-      }
-}
-
-ENTRYPOINT void
-reshape_apollonian(ModeInfo * mi, int width, int height)
-{
-  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
-  init_apollonian (mi);
-}
-
-ENTRYPOINT Bool
-apollonian_handle_event (ModeInfo *mi, XEvent *event)
-{
-  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
-    {
-      reshape_apollonian (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
-      return True;
-    }
-  return False;
 }
 
 XSCREENSAVER_MODULE ("Apollonian", apollonian)