X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FXScreenSaver_ad.h;h=e556203d6b73e660d3f473e439d6ba0195dec70d;hp=75717cfc120648b571c98bb27329be911e0e3837;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=ccb7f4903325f92555a9722bba74b58346654ba0 diff --git a/driver/XScreenSaver_ad.h b/driver/XScreenSaver_ad.h index 75717cfc..e556203d 100644 --- a/driver/XScreenSaver_ad.h +++ b/driver/XScreenSaver_ad.h @@ -17,7 +17,6 @@ "*nice: 10", "*memoryLimit: 0", "*lock: False", -"*lockVTs: True", "*verbose: False", "*timestamp: True", "*fade: True", @@ -27,11 +26,11 @@ "*splash: True", "*splashDuration: 0:00:05", "*visualID: default", -"*captureStderr: False", +"*captureStderr: True", "*ignoreUninstalledPrograms: False", "*textMode: file", "*textLiteral: XScreenSaver", -"*textFile: /usr/X11R6/README", +"*textFile: ", "*textProgram: fortune", "*textURL: http://www.livejournal.com/stats/latest-rss.bml", "*overlayTextForeground: #FFFF00", @@ -55,34 +54,30 @@ \"Qix (transparent)\" qix -root -count 4 -solid -transparent \\n\ \"Qix (linear)\" qix -root -count 5 -solid -transparent \ -linear -segments 250 -size 100 \\n\ -- \"Qix (xor)\" qix -root -linear -count 5 -size 200 \ - -spread 30 -segments 75 -solid -xor \\n\ \ \"Attraction (balls)\" attraction -root -mode balls \\n\ \"Attraction (lines)\" attraction -root -mode lines -points 3 \ -segments 200 \\n\ -- \"Attraction (poly)\" attraction -root -mode polygons \\n\ - \"Attraction (splines)\" attraction -root -mode splines -segments \ +- \"Attraction (splines)\" attraction -root -mode splines -segments \ 300 \\n\ - \"Attraction (orbital)\" attraction -root -mode lines -radius 300 \ +- \"Attraction (orbital)\" attraction -root -mode lines -radius 300 \ -orbit -vmult 0.5 \\n\ \ pyro -root \\n\ rocks -root \\n\ helix -root \\n\ pedal -root \\n\ - rorschach -root -offset 7 \\n\ + rorschach -root \\n\ hopalong -root \\n\ greynetic -root \\n\ imsmap -root \\n\ slidescreen -root \\n\ decayscreen -root \\n\ jigsaw -root \\n\ - blitspin -root -grab \\n\ + blitspin -root \\n\ slip -root \\n\ distort -root \\n\ spotlight -root \\n\ - \"Ripples (oily)\" ripples -root -oily -light 2 \\n\ \"Ripples (stir)\" ripples -root -oily -light 2 -stir \\n\ \"Ripples (desktop)\" ripples -root -water -light 6 \\n\ hypercube -root \\n\ @@ -99,8 +94,7 @@ strange -root \\n\ - spiral -root \\n\ laser -root \\n\ - grav -root \\n\ - \"Grav (trails)\" grav -root -trail -decay \\n\ + grav -root \\n\ drift -root \\n\ ifs -root \\n\ julia -root \\n\ @@ -115,16 +109,14 @@ forest -root \\n\ - lisa -root \\n\ - lissie -root \\n\ - goop -root -max-velocity 0.5 -elasticity \ - 0.9 \\n\ + goop -root \\n\ starfish -root \\n\ - \"Starfish (blob)\" starfish -root -blob \\n\ munch -root \\n\ mismunch -root \\n\ fadeplot -root \\n\ - coral -root -delay 0 \\n\ + coral -root \\n\ mountain -root \\n\ - triangle -root -delay 1 \\n\ + triangle -root \\n\ - worm -root \\n\ - rotor -root \\n\ - demon -root \\n\ @@ -132,12 +124,12 @@ - vines -root \\n\ kaleidescope -root \\n\ xjack -root \\n\ - xlyap -root -randomize \\n\ + xlyap -root \\n\ cynosure -root \\n\ flow -root \\n\ epicycle -root \\n\ interference -root \\n\ - truchet -root -randomize \\n\ + truchet -root \\n\ bsod -root \\n\ crystal -root \\n\ discrete -root \\n\ @@ -157,7 +149,7 @@ - critical -root \\n\ phosphor -root \\n\ xmatrix -root \\n\ - petri -root -size 2 -count 20 \\n\ + petri -root \\n\ \"Petri 2\" petri -root -minlifespeed 0.02 \ -maxlifespeed 0.03 -minlifespan 1 \ -maxlifespan 1 -instantdeathchan 0 \ @@ -166,22 +158,16 @@ ccurve -root \\n\ blaster -root \\n\ bumps -root \\n\ - xteevee -root \\n\ xanalogtv -root \\n\ xspirograph -root \\n\ nerverot -root \\n\ -- \"NerveRot (dense)\" nerverot -root -count 1000 \\n\ -- \"NerveRot (thick)\" nerverot -root -count 100 -line-width 4 \ - -max-nerve-radius 0.8 -nervousness 0.5 -db \\n\ xrayswarm -root \\n\ - \"Zoom (Fatbits)\" zoom -root \\n\ \"Zoom (Lenses)\" zoom -root -lenses \\n\ rotzoomer -root \\n\ -- \"RotZoomer (mobile)\" rotzoomer -root -move \\n\ -- \"RotZoomer (sweep)\" rotzoomer -root -sweep \\n\ whirlwindwarp -root \\n\ - \"WhirlyGig\" whirlygig -root \\n\ - \"SpeedMine\" speedmine -root \\n\ + whirlygig -root \\n\ + speedmine -root \\n\ \"SpeedWorm\" speedmine -root -worm \\n\ vermiculate -root \\n\ twang -root \\n\ @@ -201,8 +187,7 @@ barcode -root \\n\ piecewise -root \\n\ cloudlife -root \\n\ - \"FontGlide\" fontglide -root -page \\n\ - \"FontGlide (scroller)\" fontglide -root -scroll \\n\ + fontglide -root \\n\ apple2 -root \\n\ bubbles -root \\n\ pong -root \\n\ @@ -212,13 +197,16 @@ anemotaxis -root \\n\ memscroller -root \\n\ substrate -root \\n\ - \"Substrate (circles)\" substrate -root -circle-percent 33 \\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 \ @@ -226,7 +214,6 @@ - default-n: vidwhacker -root \\n\ \ GL: gears -root \\n\ - GL: \"Gears (planetary)\" gears -root -planetary \\n\ GL: superquadrics -root \\n\ GL: morph3d -root \\n\ GL: cage -root \\n\ @@ -235,11 +222,11 @@ GL: pipes -root \\n\ GL: sproingies -root \\n\ GL: rubik -root \\n\ - GL: atlantis -root -gradient \\n\ + GL: atlantis -root \\n\ GL: lament -root \\n\ GL: bubble3d -root \\n\ GL: glplanet -root \\n\ - GL: flurry -root -preset random \\n\ + GL: flurry -root \\n\ GL: pulsar -root \\n\ - GL: \"Pulsar (textures)\" \ pulsar -root -texture -mipmap \ @@ -247,20 +234,20 @@ - GL: extrusion -root \\n\ GL: sierpinski3d -root \\n\ GL: menger -root \\n\ - GL: \"GFlux\" gflux -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 -shells \\n\ + GL: molecule -root \\n\ GL: dangerball -root \\n\ GL: circuit -root \\n\ GL: engine -root \\n\ GL: flipscreen3d -root \\n\ GL: glsnake -root \\n\ GL: boxed -root \\n\ -- GL: \"GLForestFire\" glforestfire -root \\n\ +- GL: glforestfire -root \\n\ - GL: \"GLForestFire (rain)\" glforestfire -root -count 0 \\n\ - GL: sballs -root \\n\ GL: cubenetic -root \\n\ @@ -272,10 +259,9 @@ GL: atunnel -root \\n\ GL: flyingtoasters -root \\n\ GL: bouncingcow -root \\n\ - GL: jigglypuff -root -random \\n\ - GL: klein -root -random \\n\ - GL: \"HyperTorus (striped)\" hypertorus -root \\n\ - GL: \"HyperTorus (solid)\" hypertorus -root -solid -transparent \\n\ + GL: jigglypuff -root \\n\ + GL: klein -root \\n\ + GL: hypertorus -root \\n\ GL: glmatrix -root \\n\ GL: cubestorm -root \\n\ GL: glknots -root \\n\ @@ -300,17 +286,23 @@ GL: fliptext -root \\n\ - GL: antmaze -root \\n\ GL: tangram -root \\n\ - GL: crackberg -root -flat -lit -crack \ - -color random \\n\ + GL: crackberg -root \\n\ GL: glhanoi -root \\n\ - GL: cube21 -root -colormode six \\n\ + GL: cube21 -root \\n\ GL: timetunnel -root \\n\ GL: juggler3d -root \\n\ + GL: topblock -root \\n\ + GL: glschool -root \\n\ + GL: glcells -root \\n\ + GL: voronoi -root \\n\ + GL: moebiusgears -root \\n\ + GL: lockward -root \\n\ + GL: cubicgrid -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 -builtin3 -cycle \\n\ -- default-n: xearth -nofork -nostars -ncolors 50 \ - -night 3 -wait 0 -timewarp 400.0 -pos \ - sunrel/38/-30 \\n\ +- xdaliclock -root -font BUILTIN3 \\n\ - xplanet -vroot -wait 1 -timewarp 90000 \ -label -origin moon \\n\ - xmountains -b -M -Z 0 -r 1 \\n\ @@ -318,8 +310,7 @@ - xaos -root -autopilot -nogui -delay 10000 \ -maxframerate 30 \ -incoloring -1 -outcoloring -1 \\n\ -- xfishtank -d -s \\n\ -- xsnow \\n\ +- xsnow -root \\n\ - goban -root \\n\ - electricsheep \\n\ - cosmos -root \\n\ @@ -333,6 +324,7 @@ "*Dialog.headingFont: *-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1", "*Dialog.bodyFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1", "*Dialog.labelFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1", +"*Dialog.unameFont: *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1", "*Dialog.buttonFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1", "*Dialog.dateFont: *-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1", "*passwd.passwdFont: *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1", @@ -352,14 +344,15 @@ "*Dialog.borderWidth: 1", "*Dialog.shadowThickness: 2", "*passwd.heading.label: XScreenSaver %s", -"*passwd.body.label: Please enter your password.", +"*passwd.body.label: This screen is locked.", +"*passwd.unlock.label: OK", "*passwd.login.label: New Login", "*passwd.user.label: Username:", -"*passwd.passwd.label: Password:", "*passwd.thermometer.width: 8", "*passwd.asterisks: True", +"*passwd.uname: True", "*splash.heading.label: XScreenSaver %s", -"*splash.body.label: Copyright © 1991-2005 by", +"*splash.body.label: Copyright © 1991-2008 by", "*splash.body2.label: Jamie Zawinski ", "*splash.demo.label: Settings", "*splash.help.label: Help", @@ -375,7 +368,6 @@ "*hacks.t3d.name: T3D", "*hacks.shadebobs.name: ShadeBobs", "*hacks.ccurve.name: C Curve", -"*hacks.xteevee.name: XTeeVee", "*hacks.xanalogtv.name: XAnalogTV", "*hacks.xspirograph.name: XSpiroGraph", "*hacks.nerverot.name: NerveRot", @@ -419,4 +411,10 @@ "*hacks.boxfit.name: BoxFit", "*hacks.fliptext.name: FlipText", "*hacks.glhanoi.name: GLHanoi", +"*hacks.topblock.name: TopBlock", +"*hacks.glschool.name: GLSchool", +"*hacks.glcells.name: GLCells", +"*hacks.moebiusgears.name: MoebiusGears", +"*hacks.cubicgrid.name: CubicGrid", +"*hacks.lcdscrub.name: LCDscrub", "*hacks.documentation.isInstalled: True",