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
/
mountain.c
diff --git
a/hacks/mountain.c
b/hacks/mountain.c
index 82d5fce7e82482c219083302113fe95badcf3cf0..541b18735beb798da4da25c08594b219e2521f27 100644
(file)
--- a/
hacks/mountain.c
+++ b/
hacks/mountain.c
@@
-35,6
+35,8
@@
static const char sccsid[] = "@(#)mountain.c 5.00 2000/11/01 xlockmore";
"*fpsSolid: true \n" \
# define SMOOTH_COLORS
"*fpsSolid: true \n" \
# define SMOOTH_COLORS
+# define release_mountain 0
+# define reshape_mountain 0
# define mountain_handle_event 0
# include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
# define mountain_handle_event 0
# include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
@@
-48,8
+50,8
@@
ENTRYPOINT ModeSpecOpt mountain_opts =
#ifdef USE_MODULES
ModStruct mountain_description =
#ifdef USE_MODULES
ModStruct mountain_description =
-{"mountain", "init_mountain", "draw_mountain",
"release_mountain"
,
- "refresh_mountain", "init_mountain",
(char *) NULL
, &mountain_opts,
+{"mountain", "init_mountain", "draw_mountain",
(char *) NULL
,
+ "refresh_mountain", "init_mountain",
"free_mountain"
, &mountain_opts,
1000, 30, 4000, 1, 64, 1.0, "",
"Shows Papo's mountain range", 0, NULL};
1000, 30, 4000, 1, 64, 1.0, "",
"Shows Papo's mountain range", 0, NULL};
@@
-169,11
+171,7
@@
init_mountain (ModeInfo * mi)
XGCValues gcv;
mountainstruct *mp;
XGCValues gcv;
mountainstruct *mp;
- if (mountains == NULL) {
- if ((mountains = (mountainstruct *) calloc(MI_NUM_SCREENS(mi),
- sizeof (mountainstruct))) == NULL)
- return;
- }
+ MI_INIT (mi, mountains);
mp = &mountains[MI_SCREEN(mi)];
mp->width = MI_WIDTH(mi);
mp = &mountains[MI_SCREEN(mi)];
mp->width = MI_WIDTH(mi);
@@
-255,30
+253,15
@@
draw_mountain (ModeInfo * mi)
}
ENTRYPOINT void
}
ENTRYPOINT void
-reshape_mountain(ModeInfo * mi, int width, int height)
-{
- XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
- init_mountain (mi);
-}
-
-
-ENTRYPOINT void
-release_mountain (ModeInfo * mi)
+free_mountain (ModeInfo * mi)
{
{
- if (mountains != NULL) {
- int screen;
-
- for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
- mountainstruct *mp = &mountains[screen];
+ mountainstruct *mp = &mountains[MI_SCREEN(mi)];
- if (mp->stippledGC)
- XFreeGC(MI_DISPLAY(mi), mp->stippledGC);
- }
- (void) free((void *) mountains);
- mountains = (mountainstruct *) NULL;
- }
+ if (mp->stippledGC)
+ XFreeGC(MI_DISPLAY(mi), mp->stippledGC);
}
}
+#ifndef STANDALONE
ENTRYPOINT void
refresh_mountain(ModeInfo * mi)
{
ENTRYPOINT void
refresh_mountain(ModeInfo * mi)
{
@@
-292,6
+275,7
@@
refresh_mountain(ModeInfo * mi)
mp->x = 0;
mp->y = 0;
}
mp->x = 0;
mp->y = 0;
}
+#endif
XSCREENSAVER_MODULE ("Mountain", mountain)
XSCREENSAVER_MODULE ("Mountain", mountain)