diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/config | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/config')
-rw-r--r-- | hacks/config/README | 4 | ||||
-rw-r--r-- | hacks/config/bsod.xml | 2 | ||||
-rw-r--r-- | hacks/config/handsy.xml | 58 | ||||
-rw-r--r-- | hacks/config/ripples.xml | 3 | ||||
-rw-r--r-- | hacks/config/unknownpleasures.xml | 19 |
5 files changed, 77 insertions, 9 deletions
diff --git a/hacks/config/README b/hacks/config/README index 9771a89..5981463 100644 --- a/hacks/config/README +++ b/hacks/config/README @@ -4,8 +4,8 @@ a screen saver and locker for the X window system by Jamie Zawinski - version 5.40 - 12-Aug-2018 + version 5.42 + 28-Dec-2018 https://www.jwz.org/xscreensaver/ diff --git a/hacks/config/bsod.xml b/hacks/config/bsod.xml index ef18e21..0d18218 100644 --- a/hacks/config/bsod.xml +++ b/hacks/config/bsod.xml @@ -40,12 +40,14 @@ <boolean id="atari" _label="Atari" arg-set="-atari"/> <boolean id="macx" _label="MacOS X" arg-unset="-no-macx"/> <boolean id="os390" _label="OS/390" arg-unset="-no-os390"/> + <boolean id="encom" _label="Encom" arg-unset="-no-encom"/> </vgroup> <vgroup> <boolean id="vms" _label="VMS" arg-unset="-no-vms"/> <boolean id="hvx" _label="HVX/GCOS6" arg-unset="-no-hvx"/> <boolean id="blitdamage" _label="NCD X Terminal " arg-unset="-no-blitdamage"/> <boolean id="atm" _label="ATM" arg-unset="-no-atm"/> + <boolean id="dvd" _label="DVD" arg-unset="-no-dvd"/> </vgroup> <vgroup> <boolean id="bsd" _label="BSD" arg-set="-bsd"/> diff --git a/hacks/config/handsy.xml b/hacks/config/handsy.xml new file mode 100644 index 0000000..2ff9608 --- /dev/null +++ b/hacks/config/handsy.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<screensaver name="handsy" _label="Handsy" gl="yes"> + + <command arg="-root"/> + + <video href="https://www.youtube.com/watch?v=awI8EawYTdE"/> + + <hgroup> + <vgroup> + <number id="delay" type="slider" arg="-delay %" + _label="Frame rate" _low-label="Low" _high-label="High" + low="0" high="100000" default="30000" + convert="invert"/> + + <number id="speed" type="slider" arg="-speed %" + _label="Speed" _low-label="Slow" _high-label="Fast" + low="0.05" high="2.0" default="1.0"/> + + <number id="count" type="slider" arg="-count %" + _label="Number of hands" _low-label="Two" _high-label="Many" + low="2" high="32" default="2"/> + </vgroup> + + <vgroup> + + <boolean id="wander" _label="Wander" arg-unset="-no-wander"/> + <select id="rotation"> + <option id="no" _label="Don't rotate" arg-set="-spin 0"/> + <option id="x" _label="Rotate around X axis" arg-set="-spin X"/> + <option id="y" _label="Rotate around Y axis" arg-set="-spin Y"/> + <option id="z" _label="Rotate around Z axis" arg-set="-spin Z"/> + <option id="xy" _label="Rotate around X and Y axes"/> + <option id="xz" _label="Rotate around X and Z axes" arg-set="-spin XZ"/> + <option id="yz" _label="Rotate around Y and Z axes" arg-set="-spin YZ"/> + <option id="xyz" _label="Rotate around all three axes" arg-set="-spin XYZ"/> + </select> + + <select id="facing"> + <option id="front" _label="Always face front"/> + <option id="nofront" _label="Spin all the way around" arg-set="-no-front"/> + </select> + + <hgroup> + <boolean id="wire" _label="Wireframe" arg-set="-wireframe"/> + <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/> + </hgroup> + + <xscreensaver-updater /> + </vgroup> + </hgroup> + + <_description> +A set of robotic hands communicate non-verbally. + +Written by Jamie Zawinski; 2018. + </_description> +</screensaver> diff --git a/hacks/config/ripples.xml b/hacks/config/ripples.xml index 191e041..8a2e1be 100644 --- a/hacks/config/ripples.xml +++ b/hacks/config/ripples.xml @@ -24,8 +24,7 @@ <number id="fluidity" type="slider" arg="-fluidity %" _label="Fluidity" _low-label="Small drops" _high-label="Big drops" - low="0" high="16" default="6" - convert="invert"/> + low="0" high="16" default="6"/> </vgroup> <vgroup> diff --git a/hacks/config/unknownpleasures.xml b/hacks/config/unknownpleasures.xml index 7ef79ac..0730599 100644 --- a/hacks/config/unknownpleasures.xml +++ b/hacks/config/unknownpleasures.xml @@ -4,7 +4,7 @@ <command arg="-root"/> - <video href="https://www.youtube.com/watch?v=vuWhUxBq99E"/> + <video href="https://www.youtube.com/watch?v=DEWPiUbwnt0"/> <hgroup> <vgroup> @@ -16,22 +16,31 @@ <number id="count" type="slider" arg="-count %" _label="Scanlines" _low-label="Few" _high-label="Many" low="3" high="200" default="80"/> - </vgroup> - <vgroup> <number id="speed" type="slider" arg="-speed %" _label="Speed" _low-label="Slow" _high-label="Fast" - low="0.1" high="3.0" default="1.0"/> + low="0.1" high="20.0" default="1.0"/> + </vgroup> + <vgroup> <number id="resolution" type="slider" arg="-resolution %" _label="Resolution" _low-label="Low" _high-label="High" low="5" high="300" default="100"/> + + <number id="amplitude" type="slider" arg="-amplitude %" + _label="Amplitude" _low-label="Low" _high-label="High" + low="0.01" high="0.25" default="0.13"/> + + <number id="noise" type="slider" arg="-noise %" + _label="Noise" _low-label="Low" _high-label="High" + low="0.0" high="3.0" default="1.0"/> </vgroup> </hgroup> <hgroup> <boolean id="ortho" _label="Orthographic Projection" arg-unset="-no-ortho"/> - <boolean id="wire" _label="Wireframe" arg-set="-wireframe"/> + <boolean id="buzz" _label="Buzz" arg-set="-buzz"/> + <boolean id="wire" _label="Wireframe" arg-set="-wireframe"/> <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/> </hgroup> |