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
/
glx
/
crackberg.c
diff --git
a/hacks/glx/crackberg.c
b/hacks/glx/crackberg.c
index 85c6294090da6a632c0748da872cba5d48084a65..74c691570e2b46d87c2b23303cb353bf4dd25fa2 100644
(file)
--- a/
hacks/glx/crackberg.c
+++ b/
hacks/glx/crackberg.c
@@
-1,7
+1,7
@@
/***************************
** crackberg; Matus Telgarsky [ catachresis@cmu.edu ] 2005
** */
/***************************
** crackberg; Matus Telgarsky [ catachresis@cmu.edu ] 2005
** */
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
# define XK_MISCELLANY
# include <X11/keysymdef.h>
#endif
# define XK_MISCELLANY
# include <X11/keysymdef.h>
#endif
@@
-10,7
+10,7
@@
"*showFPS: False \n" \
"*wireframe: False \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define re
fresh
_crackberg 0
+# define re
lease
_crackberg 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-1171,18
+1171,13
@@
ENTRYPOINT void init_crackberg (ModeInfo *mi)
{
cberg_state *cberg;
{
cberg_state *cberg;
- if (!cbergs) {
- nsubdivs %= 16; /* just in case.. */
+ nsubdivs %= 16; /* just in case.. */
- if ( !(cbergs = calloc(MI_NUM_SCREENS(mi), sizeof(cberg_state)))) {
- perror(progname);
- exit(1);
- }
+ MI_INIT(mi, cbergs);
- if (visibility > 1.0 || visibility < 0.2) {
- printf("visibility must be in range [0.2 .. 1.0]\n");
- visibility = 1.0;
- }
+ if (visibility > 1.0 || visibility < 0.2) {
+ printf("visibility must be in range [0.2 .. 1.0]\n");
+ visibility = 1.0;
}
cberg = &cbergs[MI_SCREEN(mi)];
}
cberg = &cbergs[MI_SCREEN(mi)];
@@
-1460,19
+1455,12
@@
ENTRYPOINT void draw_crackberg (ModeInfo *mi)
}
/* uh */
}
/* uh */
-ENTRYPOINT void
releas
e_crackberg (ModeInfo *mi)
+ENTRYPOINT void
fre
e_crackberg (ModeInfo *mi)
{
{
- if (cbergs) {
- int screen;
- for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
- cberg_state *cberg = &cbergs[screen];
- if (cberg->norms)
- free(cberg->norms);
- free(cberg->heights);
- }
- free (cbergs);
- cbergs = 0;
- }
+ cberg_state *cberg = &cbergs[MI_SCREEN(mi)];
+ if (cberg->norms)
+ free(cberg->norms);
+ free(cberg->heights);
}
XSCREENSAVER_MODULE ("Crackberg", crackberg)
}
XSCREENSAVER_MODULE ("Crackberg", crackberg)