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
/
gltext.c
diff --git
a/hacks/glx/gltext.c
b/hacks/glx/gltext.c
index a4d80b050edc1d93c392eba38163ecf14812a12a..cc39bc928fe3e5f8bd6ea79cf4a3f9f3bb225ac5 100644
(file)
--- a/
hacks/glx/gltext.c
+++ b/
hacks/glx/gltext.c
@@
-15,6
+15,7
@@
"*usePty: False \n" \
# define refresh_text 0
"*usePty: False \n" \
# define refresh_text 0
+# define release_text 0
#define SMOOTH_TUBE /* whether to have smooth or faceted tubes */
#ifdef SMOOTH_TUBE
#define SMOOTH_TUBE /* whether to have smooth or faceted tubes */
#ifdef SMOOTH_TUBE
@@
-316,20
+317,16
@@
text_handle_event (ModeInfo *mi, XEvent *event)
}
}
+static void free_text(ModeInfo * mi);
+
+
ENTRYPOINT void
init_text (ModeInfo *mi)
{
text_configuration *tp;
int i;
ENTRYPOINT void
init_text (ModeInfo *mi)
{
text_configuration *tp;
int i;
- if (!tps) {
- tps = (text_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (text_configuration));
- if (!tps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, tps, free_text);
tp = &tps[MI_SCREEN(mi)];
tp = &tps[MI_SCREEN(mi)];
@@
-627,21
+624,11
@@
draw_text (ModeInfo *mi)
}
ENTRYPOINT void
}
ENTRYPOINT void
-
releas
e_text(ModeInfo * mi)
+
fre
e_text(ModeInfo * mi)
{
{
- if (tps)
- {
- int screen;
- for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
- {
- text_configuration *tp = &tps[MI_SCREEN(mi)];
- if (tp->tc)
- textclient_close (tp->tc);
- }
- }
- (void) free(tps);
- tps = 0;
- FreeAllGL(mi);
+ text_configuration *tp = &tps[MI_SCREEN(mi)];
+ if (tp->tc)
+ textclient_close (tp->tc);
}
}