]> git.madduck.net Git - etc/xscreensaver.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

recreate configuration file wit xs-demo to fix glslideshow
authormartin f. krafft <madduck@madduck.net>
Wed, 28 Nov 2012 19:06:28 +0000 (20:06 +0100)
committermartin f. krafft <madduck@madduck.net>
Wed, 28 Nov 2012 19:06:28 +0000 (20:06 +0100)
.xscreensaver

index 71bcaed3f748fd904efc5e90ad990595aedd6ffa..f05ed2226202c54ec170c0dd99d6b1a60c788645 100644 (file)
@@ -1,5 +1,5 @@
 # XScreenSaver Preferences File
 # XScreenSaver Preferences File
-# Written by xscreensaver-demo 5.11 for madduck on Wed Oct  6 11:13:34 2010.
+# Written by xscreensaver-demo 5.15 for madduck on Wed Nov 28 20:01:46 2012.
 # http://www.jwz.org/xscreensaver/
 
 timeout:       0:03:00
 # http://www.jwz.org/xscreensaver/
 
 timeout:       0:03:00
@@ -25,294 +25,224 @@ captureStderr:    True
 ignoreUninstalledPrograms:False
 font:          *-medium-r-*-140-*-m-*
 dpmsEnabled:   True
 ignoreUninstalledPrograms:False
 font:          *-medium-r-*-140-*-m-*
 dpmsEnabled:   True
+dpmsQuickOff:  False
 dpmsStandby:   2:00:00
 dpmsSuspend:   2:00:00
 dpmsOff:       4:00:00
 grabDesktopImages:  False
 grabVideoFrames:    False
 dpmsStandby:   2:00:00
 dpmsSuspend:   2:00:00
 dpmsOff:       4:00:00
 grabDesktopImages:  False
 grabVideoFrames:    False
-chooseRandomImages: False
-imageDirectory:        
+chooseRandomImages: True
+imageDirectory:        /home/madduck/photos/veronika/selection
 
 
-mode:          blank
-selected:      202
+mode:          one
+selected:      142
 
 
-textMode:      file
+textMode:      program
 textLiteral:   XScreenSaver
 textFile:      
 textProgram:   fortune
 textURL:       http://planet.debian.org/rss20.xml
 
 programs:                                                                    \
 textLiteral:   XScreenSaver
 textFile:      
 textProgram:   fortune
 textURL:       http://planet.debian.org/rss20.xml
 
 programs:                                                                    \
-                "Qix (solid)"  qix -root -solid -segments 100              \n\
-          "Qix (transparent)"  qix -root -count 4 -solid -transparent      \n\
-               "Qix (linear)"  qix -root -count 5 -solid -transparent        \
-                                 -linear -segments 250 -size 100           \n\
-         "Attraction (balls)"  attraction -root -mode balls                \n\
-         "Attraction (lines)"  attraction -root -mode lines -points 3        \
-                                 -segments 200                             \n\
--      "Attraction (splines)"  attraction -root -mode splines -segments      \
-                                 300                                       \n\
--      "Attraction (orbital)"  attraction -root -mode lines -radius 300      \
-                                 -orbit -vmult 0.5                         \n\
-                               pyro -root                                  \n\
-                               rocks -root                                 \n\
+                               maze -root                                  \n\
+  GL:                          superquadrics -root                         \n\
+                               attraction -root                            \n\
+                               blitspin -root                              \n\
+                               greynetic -root                             \n\
                                helix -root                                 \n\
                                helix -root                                 \n\
-                               pedal -root                                 \n\
-                               rorschach -root                             \n\
                                hopalong -root                              \n\
                                hopalong -root                              \n\
-                               greynetic -root                             \n\
                                imsmap -root                                \n\
                                imsmap -root                                \n\
-                               slidescreen -root                           \n\
+-                              noseguy -root                               \n\
+-                              pyro -root                                  \n\
+                               qix -root                                   \n\
+-                              rocks -root                                 \n\
+                               rorschach -root                             \n\
                                decayscreen -root                           \n\
                                decayscreen -root                           \n\
