projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.07.tar.gz
[xscreensaver]
/
hacks
/
imsmap.c
diff --git
a/hacks/imsmap.c
b/hacks/imsmap.c
index 6e1f31dded435a8f7bbc437cc2dead2c62546155..aeee0308526344d65c48482e31d6450bfea1b0f4 100644
(file)
--- a/
hacks/imsmap.c
+++ b/
hacks/imsmap.c
@@
-161,6
+161,9
@@
init_map (struct state *st)
if (mono_p)
st->flip_xy = 0;
if (mono_p)
st->flip_xy = 0;
+ else if (st->colors)
+ free_colors (st->dpy, st->cmap, st->colors, st->ncolors);
+ st->colors = 0;
st->ncolors = get_integer_resource (st->dpy, "ncolors", "Integer");
st->delay = get_integer_resource (st->dpy, "delay", "Integer");
st->ncolors = get_integer_resource (st->dpy, "ncolors", "Integer");
st->delay = get_integer_resource (st->dpy, "delay", "Integer");
@@
-183,10
+186,7
@@
init_map (struct state *st)
if (!mono_p)
{
if (!mono_p)
{
- if (st->colors)
- free_colors (st->dpy, st->cmap, st->colors, st->ncolors);
- else
- st->colors = (XColor *) malloc (st->ncolors * sizeof(*st->colors));
+ st->colors = (XColor *) malloc (st->ncolors * sizeof(*st->colors));
make_smooth_colormap (st->dpy, st->xgwa.visual, st->cmap,
st->colors, &st->ncolors,
make_smooth_colormap (st->dpy, st->xgwa.visual, st->cmap,
st->colors, &st->ncolors,
@@
-395,6
+395,7
@@
imsmap_free (Display *dpy, Window window, void *closure)
static const char *imsmap_defaults [] = {
".background: #000066",
".foreground: #FF00FF",
static const char *imsmap_defaults [] = {
".background: #000066",
".foreground: #FF00FF",
+ "*fpsSolid: true",
"*mode: random",
"*ncolors: 50",
"*iterations: 7",
"*mode: random",
"*ncolors: 50",
"*iterations: 7",
@@
-412,4
+413,4
@@
static XrmOptionDescRec imsmap_options [] = {
{ 0, 0, 0, 0 }
};
{ 0, 0, 0, 0 }
};
-XSCREENSAVER_MODULE ("IMSM
AP
", imsmap)
+XSCREENSAVER_MODULE ("IMSM
ap
", imsmap)