summaryrefslogtreecommitdiffstats
path: root/hacks/cwaves.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:43:39 +0200
committerSimon Rettberg2021-04-07 13:38:37 +0200
commit38886de0c3e9ea5729ef23e4c653fa2822f52e8f (patch)
tree9b799c8c968a92cc77746a95e0e8bdd90b6b13c3 /hacks/cwaves.c
parentMaybe not remove, but ... (diff)
downloadxscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.tar.gz
xscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.tar.xz
xscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.zip
xscreensaver 6.00v28r1openslx
Diffstat (limited to 'hacks/cwaves.c')
-rw-r--r--hacks/cwaves.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hacks/cwaves.c b/hacks/cwaves.c
index b032626..3b93bb7 100644
--- a/hacks/cwaves.c
+++ b/hacks/cwaves.c
@@ -52,7 +52,8 @@ cwaves_init (Display *dpy, Window window)
XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
st->debug_p = get_boolean_resource (dpy, "debug", "Boolean");
- st->scale = get_integer_resource (dpy, "scale", "Integer");
+ /* Xft uses 'scale' */
+ st->scale = get_integer_resource (dpy, "waveScale", "Integer");
if (st->scale <= 0) st->scale = 1;
st->ncolors = get_integer_resource (dpy, "ncolors", "Integer");
if (st->ncolors < 4) st->ncolors = 4;
@@ -195,7 +196,7 @@ static const char *cwaves_defaults [] = {
".foreground: white",
"*ncolors: 600",
"*nwaves: 15",
- "*scale: 2",
+ "*waveScale: 2",
"*debug: False",
"*delay: 20000",
#ifdef HAVE_MOBILE
@@ -208,7 +209,7 @@ static XrmOptionDescRec cwaves_options [] = {
{ "-delay", ".delay", XrmoptionSepArg, 0 },
{ "-waves", ".nwaves", XrmoptionSepArg, 0 },
{ "-colors", ".ncolors", XrmoptionSepArg, 0 },
- { "-scale", ".scale", XrmoptionSepArg, 0 },
+ { "-scale", ".waveScale", XrmoptionSepArg, 0 },
{ "-debug", ".debug", XrmoptionNoArg, "True" },
{ 0, 0, 0, 0 }
};