From 2954208d00d422b34fa3a69631b0a091f17a349d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 2 Dec 2020 08:23:52 +0100
Subject: 5.44

---
 hacks/config/README              |   4 +-
 hacks/config/bsod.xml            |   8 ++-
 hacks/config/deepstars.xml       |   2 +
 hacks/config/dnalogo.xml         |  12 ----
 hacks/config/etruscanvenus.xml   | 143 +++++++++++++++++++++++++++++++++++++++
 hacks/config/gibson.xml          |  65 ++++++++++++++++++
 hacks/config/hypertorus.xml      |   6 +-
 hacks/config/klein.xml           |  12 ++--
 hacks/config/projectiveplane.xml |   4 ++
 hacks/config/razzledazzle.xml    |   2 +-
 hacks/config/romanboy.xml        |   4 ++
 hacks/config/scooter.xml         |  42 ++++++++++++
 12 files changed, 281 insertions(+), 23 deletions(-)
 create mode 100644 hacks/config/etruscanvenus.xml
 create mode 100644 hacks/config/gibson.xml
 create mode 100644 hacks/config/scooter.xml

(limited to 'hacks/config')

diff --git a/hacks/config/README b/hacks/config/README
index 58c4195..5ba2e7b 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.43
-                               09-Jul-2019
+                              version 5.44
+                               20-Mar-2020
 
                      https://www.jwz.org/xscreensaver/
 
diff --git a/hacks/config/bsod.xml b/hacks/config/bsod.xml
index 0d18218..6a3ac4a 100644
--- a/hacks/config/bsod.xml
+++ b/hacks/config/bsod.xml
@@ -24,7 +24,7 @@
   <vgroup>
    <boolean id="amiga"      _label="AmigaDOS"       arg-unset="-no-amiga"/>
    <boolean id="glados"     _label="GLaDOS"         arg-unset="-no-glados"/>
-   <boolean id="android"    _label="Android"        arg-unset="-no-android"/>
+   <boolean id="android"    _label="Android"        arg-set="-android"/>
    <boolean id="apple2"     _label="Apple ]["       arg-unset="-no-apple2"/>
    <boolean id="ransomware" _label="Ransomware"     arg-unset="-no-ransomware"/>
   </vgroup>
@@ -43,19 +43,21 @@
    <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"/>
+   <boolean id="nintendo"   _label="Nintendo"       arg-unset="-no-nintendo"/>
   </vgroup>
   <vgroup>
+   <boolean id="tivo"       _label="Tivo"           arg-unset="-no-tivo"/>
+   <boolean id="vms"        _label="VMS"            arg-unset="-no-vms"/>
    <boolean id="bsd"        _label="BSD"            arg-set="-bsd"/>
    <boolean id="linux"      _label="Linux (fsck)"   arg-unset="-no-linux"/>
    <boolean id="sparclinux" _label="Linux (sparc)"  arg-set="-sparclinux"/>
-   <boolean id="hppalinux"  _label="Linux (hppa)"   arg-unset="-no-hppalinux"/>
   </vgroup>
   <vgroup>
+   <boolean id="hppalinux"  _label="Linux (hppa)"   arg-unset="-no-hppalinux"/>
    <boolean id="solaris"    _label="Solaris"        arg-unset="-no-solaris"/>
    <boolean id="sco"        _label="SCO"            arg-unset="-no-sco"/>
    <boolean id="hpux"       _label="HPUX"           arg-unset="-no-hpux"/>
diff --git a/hacks/config/deepstars.xml b/hacks/config/deepstars.xml
index e1118e2..d690d2d 100644
--- a/hacks/config/deepstars.xml
+++ b/hacks/config/deepstars.xml
@@ -19,6 +19,8 @@
           _label="Smear" _low-label="Low" _high-label="High"
           low="0.1" high="5.0" default="1.0"/>
 
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
   <xscreensaver-updater />
 
   <_description>
diff --git a/hacks/config/dnalogo.xml b/hacks/config/dnalogo.xml
index ac10f15..48cd2ee 100644
--- a/hacks/config/dnalogo.xml
+++ b/hacks/config/dnalogo.xml
@@ -33,18 +33,6 @@ DNA Lounge
         San Francisco, CA
         94103
 
