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
/
splitflap.c
diff --git
a/hacks/glx/splitflap.c
b/hacks/glx/splitflap.c
index 922417545697afe9ac44d11c485523f20aa8fde3..35a05f929a0da9fdec6ffd6018ecbc6d931b7efa 100644
(file)
--- a/
hacks/glx/splitflap.c
+++ b/
hacks/glx/splitflap.c
@@
-27,6
+27,7
@@
"*usePty: False\n"
# define refresh_splitflap 0
"*usePty: False\n"
# define refresh_splitflap 0
+# define release_splitflap 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-292,6
+293,7
@@
parse_color (ModeInfo *mi, char *key, GLfloat color[4])
static int draw_outer_frame (ModeInfo *mi);
static int draw_outer_frame (ModeInfo *mi);
+static void free_splitflap (ModeInfo *mi);
ENTRYPOINT void
init_splitflap (ModeInfo *mi)
ENTRYPOINT void
init_splitflap (ModeInfo *mi)
@@
-299,14
+301,7
@@
init_splitflap (ModeInfo *mi)
splitflap_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
int i;
splitflap_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
int i;
- if (!bps) {
- bps = (splitflap_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (splitflap_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, bps, free_splitflap);
bp = &bps[MI_SCREEN(mi)];
bp->glx_context = init_GL(mi);
bp = &bps[MI_SCREEN(mi)];
bp->glx_context = init_GL(mi);
@@
-1400,8
+1395,8
@@
draw_splitflap (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
glXSwapBuffers(dpy, window);
}
-
ENTRYPOINT
void
-
releas
e_splitflap (ModeInfo *mi)
+
static
void
+
fre
e_splitflap (ModeInfo *mi)
{
splitflap_configuration *bp = &bps[MI_SCREEN(mi)];
if (bp->tc)
{
splitflap_configuration *bp = &bps[MI_SCREEN(mi)];
if (bp->tc)