-                               jigsaw -root                                \n\
-                               blitspin -root                              \n\
-                               slip -root                                  \n\
-                               distort -root                               \n\
-                               spotlight -root                             \n\
-             "Ripples (stir)"  ripples -root -oily -light 2 -stir          \n\
-          "Ripples (desktop)"  ripples -root -water -light 6               \n\
-                               hypercube -root                             \n\
--                              hyperball -root                             \n\
-                               halo -root                                  \n\
-                               maze -root                                  \n\
-                               noseguy -root                               \n\
                                flame -root                                 \n\
                                flame -root                                 \n\
--                              lmorph -root                                \n\
+                               halo -root                                  \n\
+                               slidescreen -root                           \n\
+                               pedal -root                                 \n\
+                               bouboule -root                              \n\
+-                              braid -root                                 \n\
+                               coral -root                                 \n\
                                deco -root                                  \n\
                                deco -root                                  \n\
-                               moire -root                                 \n\
-                               moire2 -root                                \n\
-                               lightning -root                             \n\
-                               strange -root                               \n\
--                              spiral -root                                \n\
-                               laser -root                                 \n\
-                               grav -root                                  \n\
                                drift -root                                 \n\
                                drift -root                                 \n\
+-                              fadeplot -root                              \n\
+                               galaxy -root                                \n\
+                               goop -root                                  \n\
+                               grav -root                                  \n\
                                ifs -root                                   \n\
                                ifs -root                                   \n\
+  GL:                          jigsaw -root                                \n\
                                julia -root                                 \n\
                                julia -root                                 \n\
+-                              kaleidescope -root                          \n\
+  GL:                          moebius -root                               \n\
+                               moire -root                                 \n\
+  GL:                          morph3d -root                               \n\
+                               mountain -root                              \n\
+                               munch -root                                 \n\
                                penrose -root                               \n\
                                penrose -root                               \n\
+  GL:                          pipes -root                                 \n\
+                               rd-bomb -root                               \n\
+  GL:                          rubik -root                                 \n\
 -                              sierpinski -root                            \n\
 -                              sierpinski -root                            \n\
-                               braid -root                                 \n\
-                               galaxy -root                                \n\
-                               bouboule -root                              \n\
-                               swirl -root                                 \n\
-                               flag -root                                  \n\
-                               sphere -root                                \n\
-                               forest -root                                \n\
--                              lisa -root                                  \n\
--                              lissie -root                                \n\
-                               goop -root                                  \n\
+                               slip -root                                  \n\
+  GL:                          sproingies -root                            \n\
                                starfish -root                              \n\
                                starfish -root                              \n\
-                               munch -root                                 \n\
-                               mismunch -root                              \n\
-                               fadeplot -root                              \n\
-                               coral -root                                 \n\
-                               mountain -root                              \n\
+                               strange -root                               \n\
+                               swirl -root                                 \n\
                                triangle -root                              \n\
                                triangle -root                              \n\
--                              worm -root                                  \n\
--                              rotor -root                                 \n\
--                              demon -root                                 \n\
--                              loop -root                                  \n\
--                              vines -root                                 \n\
-                               kaleidescope -root                          \n\
                                xjack -root                                 \n\
                                xlyap -root                                 \n\
                                xjack -root                                 \n\
                                xlyap -root                                 \n\
+  GL:                          atlantis -root                              \n\
+                               bsod -root                                  \n\
+  GL:                          bubble3d -root                              \n\
+  GL:                          cage -root                                  \n\
+-                              crystal -root                               \n\
                                cynosure -root                              \n\
                                cynosure -root                              \n\
-                               flow -root                                  \n\
+                               discrete -root                              \n\
+                               distort -root                               \n\
                                epicycle -root                              \n\
                                epicycle -root                              \n\
+                               flow -root                                  \n\
+- GL:                          glplanet -root                              \n\
                                interference -root                          \n\
                                interference -root                          \n\