-Codeword
-
-        Restaurant -- Bar -- Nightclub -- Cafe -- Est. 2015.
-
-        917 Folsom Street
-        San Francisco, CA
-        94107
-
-        https://www.dnalounge.com/
-        http://www.dnapizza.com/
-        https://www.codeword-sf.com/
-
 Written by Jamie Zawinski; 2001.
   </_description>
 </screensaver>
diff --git a/hacks/config/etruscanvenus.xml b/hacks/config/etruscanvenus.xml
new file mode 100644
index 0000000..090b102
--- /dev/null
+++ b/hacks/config/etruscanvenus.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<screensaver name="etruscanvenus" _label="EtruscanVenus" gl="yes">
+
+  <video href="https://www.youtube.com/watch?v=p3MgGyie6-I"/>
+
+  <command arg="-root"/>
+
+  <hgroup>
+    <select id="view-mode">
+      <option id="walk"      _label="Random motion"/>
+      <option id="walk"      _label="Walk"      arg-set="-view-mode walk"/>
+      <option id="turn"      _label="Turn"      arg-set="-view-mode turn"/>
+    </select>
+
+    <boolean id="orientation-marks" _label="Show orientation marks"
+              arg-set="-orientation-marks"/>
+  </hgroup>
+
+  <hgroup>
+    <boolean id="deform" _label="Deform the surface"
+              arg-unset="-no-deform"/>
+
+    <number id="deform-speed" type="slider" arg="-deformation-speed %"
+            _label="Deformation speed"
+            _low-label="1.0" _high-label="100.0"
+            low="1.0" high="100.0" default="10.0"/>
+
+    <number id="init-deform" type="slider" arg="-initial-deformation %"
+            _label="Initial deformation"
+            _low-label="0.0" _high-label="3999.0"
+            low="0.0" high="3999.0" default="0.0"/>
+  </hgroup>
+
+
+  <hgroup>
+
+    <vgroup>
+      <select id="display-mode">
+        <option id="random"      _label="Random surface"/>
+        <option id="wire"        _label="Wireframe mesh"      arg-set="-mode wireframe"/>
+        <option id="surface"     _label="Solid surface"       arg-set="-mode surface"/>
+        <option id="transparent" _label="Transparent surface" arg-set="-mode transparent"/>
+      </select>
+
+      <select id="appearance">
+        <option id="random" _label="Random pattern"/>
+        <option id="solid"  _label="Solid object"    arg-set="-appearance solid"/>
+        <option id="bands"  _label="Distance bands"  arg-set="-appearance distance-bands"/>
+        <option id="bands"  _label="Direction bands" arg-set="-appearance direction-bands"/>
+      </select>
+
+      <select id="colors">
+        <option id="random"   _label="Random coloration"/>
+        <option id="twosided" _label="One-sided"        arg-set="-colors one-sided"/>
+        <option id="twosided" _label="Two-sided"        arg-set="-colors two-sided"/>
+        <option id="rainbow"  _label="Distance colors"  arg-set="-colors distance"/>
+        <option id="rainbow"  _label="Direction colors" arg-set="-colors direction"/>
+      </select>
+
+      <boolean id="change-colors" _label="Change colors"
+                arg-unset="-no-change-colors"/>
+
+      <select id="projection">
+        <option id="random"       _label="Random Projection"/>
+        <option id="perspective"  _label="Perspective"  arg-set="-projection perspective"/>
+        <option id="orthographic" _label="Orthographic" arg-set="-projection orthographic"/>
+      </select>
+    </vgroup>
+
+    <vgroup>
+      <number id="speed-x" type="slider" arg="-speed-x %"
+              _label="X rotation speed"
+              _low-label="-4.0" _high-label="4.0"
+              low="-4.0" high="4.0" default="1.1"/>
+
+      <number id="speed-y" type="slider" arg="-speed-y %"
+              _label="Y rotation speed"
+              _low-label="-4.0" _high-label="4.0"
+              low="-4.0" high="4.0" default="1.3"/>
+
+      <number id="speed-z" type="slider" arg="-speed-z %"
+              _label="Z rotation speed"
+              _low-label="-4.0" _high-label="4.0"
+              low="-4.0" high="4.0" default="1.5"/>
+    </vgroup>
+
+    <vgroup>
+     <number id="walk-direction" type="slider" arg="-walk-direction %"
+             _label="Walking direction"
+             _low-label="-180.0" _high-label="180.0"
+             low="-180.0" high="180.0" default="83.0"/>
+
+     <number id="walk-speed" type="slider" arg="-walk-speed %"
+             _label="Walking speed"
+             _low-label="1.0" _high-label="100.0"
+             low="1.0" high="100.0" default="20.0"/>
+
+     <number id="delay" type="slider" arg="-delay %"
+             _label="Frame rate" _low-label="Low" _high-label="High"
+             low="0" high="100000" default="10000"
+             convert="invert"/>
+    </vgroup>
+
+    <vgroup>
+     <xscreensaver-updater />
+     <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+    </vgroup>
+
+  </hgroup>
+
+  <_description>
+A 3D immersion of of a Klein bottle that smoothly deforms between the
+Etruscan Venus surface, the Roman surface, the Boy surface, and the
+Ida surface.  Topologically, all surfaces are Klein bottles, even the
+Roman and Boy surfaces, which are doubly covered and therefore appear
+to be an immersed real projective plane.
+
+You can walk on the Klein bottle or rotate it in 3D.  Since all the
+surfaces except the Ida surfaces have points where the surface normal
+is not well defined for some points, walking is performed on the Ida
+surface.  Furthermore, it is possible to smoothly deform the surface
+between the Etruscan Venus surface, the Roman surface, the Boy
+surface, and the Ida surface surface while turning it.
+
+Inspired by George K. Francis's book "A Topological Picturebook",
+Springer, 1987, George K. Francis's paper "The Etruscan Venus" in
+P. Concus, R. Finn, and D. A. Hoffman: "Geometric Analysis and
+Computer Graphics", Springer, 1991, and a video entitled "The Etruscan
+Venus" by Donna J. Cox, George K. Francis, and Raymond L. Idaszak,
+presented at SIGGRAPH 1989.
+
+https://en.wikipedia.org/wiki/Boy%27s_surface
+https://en.wikipedia.org/wiki/Roman_surface
+https://en.wikipedia.org/wiki/Klein_bottle
+http://mathworld.wolfram.com/BoySurface.html
+http://mathworld.wolfram.com/RomanSurface.html
+http://mathworld.wolfram.com/EtruscanVenusSurface.html
+http://mathworld.wolfram.com/IdaSurface.html
+
+Written by Carsten Steger; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/gibson.xml b/hacks/config/gibson.xml
new file mode 100644
index 0000000..3e69a9c
--- /dev/null
+++ b/hacks/config/gibson.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="gibson" _label="Gibson" gl="yes">
+
+  <command arg="-root"/>
+
+  <video href="https://www.youtube.com/watch?v=_gOhMR3TrHA"/>
+
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="20000"
+            convert="invert"/>
+
+    <number id="speed" type="slider" arg="-speed %"
+            _label="Glyph speed" _low-label="Slow" _high-label="Fast"
+            low="0.1" high="8.0" default="1.0"/>
+   </vgroup>
+   <vgroup>
+    <number id="grid-width" type="spinbutton" arg="-grid-width %"
+            _label="Grid width" low="1" high="20" default="6"/>
+
+    <number id="grid-depth" type="spinbutton" arg="-grid-depth %"
+            _label="Grid depth" low="1" high="20" default="6"/>
+   </vgroup>
+   <vgroup>
+    <number id="grid-height" type="spinbutton" arg="-grid-height %"
+            _label="Tower depth" low="1" high="20" default="7"/>
+
+    <number id="spacing" type="spinbutton" arg="-spacing %"
+            _label="Tower spacing" low="1" high="5" default="2.0"/>
+
+    <number id="columns" type="spinbutton" arg="-columns %"
+            _label="Text columns" low="1" high="20" default="5"/>
+   </vgroup>
+  </hgroup>
+
+  <hgroup>
+   <boolean id="tex"     _label="Textured"  arg-unset="-no-texture"/>
+   <boolean id="wire"    _label="Wireframe"   arg-set="-wireframe"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+   <xscreensaver-updater />
+  </hgroup>
+
+  <_description>
+Hacking the Gibson, as per the 1995 classic film, HACKERS.
+
+Cereal Killer: "Oh yeah, you want a seriously righteous hack, you score
+one of those Gibsons, man.  You know, supercomputers they use to like,
+do physics, and look for oil and stuff?"
+
+Phantom Phreak: "Ain't no way, man, security's too tight. The big iron?"
+
+Zero Cool: "Maybe. But, if I were gonna hack some heavy metal, I'd, uh,
+work my way back through some low security, and try the back door."
+
+Cereal Killer: "Yeah but oh man, wouldn't you just love to get one of
+those Gibsons, baby? Ooooh!"
+
+Phantom Phreak: "Yo, who ate all of my fries?"
+
+Written by Jamie Zawinski; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/hypertorus.xml b/hacks/config/hypertorus.xml
index a82e090..899d0cb 100644
--- a/hacks/config/hypertorus.xml
+++ b/hacks/config/hypertorus.xml
@@ -40,10 +40,14 @@
     </select>
 
     <select id="colors">
