"*ignoreRotation: True" \
# define refresh_apollonian 0
+# define release_apollonian 0
# include "xlockmore.h" /* in xscreensaver distribution */
# include "erase.h"
#else /* STANDALONE */
#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};
p(ModeInfo *mi, circle c)
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
- char string[10];
+ char string[15];
double g, e;
int g_width;
}
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;
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);
#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
{
#ifdef STANDALONE
cp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), cp->eraser);
-#endif /* STANDALONE */
+#else /* !STANDALONE */
init_apollonian(mi);
+#endif /* !STANDALONE */
}
}
return False;
}
-ENTRYPOINT void
-release_apollonian (ModeInfo * mi)
-{
- 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;
- }
-}
-
XSCREENSAVER_MODULE ("Apollonian", apollonian)
#endif /* MODE_apollonian */