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.36.tar.gz
[xscreensaver]
/
hacks
/
epicycle.c
diff --git
a/hacks/epicycle.c
b/hacks/epicycle.c
index 4eae8c945d288618c45446b92b63d402e1c293ed..91a47a28ee93489cca060e3f2dce3795595cf5e3 100644
(file)
--- a/
hacks/epicycle.c
+++ b/
hacks/epicycle.c
@@
-65,6
+65,9
@@
static const char *epicycle_defaults [] = {
"*divisorPoisson: 0.4",
"*sizeFactorMin: 1.05",
"*sizeFactorMax: 2.05",
"*divisorPoisson: 0.4",
"*sizeFactorMin: 1.05",
"*sizeFactorMax: 2.05",
+#ifdef HAVE_MOBILE
+ "*ignoreRotation: True",
+#endif
0
};
0
};
@@
-225,14
+228,6
@@
random_divisor(struct state *st)
}
}
-static void
-oom(struct state *st)
-{
- fprintf(stderr, "Failed to allocate memory!\n");
- exit(-1);
-}
-
-
/* Construct a circle or die.
*/
static Circle *
/* Construct a circle or die.
*/
static Circle *
@@
-311,8
+306,7
@@
static Body *
new_body(struct state *st)
{
Body *p = malloc(sizeof(Body));
new_body(struct state *st)
{
Body *p = malloc(sizeof(Body));
- if (NULL == p)
- oom(st);
+ if (!p) abort();
p->epicycles = new_circle_chain(st);
p->current_color = 0; /* ?? start them all on different colors? */
p->next = NULL;
p->epicycles = new_circle_chain(st);
p->current_color = 0; /* ?? start them all on different colors? */
p->next = NULL;
@@
-410,7
+404,7
@@
colour_init(struct state *st, XWindowAttributes *pxgwa)
*/
if (st->colors)
{
*/
if (st->colors)
{
- free_colors(
st->dpy
, st->cmap, st->colors, st->ncolors);
+ free_colors(
pxgwa->screen
, st->cmap, st->colors, st->ncolors);
st->colors = 0;
st->ncolors = 0;
}
st->colors = 0;
st->ncolors = 0;
}
@@
-428,10
+422,10
@@
colour_init(struct state *st, XWindowAttributes *pxgwa)
if (!mono_p)
{
st->colors = (XColor *) malloc(sizeof(*st->colors) * (st->ncolors+1));
if (!mono_p)
{
st->colors = (XColor *) malloc(sizeof(*st->colors) * (st->ncolors+1));
- if (!st->colors)
- oom(st);
+ if (!st->colors) abort();
- make_smooth_colormap (st->dpy, pxgwa->visual, st->cmap, st->colors, &st->ncolors,
+ make_smooth_colormap (pxgwa->screen, pxgwa->visual, st->cmap,
+ st->colors, &st->ncolors,
True, /* allocate */
False, /* not writable */
True); /* verbose (complain about failure) */
True, /* allocate */
False, /* not writable */
True); /* verbose (complain about failure) */
@@
-729,7
+723,7
@@
epicycle_draw (Display *dpy, Window window, void *closure)
st->L = compute_divisor_lcm(st->pb0->epicycles);
st->L = compute_divisor_lcm(st->pb0->epicycles);
- st->colour_cycle_rate =
f
abs(st->L);
+ st->colour_cycle_rate =
l
abs(st->L);
st->xtime = fabs(st->L * st->circle / st->wdot_max);
st->xtime = fabs(st->L * st->circle / st->wdot_max);
@@
-770,7
+764,7
@@
static Bool
epicycle_event (Display *dpy, Window window, void *closure, XEvent *e)
{
struct state *st = (struct state *) closure;
epicycle_event (Display *dpy, Window window, void *closure, XEvent *e)
{
struct state *st = (struct state *) closure;
- if (
e->type == ButtonPress
)
+ if (
screenhack_event_helper (dpy, window, e)
)
{
st->restart = 1;
return True;
{
st->restart = 1;
return True;