-      <option id="twosided" _label="Two-sided" arg-set="-twosided"/>
+      <option id="onesided"   _label="One-sided" arg-set="-onesided"/>
+      <option id="twosided"   _label="Two-sided" arg-set="-twosided"/>
       <option id="colorwheel" _label="Color wheel"/>
     </select>
 
+    <boolean id="change-colors" _label="Change colors"
+              arg-set="-change-colors"/>
+
     <select id="projection3d">
       <option id="perspective-3d" _label="Perspective 3D"/>
       <option id="orthographic-3d" _label="Orthographic 3D"
diff --git a/hacks/config/klein.xml b/hacks/config/klein.xml
index 8a93c9e..4880eb0 100644
--- a/hacks/config/klein.xml
+++ b/hacks/config/klein.xml
@@ -8,10 +8,10 @@
 
   <hgroup>
     <select id="kleinbottle">
-      <option id="random"         _label="Random shape"/>
-      <option id="figure-8"       _label="Figure 8"       arg-set="-klein-bottle figure-8"/>
-      <option id="squeezed-torus" _label="Squeezed torus" arg-set="-klein-bottle squeezed-torus"/>
-      <option id="lawson"         _label="Lawson"         arg-set="-klein-bottle lawson"/>
+      <option id="random"        _label="Random shape"/>
+      <option id="figure-8"      _label="Figure 8"      arg-set="-klein-bottle figure-8"/>
+      <option id="pinched-torus" _label="Pinched torus" arg-set="-klein-bottle pinched-torus"/>
+      <option id="lawson"        _label="Lawson"        arg-set="-klein-bottle lawson"/>
     </select>
 
     <select id="view-mode">
