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
/
boxfit.c
diff --git
a/hacks/boxfit.c
b/hacks/boxfit.c
index 41878c0b5f52f52746b02d904975b19fb1ff6959..1fa42ca0e75d454d55e23bde6faf0965ec511683 100644
(file)
--- a/
hacks/boxfit.c
+++ b/
hacks/boxfit.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 2005
, 2006
Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2005
-2008
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-121,8
+121,10
@@
reset_boxes (state *st)
else
{
st->ncolors = get_integer_resource (st->dpy, "colors", "Colors"); /* re-get */
else
{
st->ncolors = get_integer_resource (st->dpy, "colors", "Colors"); /* re-get */
+ if (st->ncolors < 1) st->ncolors = 1;
make_smooth_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
st->colors, &st->ncolors, True, 0, False);
make_smooth_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
st->colors, &st->ncolors, True, 0, False);
+ if (st->ncolors < 1) abort();
XClearWindow (st->dpy, st->window);
}
}
XClearWindow (st->dpy, st->window);
}
}
@@
-518,6
+520,7
@@
boxfit_free (Display *dpy, Window window, void *closure)
static const char *boxfit_defaults [] = {
".background: black",
".foreground: #444444",
static const char *boxfit_defaults [] = {
".background: black",
".foreground: #444444",
+ "*fpsSolid: true",
"*delay: 20000",
"*mode: random",
"*colors: 64",
"*delay: 20000",
"*mode: random",
"*colors: 64",
@@
-551,4
+554,4
@@
static XrmOptionDescRec boxfit_options [] = {
};
};
-XSCREENSAVER_MODULE ("Box
f
it", boxfit)
+XSCREENSAVER_MODULE ("Box
F
it", boxfit)