-                               truchet -root                               \n\
-                               bsod -root                                  \n\
-                               crystal -root                               \n\
-                               discrete -root                              \n\
                                kumppa -root                                \n\
                                kumppa -root                                \n\
-                               rd-bomb -root                               \n\
-           "RD-Bomb (mobile)"  rd-bomb -root -speed 1 -size 0.1            \n\
-                               sonar -root                                 \n\
-                               t3d -root                                   \n\
-                               penetrate -root                             \n\
-                               deluxe -root                                \n\
+  GL:                          lament -root                                \n\
+                               moire2 -root                                \n\
+  GL:                          sonar -root                                 \n\
+  GL:                          stairs -root                                \n\
+                               truchet -root                               \n\
+-                              vidwhacker -root                            \n\
+                               blaster -root                               \n\
+                               bumps -root                                 \n\
+                               ccurve -root                                \n\
                                compass -root                               \n\
                                compass -root                               \n\
+                               deluxe -root                                \n\
+-                              demon -root                                 \n\
+  GL:                          extrusion -root                             \n\
+-                              loop -root                                  \n\
+                               penetrate -root                             \n\
+                               petri -root                                 \n\
+                               phosphor -root                              \n\
+  GL:                          pulsar -root                                \n\
+                               ripples -root                               \n\
+                               shadebobs -root                             \n\
+  GL:                          sierpinski3d -root                          \n\
+                               spotlight -root                             \n\
                                squiral -root                               \n\
                                squiral -root                               \n\
-                               xflame -root                                \n\
                                wander -root                                \n\
                                wander -root                                \n\
-             "Wander (spots)"  wander -root -advance 0 -size 10 -circles     \
-                                 -length 10000 -reset 100000               \n\
--                              critical -root                              \n\
-                               phosphor -root                              \n\
+-                              webcollage -root                            \n\
+                               xflame -root                                \n\
                                xmatrix -root                               \n\
                                xmatrix -root                               \n\
-                               petri -root                                 \n\
-                    "Petri 2"  petri -root -minlifespeed 0.02                \
-                                 -maxlifespeed 0.03 -minlifespan 1           \
-                                 -maxlifespan 1 -instantdeathchan 0          \
-                                 -minorchan 0 -anychan 0.3                 \n\
-                               shadebobs -root                             \n\
-                               ccurve -root                                \n\
-                               blaster -root                               \n\
-                               bumps -root                                 \n\
-                               xanalogtv -root                             \n\
-                               xspirograph -root                           \n\
-                               nerverot -root                              \n\
+  GL:                          gflux -root                                 \n\
+-                              nerverot -root                              \n\
                                xrayswarm -root                             \n\
                                xrayswarm -root                             \n\
--            "Zoom (Fatbits)"  zoom -root                                  \n\
-              "Zoom (Lenses)"  zoom -root -lenses                          \n\
+                               xspirograph -root                           \n\
+  GL:                          circuit -root                               \n\
+  GL:                          dangerball -root                            \n\
+  GL:                          engine -root                                \n\
+  GL:                          flipscreen3d -root                          \n\
+  GL:                          gltext -root                                \n\
+  GL:                          menger -root                                \n\
+  GL:                          molecule -root                              \n\
                                rotzoomer -root                             \n\
                                rotzoomer -root                             \n\
-                               whirlwindwarp -root                         \n\
-                               whirlygig -root                             \n\
                                speedmine -root                             \n\
                                speedmine -root                             \n\
-                  "SpeedWorm"  speedmine -root -worm                       \n\
+  GL:                          starwars -root                              \n\
+  GL:                          stonerview -root                            \n\
                                vermiculate -root                           \n\
                                vermiculate -root                           \n\
-                               twang -root                                 \n\
+                               whirlwindwarp -root                         \n\
+                               zoom -root                                  \n\
+                               anemone -root                               \n\
                                apollonian -root                            \n\
                                apollonian -root                            \n\
+  GL:                          boxed -root                                 \n\
+  GL:                          cubenetic -root                             \n\
+  GL:                          endgame -root                               \n\
                                euler2d -root                               \n\
                                euler2d -root                               \n\
