projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.22.tar.gz
[xscreensaver]
/
hacks
/
loop.c
diff --git
a/hacks/loop.c
b/hacks/loop.c
index f492ee44c4d92cf4224666e5d9591fd4b8125896..4a67f381644c600809b936ad62dbe54300c3605c 100644
(file)
--- a/
hacks/loop.c
+++ b/
hacks/loop.c
@@
-90,7
+90,7
@@
static const char sccsid[] = "@(#)loop.c 5.01 2000/03/15 xlockmore";
"*cycles: 1600 \n" \
"*size: -12 \n" \
"*ncolors: 15 \n" \
"*cycles: 1600 \n" \
"*size: -12 \n" \
"*ncolors: 15 \n" \
- "*neighbors: 0 \n"
+
#define UNIFORM_COLORS
#include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
#define UNIFORM_COLORS
#include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
@@
-109,17
+109,17
@@
static int neighbors;
static XrmOptionDescRec opts[] =
{
static XrmOptionDescRec opts[] =
{
- {
(char *) "-neighbors", (char *) ".loop.neighbors", XrmoptionSepArg, (caddr_t) NULL
}
+ {
"-neighbors", ".loop.neighbors", XrmoptionSepArg, 0
}
};
static argtype vars[] =
{
};
static argtype vars[] =
{
- {
(caddr_t *) & neighbors, (char *) "neighbors", (char *) "Neighbors", (char *)
DEF_NEIGHBORS, t_Int}
+ {
&neighbors, "neighbors", "Neighbors",
DEF_NEIGHBORS, t_Int}
};
static OptionStruct desc[] =
{
};
static OptionStruct desc[] =
{
- {
(char *) "-neighbors num", (char *)
"squares 4 or hexagons 6"}
+ {
"-neighbors num",
"squares 4 or hexagons 6"}
};
ModeSpecOpt loop_opts =
};
ModeSpecOpt loop_opts =
@@
-1140,7
+1140,7
@@
static void
init_adam(ModeInfo * mi)
{
loopstruct *lp = &loops[MI_SCREEN(mi)];
init_adam(ModeInfo * mi)
{
loopstruct *lp = &loops[MI_SCREEN(mi)];
- XPoint start
, dirx, diry
;
+ XPoint start
= { 0, 0 }, dirx = { 0, 0 }, diry = { 0, 0 }
;
int i, j, dir;
#ifdef DELAYDEBUGLOOP
int i, j, dir;
#ifdef DELAYDEBUGLOOP
@@
-1425,6
+1425,9
@@
release_loop(ModeInfo * mi)
}
}
}
}
+static void *stop_warning_about_triangleUnit_already;
+
+
void
init_loop(ModeInfo * mi)
{
void
init_loop(ModeInfo * mi)
{
@@
-1434,6
+1437,8
@@
init_loop(ModeInfo * mi)
loopstruct *lp;
XGCValues gcv;
loopstruct *lp;
XGCValues gcv;
+ stop_warning_about_triangleUnit_already = (void *) &triangleUnit;
+
if (loops == NULL) {
if ((loops = (loopstruct *) calloc(MI_NUM_SCREENS(mi),
sizeof (loopstruct))) == NULL)
if (loops == NULL) {
if ((loops = (loopstruct *) calloc(MI_NUM_SCREENS(mi),
sizeof (loopstruct))) == NULL)