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

[xscreensaver] / hacks / apollonian.c

diff --git a/hacks/apollonian.c b/hacks/apollonian.c
index be2e6ab4c6b7b340fca9a0f692dad1fc9f82ba71..6986e73eb3a14ad272032223dc9f1f26dbcf4ba8 100644 (file)
--- a/hacks/apollonian.c
+++ b/hacks/apollonian.c
@@ -70,11 +70,13 @@ static const char sccsid[] = "@(#)apollonian.c      5.02 2001/07/01 xlockmore";
                                        "*count:   64      \n" \
                                        "*cycles:  20      \n" \
                                        "*ncolors: 64      \n" \
+                                       "*font:    fixed" "\n" \
                                        "*fpsTop: true     \n" \
                                        "*fpsSolid: true   \n" \
+                                       "*ignoreRotation: True" \
 
 # define refresh_apollonian 0
-# define apollonian_handle_event 0
+# define release_apollonian 0
 # include "xlockmore.h"                /* in xscreensaver distribution */
 # include "erase.h"
 #else /* STANDALONE */
@@ -116,7 +118,7 @@ extern XFontStruct *getFont(Display * display);
 
 #ifdef USE_MODULES
 ModStruct   apollonian_description =
-{"apollonian", "init_apollonian", "draw_apollonian", "release_apollonian",
+{"apollonian", "init_apollonian", "draw_apollonian", (char *) NULL,
  "init_apollonian", "init_apollonian", (char *) NULL, &apollonian_opts,
  1000000, 64, 20, 1, 64, 1.0, "",
  "Shows Apollonian Circles", 0, NULL};
@@ -505,7 +507,7 @@ static void
 p(ModeInfo *mi, circle c)
 {
        apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
-       char string[10];
+       char string[15];
        double g, e;
        int g_width;
 
@@ -636,8 +638,10 @@ f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4, int depth)
 }
 
 ENTRYPOINT void
-free_apollonian (Display *display, apollonianstruct *cp)
+free_apollonian (ModeInfo * mi)
 {
+       apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
+
        if (cp->quad != NULL) {
                (void) free((void *) cp->quad);
                cp->quad = (apollonian_quadruple *) NULL;
@@ -678,11 +682,7 @@ init_apollonian (ModeInfo * mi)
        apollonianstruct *cp;
        int i;
 
-       if (apollonians == NULL) {
-               if ((apollonians = (apollonianstruct *) calloc(MI_NUM_SCREENS(mi),
-                                            sizeof (apollonianstruct))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, apollonians, free_apollonian);
        cp = &apollonians[MI_SCREEN(mi)];
 
        cp->size = MAX(MIN(MI_WIDTH(mi), MI_HEIGHT(mi)) - 1, 1);
@@ -785,6 +785,8 @@ draw_apollonian (ModeInfo * 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
@@ -816,8 +818,9 @@ draw_apollonian (ModeInfo * mi)
       {
 #ifdef STANDALONE
         cp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), cp->eraser);
-#endif /* STANDALONE */
+#else /* !STANDALONE */
                init_apollonian(mi);
+#endif /* !STANDALONE */
       }
 }
 
@@ -828,17 +831,15 @@ reshape_apollonian(ModeInfo * mi, int width, int height)
   init_apollonian (mi);
 }
 
-ENTRYPOINT void
-release_apollonian (ModeInfo * mi)
+ENTRYPOINT Bool
+apollonian_handle_event (ModeInfo *mi, XEvent *event)
 {
-       if (apollonians != NULL) {
-               int         screen;
-
-               for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-                       free_apollonian(MI_DISPLAY(mi), &apollonians[screen]);
-               (void) free((void *) apollonians);
-               apollonians = (apollonianstruct *) NULL;
-       }
+  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)