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
/
dymaxionmap.c
diff --git
a/hacks/glx/dymaxionmap.c
b/hacks/glx/dymaxionmap.c
index 60fb94f60bcfef835785bf01361b54f11c09ffc5..60843e1aa7a507bd52a7604522acc369a3bf8350 100644
(file)
--- a/
hacks/glx/dymaxionmap.c
+++ b/
hacks/glx/dymaxionmap.c
@@
-21,7
+21,6
@@
"*showFPS: False \n" \
"*wireframe: False \n" \
"*labelFont: " LABEL_FONT "\n"
"*showFPS: False \n" \
"*wireframe: False \n" \
"*labelFont: " LABEL_FONT "\n"
-# define refresh_planet 0
# define release_planet 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# define release_planet 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@
-90,7
+89,7
@@
ENTRYPOINT ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars,
#ifdef USE_MODULES
ModStruct planet_description =
{"planet", "init_planet", "draw_planet", NULL,
#ifdef USE_MODULES
ModStruct planet_description =
{"planet", "init_planet", "draw_planet", NULL,
- "draw_planet", "init_planet",
NULL
, &planet_opts,
+ "draw_planet", "init_planet",
"free_planet"
, &planet_opts,
1000, 1, 2, 1, 4, 1.0, "",
"Buckminster Fuller's unwrapped icosahedral globe", 0, NULL};
#endif
1000, 1, 2, 1, 4, 1.0, "",
"Buckminster Fuller's unwrapped icosahedral globe", 0, NULL};
#endif
@@
-770,9
+769,6
@@
planet_handle_event (ModeInfo *mi, XEvent *event)
}
}
-static void free_planet (ModeInfo * mi);
-
-
ENTRYPOINT void
init_planet (ModeInfo * mi)
{
ENTRYPOINT void
init_planet (ModeInfo * mi)
{
@@
-780,7
+776,7
@@
init_planet (ModeInfo * mi)
int screen = MI_SCREEN(mi);
Bool wire = MI_IS_WIREFRAME(mi);
int screen = MI_SCREEN(mi);
Bool wire = MI_IS_WIREFRAME(mi);
- MI_INIT (mi, planets
, free_planet
);
+ MI_INIT (mi, planets);
gp = &planets[screen];
if ((gp->glx_context = init_GL(mi)) != NULL) {
gp = &planets[screen];
if ((gp->glx_context = init_GL(mi)) != NULL) {
@@
-1005,7
+1001,7
@@
draw_planet (ModeInfo * mi)
}
}
-
static
void
+
ENTRYPOINT
void
free_planet (ModeInfo * mi)
{
planetstruct *gp = &planets[MI_SCREEN(mi)];
free_planet (ModeInfo * mi)
{
planetstruct *gp = &planets[MI_SCREEN(mi)];