@@ -41,11 +41,15 @@
 
     <select id="colors">
       <option id="random"   _label="Random coloration"/>
+      <option id="twosided" _label="One-sided"       arg-set="-colors one-sided"/>
       <option id="twosided" _label="Two-sided"       arg-set="-colors two-sided"/>
       <option id="rainbow"  _label="Rainbow colors"  arg-set="-colors rainbow"/>
       <option id="depth"    _label="4d depth colors" arg-set="-colors depth"/>
     </select>
 
+    <boolean id="change-colors" _label="Change colors"
+              arg-set="-change-colors"/>
+
     <select id="projection3d">
       <option id="random"          _label="Random 3D"/>
       <option id="perspective-3d"  _label="Perspective 3D"  arg-set="-projection-3d perspective"/>
diff --git a/hacks/config/projectiveplane.xml b/hacks/config/projectiveplane.xml
index fa9dfb8..996d010 100644
--- a/hacks/config/projectiveplane.xml
+++ b/hacks/config/projectiveplane.xml
@@ -23,12 +23,16 @@
 
     <select id="colors">
       <option id="random"   _label="Random coloration"/>
+      <option id="twosided" _label="One-sided"        arg-set="-colors one-sided"/>
       <option id="twosided" _label="Two-sided"        arg-set="-colors two-sided"/>
       <option id="rainbow"  _label="Distance colors"  arg-set="-colors distance"/>
       <option id="rainbow"  _label="Direction colors" arg-set="-colors direction"/>
       <option id="depth"    _label="4d depth colors"  arg-set="-colors depth"/>
     </select>
 