-            "Euler2d (dense)"  euler2d -root -count 4000 -eulertail 400      \
-                                 -ncolors 230                              \n\
--                              juggle -root                                \n\
-                               polyominoes -root                           \n\
--                              thornbird -root                             \n\
                                fluidballs -root                            \n\
                                fluidballs -root                            \n\
-                               anemone -root                               \n\
-                               halftone -root                              \n\
-                               metaballs -root                             \n\
-                               eruption -root                              \n\
-                               popsquares -root                            \n\
-                               barcode -root                               \n\
-                               piecewise -root                             \n\
-                               cloudlife -root                             \n\
-                               fontglide -root                             \n\
-                               apple2 -root                                \n\
-                               bubbles -root                               \n\
-                               pong -root                                  \n\
-                               wormhole -root                              \n\
-                               pacman -root                                \n\
-                               fuzzyflakes -root                           \n\
-                               anemotaxis -root                            \n\
-                               memscroller -root                           \n\
-                               substrate -root                             \n\
-                               intermomentary -root                        \n\
-                               interaggregate -root                        \n\
-                               fireworkx -root                             \n\
-                               fiberlamp -root                             \n\
-                               boxfit -root                                \n\
-                               celtic -root                                \n\
-                               cwaves -root                                \n\
-                               m6502 -root                                 \n\
-                               abstractile -root                           \n\
--                              lcdscrub -root                              \n\
-- default-n:                   webcollage -root                            \n\
-- default-n:  "WebCollage (whacked)"                                         \
-                                 webcollage -root -filter 'vidwhacker        \
-                                 -stdin -stdout'                           \n\
-- default-n:                   vidwhacker -root                            \n\
-  GL:                          gears -root                                 \n\
-  GL:                          superquadrics -root                         \n\
-  GL:                          morph3d -root                               \n\
-  GL:                          cage -root                                  \n\
-  GL:                          moebius -root                               \n\
-  GL:                          stairs -root                                \n\
-  GL:                          pipes -root                                 \n\
-  GL:                          sproingies -root                            \n\
-  GL:                          rubik -root                                 \n\
-  GL:                          atlantis -root                              \n\
-  GL:                          lament -root                                \n\
-  GL:                          bubble3d -root                              \n\
-  GL:                          glplanet -root                              \n\
   GL:                          flurry -root                                \n\
   GL:                          flurry -root                                \n\
-  GL:                          pulsar -root                                \n\
-- GL:     "Pulsar (textures)"  pulsar -root -texture -mipmap                 \
-                                 -texture_quality -light -fog              \n\
-  GL:                          extrusion -root                             \n\
-  GL:                          sierpinski3d -root                          \n\
-  GL:                          menger -root                                \n\
-  GL:                          gflux -root                                 \n\
-  GL:          "GFlux (grab)"  gflux -root -mode grab                      \n\
-  GL:                          stonerview -root                            \n\
-  GL:                          starwars -root                              \n\
-  GL:                          gltext -root                                \n\
-  GL:        "GLText (clock)"  gltext -text "%A%n%d %b %Y%n%r" -root       \n\
-  GL:                          molecule -root                              \n\
-  GL:                          dangerball -root                            \n\
-  GL:                          circuit -root                               \n\
-  GL:                          engine -root                                \n\
-  GL:                          flipscreen3d -root                          \n\
+- GL:                          glblur -root                                \n\
   GL:                          glsnake -root                               \n\
   GL:                          glsnake -root                               \n\
-  GL:                          boxed -root                                 \n\
-- GL:                          glforestfire -root                          \n\
-- GL:   "GLForestFire (rain)"  glforestfire -root -count 0                 \n\
-- GL:                          sballs -root                                \n\
-  GL:                          cubenetic -root                             \n\
-  GL:                          spheremonics -root                          \n\
+                               halftone -root                              \n\
+  GL:                          juggler3d -root                             \n\
   GL:                          lavalite -root                              \n\
   GL:                          lavalite -root                              \n\
