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.37.tar.gz
[xscreensaver]
/
hacks
/
glx
/
starwars.c
diff --git
a/hacks/glx/starwars.c
b/hacks/glx/starwars.c
index a726bb300a006840e5aaaed5db4b88575d70b9a1..9ee8cc3f05ed11e00cdb993ae1beeac83c0842d7 100644
(file)
--- a/
hacks/glx/starwars.c
+++ b/
hacks/glx/starwars.c
@@
-47,6
+47,7
@@
"*program: xscreensaver-text --cols 0" /* don't wrap */
# define refresh_sws 0
"*program: xscreensaver-text --cols 0" /* don't wrap */
# define refresh_sws 0
+# define release_sws 0
# define sws_handle_event 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define sws_handle_event 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-716,6
+717,9
@@
gl_init (ModeInfo *mi)
}
}
+static void free_sws (ModeInfo *mi);
+
+
ENTRYPOINT void
init_sws (ModeInfo *mi)
{
ENTRYPOINT void
init_sws (ModeInfo *mi)
{
@@
-723,14
+727,7
@@
init_sws (ModeInfo *mi)
sws_configuration *sc = 0;
sws_configuration *sc = 0;
- if (!scs) {
- scs = (sws_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (sws_configuration));
- if (!scs) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, scs, free_sws);
sc = &scs[MI_SCREEN(mi)];
sc = &scs[MI_SCREEN(mi)];
@@
-1054,22
+1051,14
@@
draw_sws (ModeInfo *mi)
sc->star_theta += star_spin;
}
sc->star_theta += star_spin;
}
-
ENTRYPOINT
void
-
releas
e_sws (ModeInfo *mi)
+
static
void
+
fre
e_sws (ModeInfo *mi)
{
{
- if (scs) {
- int screen;
- for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
- sws_configuration *sc = &scs[screen];
- if (sc->tc)
- textclient_close (sc->tc);
-
- /* #### there's more to free here */
- }
- free (scs);
- scs = 0;
- }
- FreeAllGL(mi);
+ sws_configuration *sc = &scs[MI_SCREEN(mi)];
+ if (sc->tc)
+ textclient_close (sc->tc);
+
+ /* #### there's more to free here */
}
}