projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz
[xscreensaver]
/
hacks
/
apollonian.c
diff --git
a/hacks/apollonian.c
b/hacks/apollonian.c
index 39a905afbfc4703cd5555c54543ae816f912b7db..4b28ac3fdcdb2651ed38c9a0328b1f552ef2b820 100644
(file)
--- a/
hacks/apollonian.c
+++ b/
hacks/apollonian.c
@@
-70,14
+70,15
@@
static const char sccsid[] = "@(#)apollonian.c 5.02 2001/07/01 xlockmore";
"*count: 64 \n" \
"*cycles: 20 \n" \
"*ncolors: 64 \n" \
"*count: 64 \n" \
"*cycles: 20 \n" \
"*ncolors: 64 \n" \
+ "*font: fixed" "\n" \
"*fpsTop: true \n" \
"*fpsSolid: true \n" \
"*fpsTop: true \n" \
"*fpsSolid: true \n" \
+ "*ignoreRotation: True" \
-# define re
fresh
_apollonian 0
+# define re
lease
_apollonian 0
# define reshape_apollonian 0
# define apollonian_handle_event 0
# include "xlockmore.h" /* in xscreensaver distribution */
# 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 */
#else /* STANDALONE */
# include "xlock.h" /* in xlockmore distribution */
#endif /* STANDALONE */
@@
-117,8
+118,8
@@
extern XFontStruct *getFont(Display * display);
#ifdef USE_MODULES
ModStruct apollonian_description =
#ifdef USE_MODULES
ModStruct apollonian_description =
-{"apollonian", "init_apollonian", "draw_apollonian",
"release_apollonian"
,
- "init_apollonian", "init_apollonian",
(char *) NULL
, &apollonian_opts,
+{"apollonian", "init_apollonian", "draw_apollonian",
(char *) NULL
,
+ "init_apollonian", "init_apollonian",
"free_apollonian"
, &apollonian_opts,
1000000, 64, 20, 1, 64, 1.0, "",
"Shows Apollonian Circles", 0, NULL};
1000000, 64, 20, 1, 64, 1.0, "",
"Shows Apollonian Circles", 0, NULL};
@@
-298,9
+299,6
@@
typedef struct {
#endif
int time;
int game;
#endif
int time;
int game;
-#ifdef STANDALONE
- eraser_state *eraser;
-#endif
} apollonianstruct;
static apollonianstruct *apollonians = (apollonianstruct *) NULL;
} apollonianstruct;
static apollonianstruct *apollonians = (apollonianstruct *) NULL;
@@
-506,7
+504,7
@@
static void
p(ModeInfo *mi, circle c)
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
p(ModeInfo *mi, circle c)
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
- char string[1
0
];
+ char string[1
5
];
double g, e;
int g_width;
double g, e;
int g_width;
@@
-613,12
+611,14
@@
p(ModeInfo *mi, circle c)
#define BIG 7
static void
#define BIG 7
static void
-f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4)
+f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4
, int depth
)
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
int e = (int) ((cp->c1.e >= 0.0) ? 1.0 : -cp->c1.e);
circle c;
{
apollonianstruct *cp = &apollonians[MI_SCREEN(mi)];
int e = (int) ((cp->c1.e >= 0.0) ? 1.0 : -cp->c1.e);
circle c;
+ if (depth > mi->recursion_depth) mi->recursion_depth = depth;
+
c.e = 2*(c1.e+c2.e+c3.e) - c4.e;
c.s = 2*(c1.s+c2.s+c3.s) - c4.s;
c.h = 2*(c1.h+c2.h+c3.h) - c4.h;
c.e = 2*(c1.e+c2.e+c3.e) - c4.e;
c.s = 2*(c1.s+c2.s+c3.s) - c4.s;
c.h = 2*(c1.h+c2.h+c3.h) - c4.h;
@@
-629,14
+629,16
@@
f(ModeInfo *mi, circle c1, circle c2, circle c3, circle c4)
c.x / c.e < -BIG || c.y / c.e < -BIG)
return;
p(mi, c);
c.x / c.e < -BIG || c.y / c.e < -BIG)
return;
p(mi, c);
- f(mi, c2, c3, c, c1);
- f(mi, c1, c3, c, c2);
- f(mi, c1, c2, c, c3);
+ f(mi, c2, c3, c, c1
, depth+1
);
+ f(mi, c1, c3, c, c2
, depth+1
);
+ f(mi, c1, c2, c, c3
, depth+1
);
}
ENTRYPOINT void
}
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;
if (cp->quad != NULL) {
(void) free((void *) cp->quad);
cp->quad = (apollonian_quadruple *) NULL;
@@
-677,11
+679,7
@@
init_apollonian (ModeInfo * mi)
apollonianstruct *cp;
int i;
apollonianstruct *cp;
int i;
- if (apollonians == NULL) {
- if ((apollonians = (apollonianstruct *) calloc(MI_NUM_SCREENS(mi),
- sizeof (apollonianstruct))) == NULL)
- return;
- }
+ MI_INIT (mi, apollonians);
cp = &apollonians[MI_SCREEN(mi)];
cp->size = MAX(MIN(MI_WIDTH(mi), MI_HEIGHT(mi)) - 1, 1);
cp = &apollonians[MI_SCREEN(mi)];
cp->size = MAX(MIN(MI_WIDTH(mi), MI_HEIGHT(mi)) - 1, 1);
@@
-726,9
+724,7
@@
init_apollonian (ModeInfo * mi)
cquad(&(cp->c1), &(cp->c2), &(cp->c3), &(cp->c4));
}
cp->time = 0;
cquad(&(cp->c1), &(cp->c2), &(cp->c3), &(cp->c4));
}
cp->time = 0;
-#ifndef STANDALONE
MI_CLEARWINDOW(mi);
MI_CLEARWINDOW(mi);
-#endif
if (cp->game != 0) {
double q123;
if (cp->game != 0) {
double q123;
@@
-768,6
+764,8
@@
init_apollonian (ModeInfo * mi)
randomize_c(i, &(cp->c3));
randomize_c(i, &(cp->c4));
#endif
randomize_c(i, &(cp->c3));
randomize_c(i, &(cp->c4));
#endif
+
+ mi->recursion_depth = -1;
}
ENTRYPOINT void
}
ENTRYPOINT void
@@
-779,12
+777,6
@@
draw_apollonian (ModeInfo * mi)
return;
cp = &apollonians[MI_SCREEN(mi)];
return;
cp = &apollonians[MI_SCREEN(mi)];
-#ifdef STANDALONE
- if (cp->eraser) {
- cp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), cp->eraser);
- return;
- }
-#endif
MI_IS_DRAWN(mi) = True;
MI_IS_DRAWN(mi) = True;
@@
-797,38
+789,20
@@
draw_apollonian (ModeInfo * mi)
p(mi, cp->c4);
break;
case 1:
p(mi, cp->c4);
break;
case 1:
- f(mi, cp->c1, cp->c2, cp->c3, cp->c4);
+ f(mi, cp->c1, cp->c2, cp->c3, cp->c4
, 0
);
break;
case 2:
break;
case 2:
- f(mi, cp->c1, cp->c2, cp->c4, cp->c3);
+ f(mi, cp->c1, cp->c2, cp->c4, cp->c3
, 0
);
break;
case 3:
break;
case 3:
- f(mi, cp->c1, cp->c3, cp->c4, cp->c2);
+ f(mi, cp->c1, cp->c3, cp->c4, cp->c2
, 0
);
break;
case 4:
break;
case 4:
- f(mi, cp->c2, cp->c3, cp->c4, cp->c1);
+ f(mi, cp->c2, cp->c3, cp->c4, cp->c1
, 0
);
}
}
if (++cp->time > MI_CYCLES(mi))
}
}
if (++cp->time > MI_CYCLES(mi))
- {
-#ifdef STANDALONE
- cp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), cp->eraser);
-#endif /* STANDALONE */
init_apollonian(mi);
init_apollonian(mi);
- }
-}
-
-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)
}
XSCREENSAVER_MODULE ("Apollonian", apollonian)