+-                              polyominoes -root                           \n\
   GL:                          queens -root                                \n\
   GL:                          queens -root                                \n\
-  GL:                          endgame -root                               \n\
-- GL:                          glblur -root                                \n\
+- GL:                          sballs -root                                \n\
+  GL:                          spheremonics -root                          \n\
+-                              thornbird -root                             \n\
+                               twang -root                                 \n\
+- GL:                          antspotlight -root                          \n\
+                               apple2 -root                                \n\
   GL:                          atunnel -root                               \n\
   GL:                          atunnel -root                               \n\
-  GL:                          flyingtoasters -root                        \n\
+                               barcode -root                               \n\
+  GL:                          blinkbox -root                              \n\
+  GL:                          blocktube -root                             \n\
   GL:                          bouncingcow -root                           \n\
   GL:                          bouncingcow -root                           \n\
-  GL:                          jigglypuff -root                            \n\
-  GL:                          klein -root                                 \n\
-  GL:                          hypertorus -root                            \n\
-  GL:                          glmatrix -root                              \n\
+                               cloudlife -root                             \n\
   GL:                          cubestorm -root                             \n\
   GL:                          cubestorm -root                             \n\
-  GL:                          glknots -root                               \n\
-  GL:                          blocktube -root                             \n\
+                               eruption -root                              \n\
   GL:                          flipflop -root                              \n\
   GL:                          flipflop -root                              \n\
-  GL:                          antspotlight -root                          \n\
-- GL:                          glslideshow -root                           \n\
-  GL:                          polytopes -root                             \n\
+  GL:                          flyingtoasters -root                        \n\
+                               fontglide -root                             \n\
   GL:                          gleidescope -root                           \n\
   GL:                          gleidescope -root                           \n\
-- GL:                          mirrorblob -root                            \n\
-  GL: "MirrorBlob (color only)" mirrorblob -root -colour -no-texture       \n\
-  GL:                          blinkbox -root                              \n\
+  GL:                          glknots -root                               \n\
+  GL:                          glmatrix -root                              \n\
+- GL:                          glslideshow -root -duration 10 -pan 10 -no-letterbox    \n\
+  GL:                          hypertorus -root                            \n\
+- GL:                          jigglypuff -root                            \n\
+                               metaballs -root                             \n\
+  GL:                          mirrorblob -root                            \n\
+                               piecewise -root                             \n\
+  GL:                          polytopes -root                             \n\
+                               pong -root                                  \n\
+                               popsquares -root                            \n\
+  GL:                          surfaces -root                              \n\
+                               xanalogtv -root                             \n\
+-                              abstractile -root                           \n\
+                               anemotaxis -root                            \n\
+- GL:                          antinspect -root                            \n\
+                               fireworkx -root                             \n\
+                               fuzzyflakes -root                           \n\
+                               interaggregate -root                        \n\
+                               intermomentary -root                        \n\
+                               memscroller -root                           \n\
   GL:                          noof -root                                  \n\
   GL:                          noof -root                                  \n\
+                               pacman -root                                \n\
+  GL:                          pinion -root                                \n\
   GL:                          polyhedra -root                             \n\
   GL:                          polyhedra -root                             \n\
-- GL:                          antinspect -root                            \n\
-  GL:                          providence -root                            \n\
-  GL:  "Pinion (large gears)"  pinion -root                                \n\
-  GL:  "Pinion (small gears)"  pinion -root -size 0.2 -scroll 0.3          \n\
-  GL:                          boing -root -lighting -smooth               \n\
-- GL:                          carousel -root                              \n\
-  GL:                          fliptext -root                              \n\
+- GL:                          providence -root                            \n\
+                               substrate -root                             \n\
+                               wormhole -root                              \n\
 - GL:                          antmaze -root                               \n\
 - GL:                          antmaze -root                               \n\