+    <boolean id="change-colors" _label="Change colors"
+              arg-set="-change-colors"/>
+
     <select id="projection3d">
       <option id="random"          _label="Random 3D"/>
       <option id="perspective-3d"  _label="Perspective 3D"  arg-set="-projection-3d perspective"/>
diff --git a/hacks/config/razzledazzle.xml b/hacks/config/razzledazzle.xml
index 1af07df..043788e 100644
--- a/hacks/config/razzledazzle.xml
+++ b/hacks/config/razzledazzle.xml
@@ -29,7 +29,7 @@
             low="1.0" high="10.0" default="5.0"/>
 
     <number id="thickness" type="slider" arg="-thickness %"
-            _label="Lines" _low-label="Thick" _high-label="Thin"
+            _label="Lines" _low-label="Thin" _high-label="Thick"
             low="0.05" high="1.0" default="0.1"/>
 
     <select id="object">
diff --git a/hacks/config/romanboy.xml b/hacks/config/romanboy.xml
index b2f6cb4..941317c 100644
--- a/hacks/config/romanboy.xml
+++ b/hacks/config/romanboy.xml
@@ -55,11 +55,15 @@
 
       <select id="colors">
         <option id="random"   _label="Random coloration"/>
+        <option id="twosided" _label="One-sided"        arg-set="-colors one-sided"/>
         <option id="twosided" _label="Two-sided"        arg-set="-colors two-sided"/>
         <option id="rainbow"  _label="Distance colors"  arg-set="-colors distance"/>
         <option id="rainbow"  _label="Direction colors" arg-set="-colors direction"/>
       </select>
 
+      <boolean id="change-colors" _label="Change colors"
+                arg-set="-change-colors"/>
+
       <select id="projection">
         <option id="random"          _label="Random Projection"/>
         <option id="perspective"  _label="Perspective"  arg-set="-projection perspective"/>
diff --git a/hacks/config/scooter.xml b/hacks/config/scooter.xml
new file mode 100644
index 0000000..72fe9b3
--- /dev/null
+++ b/hacks/config/scooter.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="scooter" _label="Scooter" gl="no">
+
+  <command arg="-root"/>
+
+  <video href="https://www.youtube.com/watch?v=Qqzk1BldlXg"/>
+
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="20000"
+            convert="invert"/>
+    <number id="cycles" type="slider" arg="-cycles %"
+            _label="Boat Speed" _low-label="Very slow" _high-label="Very fast"
+            low="0" high="1000" default="5"/>
+    <number id="count" type="slider" arg="-count %"
+            _label="Number of doors" _low-label="4" _high-label="40"
+            low="4" high="40" default="24"/>
+   </vgroup>
+   <vgroup>
+    <number id="size" type="slider" arg="-size %"
+            _label="Number of stars" _low-label="1" _high-label="200"
+            low="0" high="200" default="100"/>
+    <number id="ncolors" type="slider" arg="-ncolors %"
+            _label="Number of colors" _low-label="Mono" _high-label="Colorful"
+            low="0" high="200" default="200"/>
+
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+    <xscreensaver-updater />
+   </vgroup>
+  </hgroup>
+
+  <_description>
+Zooming down a tunnel in a star field.  Originally an Amiga hack.
+
+Written by Sven Thoennissen; 2001.
+Ported by EoflaOE; 2019.
+  </_description>
+</screensaver>
-- 
cgit v1.2.3-55-g7522