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
/
xflame.c
diff --git
a/hacks/xflame.c
b/hacks/xflame.c
index 717689baef0454673ef9c290f91b9e462c4fcf5c..2785fb816a49964161c9cdee4b4ae719d3307bc9 100644
(file)
--- a/
hacks/xflame.c
+++ b/
hacks/xflame.c
@@
-607,6
+607,10
@@
loadBitmap(struct state *st, int *w, int *h)
{
char *bitmap_name = get_string_resource (st->dpy, "bitmap", "Bitmap");
{
char *bitmap_name = get_string_resource (st->dpy, "bitmap", "Bitmap");
+#ifdef HAVE_COCOA
+ bitmap_name = "(default)"; /* #### always use builtin */
+#endif /* HAVE_COCOA */
+
if (!bitmap_name ||
!*bitmap_name ||
!strcmp(bitmap_name, "none"))
if (!bitmap_name ||
!*bitmap_name ||
!strcmp(bitmap_name, "none"))
@@
-770,6
+774,8
@@
xflame_free (Display *dpy, Window window, void *closure)
static const char *xflame_defaults [] = {
".background: black",
".foreground: #FFAF5F",
static const char *xflame_defaults [] = {
".background: black",
".foreground: #FFAF5F",
+ "*fpsTop: true",
+ "*fpsSolid: true",
"*bitmap: (default)",
"*bitmapBaseline: 20",
"*delay: 10000",
"*bitmap: (default)",
"*bitmapBaseline: 20",
"*delay: 10000",