-  GL:                          tangram -root                               \n\
+  GL:                          boing -root                                 \n\
+                               boxfit -root                                \n\
+  GL:                          carousel -root                              \n\
+                               celtic -root                                \n\
   GL:                          crackberg -root                             \n\
   GL:                          crackberg -root                             \n\
-  GL:                          glhanoi -root                               \n\
   GL:                          cube21 -root                                \n\
   GL:                          cube21 -root                                \n\
+                               fiberlamp -root                             \n\
+  GL:                          fliptext -root                              \n\
+  GL:                          glhanoi -root                               \n\
+  GL:                          tangram -root                               \n\
   GL:                          timetunnel -root                            \n\
   GL:                          timetunnel -root                            \n\
-  GL:                          juggler3d -root                             \n\
-  GL:                          topblock -root                              \n\
   GL:                          glschool -root                              \n\
   GL:                          glschool -root                              \n\
+  GL:                          topblock -root                              \n\
+  GL:                          cubicgrid -root                             \n\
+                               cwaves -root                                \n\
+  GL:                          gears -root                                 \n\
   GL:                          glcells -root                               \n\
   GL:                          glcells -root                               \n\
-  GL:                          voronoi -root                               \n\
-  GL:                          moebiusgears -root                          \n\
   GL:                          lockward -root                              \n\
   GL:                          lockward -root                              \n\
-  GL:                          cubicgrid -root                             \n\
+                               m6502 -root                                 \n\
+  GL:                          moebiusgears -root                          \n\
+  GL:                          voronoi -root                               \n\
   GL:                          hypnowheel -root                            \n\
   GL:                          hypnowheel -root                            \n\
-  GL:    "Hypnowheel (dense)"  hypnowheel -root -count 3 -layers 50        \n\
-  GL:  "Hypnowheel (trifoil)"  hypnowheel -root -count 3 -layers 2           \
-                                 -speed 9 -twist 9 -wander                 \n\
--                              xdaliclock -root -font BUILTIN3             \n\
--                              xplanet -vroot -wait 1 -timewarp 90000        \
-                                 -label -origin moon                       \n\
--                              xmountains -b -M -Z 0 -r 1                  \n\
--          "XMountains (top)"  xmountains -b -M -Z 0 -r 1 -m               \n\
--                              xaos -root -autopilot -nogui -delay 10000     \
-                                 -maxframerate 30 -incoloring -1             \
-                                 -outcoloring -1                           \n\
--                              xsnow -root                                 \n\
--                              goban -root                                 \n\
--                              electricsheep --root 1                      \n\
--                              cosmos -root                                \n\
-- GL:                          sphereEversion --root                       \n\
-- GL:                          fireflies -root                             \n\
-                               attraction -root                            \n\
-                               qix -root                                   \n\
-                               ripples -root                               \n\
-                               zoom -root                                  \n\
-  GL:                          surfaces -root                              \n\
-  GL:                          pinion -root                                \n\
+  GL:                          klein -root                                 \n\
+-                              lcdscrub -root                              \n\
   GL:                          photopile -root                             \n\
   GL:                          skytentacles -root                          \n\
   GL:                          rubikblocks -root                           \n\
   GL:                          photopile -root                             \n\
   GL:                          skytentacles -root                          \n\
   GL:                          rubikblocks -root                           \n\
+  GL:                          companioncube -root                         \n\
+  GL:                          hilbert -root                               \n\
+  GL:                          tronbit -root                               \n\
                                unicode -root                               \n\
 
 
                                unicode -root                               \n\
 
 
@@ -320,9 +250,8 @@ pointerPollTime:    0:00:05
 pointerHysteresis:  10
 windowCreationTimeout:0:00:30
 initialDelay:  0:00:00
 pointerHysteresis:  10
 windowCreationTimeout:0:00:30
 initialDelay:  0:00:00
-sgiSaverExtension:  True
-xidleExtension:        True
 GetViewPortIsFullOfLies:False
 procInterrupts:        True
 GetViewPortIsFullOfLies:False
 procInterrupts:        True
+xinputExtensionDev: False
 overlayStderr: True
 
 overlayStderr: True