vcs.maemo.org Git - xscreensaver/blob - xscreensaver/debian/patches/52_driver_XScreenSaver.ad.in

   1 --- xscreensaver-5.02/driver/XScreenSaver.ad.in 2007-04-20 23:33:17.000000000 -0400
   2 +++ xscreensaver-5.02diffed/driver/XScreenSaver.ad.in   2007-06-26 05:02:00.000000000 -0400
   3 @@ -4,8 +4,8 @@
   4  !            a screen saver and locker for the X window system
   5  !                            by Jamie Zawinski
   6  !
   7 -!                              version 5.02
   8 -!                              20-Apr-2007
   9 +!                              version 4.24
  10 +!                              08-Feb-2006
  11  !
  12  ! See "man xscreensaver" for more info.  The latest version is always
  13  ! available at http://www.jwz.org/xscreensaver/
  14 @@ -31,19 +31,20 @@
  15  *mode:                 random
  16  *timeout:              0:10:00
  17  *cycle:                        0:10:00
  18 -*lockTimeout:          0:00:00
  19 +*lockTimeout:          0:20:00
  20  *passwdTimeout:                0:00:30
  21 -*dpmsEnabled:          False
  22 -*dpmsStandby:          2:00:00
  23 -*dpmsSuspend:          2:00:00
  24 -*dpmsOff:              4:00:00
  25 -*grabDesktopImages:    True
  26 +*dpmsEnabled:          True
  27 +*dpmsStandby:          1:00:00
  28 +*dpmsSuspend:          1:00:00
  29 +*dpmsOff:              2:00:00
  30 +*grabDesktopImages:    False
  31  *grabVideoFrames:      False
  32  *chooseRandomImages:   @DEFAULT_IMAGES_P@
  33  *imageDirectory:       @DEFAULT_IMAGE_DIRECTORY@
  34  *nice:                 10
  35  *memoryLimit:          0
  36 -*lock:                 False
  37 +*lock:                 True
  38 +*lockVTs:              True
  39  *verbose:              False
  40  *timestamp:            True
  41  *fade:                 True
  42 @@ -53,14 +54,14 @@
  43  *splash:               True
  44  *splashDuration:       0:00:05
  45  *visualID:             default
  46 -*captureStderr:        True
  47 +*captureStderr:        False
  48  *ignoreUninstalledPrograms: False
  49
  50 -*textMode:             file
  51 +*textMode:             url
  52  *textLiteral:          XScreenSaver
  53 -*textFile:             @DEFAULT_TEXT_FILE@
  54 +*textFile:             /usr/share/doc/xserver-common/copyright
  55  *textProgram:          fortune
  56 -*textURL:              http://www.livejournal.com/stats/latest-rss.bml
  57 +*textURL:              http://planet.debian.org/rss20.xml
  58
  59  *overlayTextForeground:        #FFFF00
  60  *overlayTextBackground:        #000000
  61 @@ -90,34 +91,41 @@
  62  ! manualCommand -- how the "Documentation" buttons display man pages.
  63  !
  64  ! And there are so very many options to choose from!
  65 +
  66 +*loadURL: x-www-browser '%s'
  67 +*manualCommand: x-terminal-emulator -title '%s manual' \
  68 +               -e '/bin/sh -c "man %s; read foo"'
  69 +
  70  !
  71  !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
  72  !
  73 -@GNOME24@*loadURL: @WITH_BROWSER@ '%s'
  74 -@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
  75 -@GNOME24@              --command '/bin/sh -c "man %s; read foo"'
  76 -!
  77 -!   Gnome 2.2:
  78 -!
  79 -@GNOME22@*loadURL: gnome-url-show '%s'
  80 -@GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
  81 -@GNOME22@              --command '/bin/sh -c "man %s; read foo"'
  82 -!
  83 -!   Gnome 1.4:
  84 -!
  85 -!      *loadURL: gnome-moz-remote --newwin '%s'
  86 -!      *manualCommand: gnome-help-browser 'man:%s'
  87 -!
  88 -!   non-Gnome systems:
  89 -!
  90 -@NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
  91 -@NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
  92 -@NOGNOME@                  -e /bin/sh -c 'man "%s" ; read foo'
  93 +#@GNOME24@*loadURL: gnome-open '%s'
  94 +#@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
  95 +#@GNOME24@             --command '/bin/sh -c "man %s; read foo"'
  96 +#!
  97 +#!   Gnome 2.2:
  98 +#!
  99 +#@GNOME22@*loadURL: gnome-url-show '%s'
 100 +#@GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
 101 +#@GNOME22@             --command '/bin/sh -c "man %s; read foo"'
 102 +#!
 103 +#!   Gnome 1.4:
 104 +#!
 105 +#!     *loadURL: gnome-moz-remote --newwin '%s'
 106 +#!     *manualCommand: gnome-help-browser 'man:%s'
 107 +#!
 108 +#!   non-Gnome systems:
 109 +#!
 110 +#@NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
 111 +#@NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
 112 +#@NOGNOME@                 -e /bin/sh -c 'man "%s" ; read foo'
 113
 114
 115  ! The format used for printing the date and time in the password dialog box
 116  ! (see the strftime(3) manual page for details.)
 117 -*dateFormat:           %d-%b-%y (%a); %I:%M %p
 118 +*dateFormat:  %Y-%m-%d %H:%M:%S
 119 +! Original upstream date format:
 120 +! *dateFormat:         %d-%b-%y (%a); %I:%M %p
 121  ! To show the time only:
 122  ! *dateFormat:         %I:%M %p
 123  ! For 24 hour time:
 124 @@ -127,7 +135,7 @@
 125  ! This command is executed by the "New Login" button on the lock dialog.
 126  ! (That button does not appear if this program does not exist.)
 127  !
 128 -@NEW_LOGIN_COMMAND_P@*newLoginCommand: @NEW_LOGIN_COMMAND@
 129 +*newLoginCommand:      gdmflexiserver -l -a -c FLEXI_XSERVER
 130
 131
 132  ! Turning on "installColormap" on 8-bit systems interacts erratically with
 133 @@ -153,30 +161,34 @@
 134            "Qix (transparent)"  qix -root -count 4 -solid -transparent      \n\
 135                 "Qix (linear)"  qix -root -count 5 -solid -transparent        \
 136                                   -linear -segments 250 -size 100           \n\
 137 +-                 "Qix (xor)"  qix -root -linear -count 5 -size 200          \
 138 +                                 -spread 30 -segments 75 -solid -xor       \n\
 139                                                                               \
 140           "Attraction (balls)"  attraction -root -mode balls                \n\
 141           "Attraction (lines)"  attraction -root -mode lines -points 3        \
 142                                   -segments 200                             \n\
 143 --      "Attraction (splines)"  attraction -root -mode splines -segments      \
 144 +-         "Attraction (poly)"  attraction -root -mode polygons             \n\
 145 +       "Attraction (splines)"  attraction -root -mode splines -segments      \
 146                                   300                                       \n\
 147 --      "Attraction (orbital)"  attraction -root -mode lines -radius 300      \
 148 +       "Attraction (orbital)"  attraction -root -mode lines -radius 300      \
 149                                   -orbit -vmult 0.5                         \n\
 150                                                                               \
 151                                 pyro -root                                  \n\
 152                                 rocks -root                                 \n\
 153                                 helix -root                                 \n\
 154                                 pedal -root                                 \n\
 155 -                               rorschach -root                             \n\
 156 +                               rorschach -root -offset 7                   \n\
 157                                 hopalong -root                              \n\
 158                                 greynetic -root                             \n\
 159                                 imsmap -root                                \n\
 160                                 slidescreen -root                           \n\
 161                                 decayscreen -root                           \n\
 162                                 jigsaw -root                                \n\
 163 -                               blitspin -root                              \n\
 164 +                               blitspin -root -grab                        \n\
 165                                 slip -root                                  \n\
 166                                 distort -root                               \n\
 167                                 spotlight -root                             \n\
 168 +             "Ripples (oily)"  ripples -root -oily -light 2                \n\
 169               "Ripples (stir)"  ripples -root -oily -light 2 -stir          \n\
 170            "Ripples (desktop)"  ripples -root -water -light 6               \n\
 171                                 hypercube -root                             \n\
 172 @@ -193,7 +205,8 @@
 173                                 strange -root                               \n\
 174  -                              spiral -root                                \n\
 175                                 laser -root                                 \n\
 176 -                               grav -root                                  \n\
 177 +                               grav -root                                  \n\
 178 +              "Grav (trails)"  grav -root -trail -decay                    \n\
 179                                 drift -root                                 \n\
 180                                 ifs -root                                   \n\
 181                                 julia -root                                 \n\
 182 @@ -208,14 +221,16 @@
 183                                 forest -root                                \n\
 184  -                              lisa -root                                  \n\
 185  -                              lissie -root                                \n\
 186 -                               goop -root                                  \n\
 187 +                               goop -root -max-velocity 0.5 -elasticity      \
 188 +                                 0.9                                       \n\
 189                                 starfish -root                              \n\
 190 +            "Starfish (blob)"  starfish -root -blob                        \n\
 191                                 munch -root                                 \n\
 192                                 mismunch -root                              \n\
 193                                 fadeplot -root                              \n\
 194 -                               coral -root                                 \n\
 195 +                               coral -root -delay 0                        \n\
 196                                 mountain -root                              \n\
 197 -                               triangle -root                              \n\
 198 +                               triangle -root -delay 1                     \n\
 199  -                              worm -root                                  \n\
 200  -                              rotor -root                                 \n\
 201  -                              demon -root                                 \n\
 202 @@ -223,12 +238,12 @@
 203  -                              vines -root                                 \n\
 204                                 kaleidescope -root                          \n\
 205                                 xjack -root                                 \n\
 206 -                               xlyap -root                                 \n\
 207 +                               xlyap -root -randomize                      \n\
 208                                 cynosure -root                              \n\
 209                                 flow -root                                  \n\
 210                                 epicycle -root                              \n\
 211                                 interference -root                          \n\
 212 -                               truchet -root                               \n\
 213 +                               truchet -root -randomize                    \n\
 214                                 bsod -root                                  \n\
 215                                 crystal -root                               \n\
 216                                 discrete -root                              \n\
 217 @@ -248,7 +263,7 @@
 218  -                              critical -root                              \n\
 219                                 phosphor -root                              \n\
 220                                 xmatrix -root                               \n\
 221 -                               petri -root                                 \n\
 222 +                               petri -root -size 2 -count 20               \n\
 223                      "Petri 2"  petri -root -minlifespeed 0.02                \
 224                                   -maxlifespeed 0.03 -minlifespan 1           \
 225                                   -maxlifespan 1 -instantdeathchan 0          \
 226 @@ -257,16 +272,22 @@
 227                                 ccurve -root                                \n\
 228                                 blaster -root                               \n\
 229                                 bumps -root                                 \n\
 230 +                               xteevee -root                               \n\
 231                                 xanalogtv -root                             \n\
 232                                 xspirograph -root                           \n\
 233                                 nerverot -root                              \n\
 234 +-          "NerveRot (dense)"  nerverot -root -count 1000                  \n\
 235 +-          "NerveRot (thick)"  nerverot -root -count 100 -line-width 4       \
 236 +                               -max-nerve-radius 0.8 -nervousness 0.5 -db  \n\
 237                                 xrayswarm -root                             \n\
 238  -             "Zoom (Fatbits)" zoom -root                                  \n\
 239                "Zoom (Lenses)"  zoom -root -lenses                          \n\
 240                                 rotzoomer -root                             \n\
 241 +-         "RotZoomer (mobile)" rotzoomer -root -move                       \n\
 242 +-         "RotZoomer (sweep)"  rotzoomer -root -sweep                      \n\
 243                                 whirlwindwarp -root                         \n\
 244 -                               whirlygig -root                             \n\
 245 -                               speedmine -root                             \n\
 246 +                   "WhirlyGig" whirlygig -root                             \n\
 247 +                   "SpeedMine" speedmine -root                             \n\
 248                     "SpeedWorm" speedmine -root -worm                       \n\
 249                                 vermiculate -root                           \n\
 250                                 twang -root                                 \n\
 251 @@ -286,7 +307,8 @@
 252                                 barcode -root                               \n\
 253                                 piecewise -root                             \n\
 254                                 cloudlife -root                             \n\
 255 -                               fontglide -root                             \n\
 256 +                  "FontGlide"  fontglide -root -page                       \n\
 257 +       "FontGlide (scroller)"  fontglide -root -scroll                     \n\
 258                                 apple2 -root                                \n\
 259                                  bubbles -root                              \n\
 260                                 pong -root                                  \n\
 261 @@ -296,6 +318,7 @@
 262                                 anemotaxis -root                            \n\
 263                                 memscroller -root                           \n\
 264                                 substrate -root                             \n\
 265 +        "Substrate (circles)"  substrate -root -circle-percent 33          \n\
 266                                 intermomentary -root                        \n\
 267                                 interaggregate -root                        \n\
 268                                 fireworkx -root                             \n\
 269 @@ -309,6 +332,7 @@
 270  - default-n:                   vidwhacker -root                            \n\
 271                                                                               \
 272  @GL_KLUDGE@ GL:                        gears -root                                 \n\
 273 +@GL_KLUDGE@ GL:        "Gears (planetary)" gears -root -planetary                  \n\
 274  @GL_KLUDGE@ GL:                        superquadrics -root                         \n\
 275  @GL_KLUDGE@ GL:                        morph3d -root                               \n\
 276  @GL_KLUDGE@ GL:                        cage -root                                  \n\
 277 @@ -317,11 +341,11 @@
 278  @GL_KLUDGE@ GL:                        pipes -root                                 \n\
 279  @GL_KLUDGE@ GL:                        sproingies -root                            \n\
 280  @GL_KLUDGE@ GL:                        rubik -root                                 \n\
 281 -@GL_KLUDGE@ GL:                        atlantis -root                              \n\
 282 +@GL_KLUDGE@ GL:                        atlantis -root -gradient                    \n\
 283  @GL_KLUDGE@ GL:                        lament -root                                \n\
 284  @GL_KLUDGE@ GL:                        bubble3d -root                              \n\
 285  @GL_KLUDGE@ GL:                        glplanet -root                              \n\
 286 -@GL_KLUDGE@ GL:                        flurry -root                                \n\
 287 +@GL_KLUDGE@ GL:                        flurry -root -preset random                 \n\
 288  @GL_KLUDGE@ GL:                        pulsar -root                                \n\
 289  -         GL:     "Pulsar (textures)"                                        \
 290                                   pulsar -root -texture -mipmap               \
 291 @@ -329,20 +353,20 @@
 292  @GLE_KLUDGE@GL:                        extrusion -root                             \n\
 293  @GL_KLUDGE@ GL:                        sierpinski3d -root                          \n\
 294  @GL_KLUDGE@ GL:                        menger -root                                \n\
 295 -@GL_KLUDGE@ GL:                        gflux -root                                 \n\
 296 +@GL_KLUDGE@ GL:         "GFlux"        gflux -root                                 \n\
 297  @GL_KLUDGE@ GL:         "GFlux (grab)" gflux -root -mode grab                      \n\
 298  @GL_KLUDGE@ GL:                        stonerview -root                            \n\
 299  @GL_KLUDGE@ GL:                        starwars -root                              \n\
 300  @GL_KLUDGE@ GL:                        gltext -root                                \n\
 301  @GL_KLUDGE@ GL:        "GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root      \n\
 302 -@GL_KLUDGE@ GL:                        molecule -root                              \n\
 303 +@GL_KLUDGE@ GL:                        molecule -root -shells                      \n\
 304  @GL_KLUDGE@ GL:                        dangerball -root                            \n\
 305  @GL_KLUDGE@ GL:                        circuit -root                               \n\
 306  @GL_KLUDGE@ GL:                        engine -root                                \n\
 307  @GL_KLUDGE@ GL:                        flipscreen3d -root                          \n\
 308  @GL_KLUDGE@ GL:                        glsnake -root                               \n\
 309  @GL_KLUDGE@ GL:                        boxed -root                                 \n\
 310 --         GL:                  glforestfire -root                          \n\
 311 +-         GL:  "GLForestFire"          glforestfire -root                  \n\
 312  -         GL:  "GLForestFire (rain)"   glforestfire -root -count 0         \n\
 313  -         GL:                  sballs -root                                \n\
 314  @GL_KLUDGE@ GL:                        cubenetic -root                             \n\
 315 @@ -354,9 +378,10 @@
 316  @GL_KLUDGE@ GL:                        atunnel -root                               \n\
 317  @GL_KLUDGE@ GL:                        flyingtoasters -root                        \n\
 318  @GL_KLUDGE@ GL:                        bouncingcow -root                           \n\
 319 -@GL_KLUDGE@ GL:                        jigglypuff -root                            \n\
 320 -@GL_KLUDGE@ GL:                        klein -root                                 \n\
 321 -@GL_KLUDGE@ GL:                        hypertorus -root                            \n\
 322 +@GL_KLUDGE@ GL:                        jigglypuff -root -random                    \n\
 323 +@GL_KLUDGE@ GL:                        klein -root -random                         \n\
 324 +@GL_KLUDGE@ GL:        "HyperTorus (striped)" hypertorus -root                     \n\
 325 +@GL_KLUDGE@ GL:        "HyperTorus (solid)"   hypertorus -root -solid -transparent \n\
 326  @GL_KLUDGE@ GL:                        glmatrix -root                              \n\
 327  @GL_KLUDGE@ GL:                        cubestorm -root                             \n\
 328  @GL_KLUDGE@ GL:                        glknots -root                               \n\
 329 @@ -381,15 +406,17 @@
 330  @GL_KLUDGE@ GL:                        fliptext -root                              \n\
 331  -         GL:                  antmaze -root                               \n\
 332  @GL_KLUDGE@ GL:                        tangram -root                               \n\
 333 -@GL_KLUDGE@ GL:                        crackberg -root                             \n\
 334 +@GL_KLUDGE@ GL:                        crackberg -root -flat -lit -crack             \
 335 +                                -color random                              \n\
 336  @GL_KLUDGE@ GL:                        glhanoi -root                               \n\
 337 -@GL_KLUDGE@ GL:                        cube21 -root                                \n\
 338 +@GL_KLUDGE@ GL:                        cube21 -root -colormode six                 \n\
 339  @GL_KLUDGE@ GL:                        timetunnel -root                            \n\
 340  @GL_KLUDGE@ GL:                        juggler3d -root                             \n\
 341 -@GL_KLUDGE@ GL:                        topblock -root                              \n\
 342 -@GL_KLUDGE@ GL:                        glschool -root                              \n\
 343                                                                               \
 344 --                              xdaliclock -root -font BUILTIN3             \n\
 345 +-                              xdaliclock -root -builtin3 -cycle           \n\
 346 +- default-n:                   xearth -nofork -nostars -ncolors 50           \
 347 +                                 -night 3 -wait 0 -timewarp 400.0 -pos       \
 348 +                                 sunrel/38/-30                             \n\
 349  -                              xplanet -vroot -wait 1 -timewarp 90000        \
 350                                    -label -origin moon                      \n\
 351  -                              xmountains -b -M -Z 0 -r 1                  \n\
 352 @@ -397,7 +424,8 @@
 353  -                               xaos -root -autopilot -nogui -delay 10000     \
 354                                    -maxframerate 30                            \
 355                                    -incoloring -1 -outcoloring -1            \n\
 356 --                              xsnow -root                                 \n\
 357 +-                              xfishtank -d -s                             \n\
 358 +-                              xsnow                                       \n\
 359  -                              goban -root                                 \n\
 360  -                              electricsheep                               \n\
 361  -                              cosmos -root                                \n\
 362 @@ -426,7 +454,6 @@
 363  *Dialog.headingFont:           *-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1
 364  *Dialog.bodyFont:              *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
 365  *Dialog.labelFont:             *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
 366 -*Dialog.unameFont:             *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1
 367  *Dialog.buttonFont:            *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
 368  *Dialog.dateFont:              *-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1
 369  ! Helvetica asterisks look terrible.
 370 @@ -452,16 +479,15 @@
 371  *Dialog.shadowThickness:       2
 372
 373  *passwd.heading.label:         XScreenSaver %s
 374 -*passwd.body.label:            This screen is locked.
 375 -*passwd.unlock.label:          OK
 376 +*passwd.body.label:            Please enter your password.
 377  *passwd.login.label:           New Login
 378  *passwd.user.label:            Username:
 379 +*passwd.passwd.label:          Password:
 380  *passwd.thermometer.width:     8
 381  *passwd.asterisks:              True
 382 -*passwd.uname:                  True
 383
 384  *splash.heading.label:         XScreenSaver %s
 385 -*splash.body.label:            Copyright © 1991-2006 by
 386 +*splash.body.label:            Copyright © 1991-2005 by
 387  *splash.body2.label:           Jamie Zawinski <jwz@jwz.org>
 388  *splash.demo.label:            Settings
 389  *splash.help.label:            Help
 390 @@ -485,6 +511,7 @@
 391  *hacks.t3d.name:            T3D
 392  *hacks.shadebobs.name:      ShadeBobs
 393  *hacks.ccurve.name:         C Curve
 394 +*hacks.xteevee.name:        XTeeVee
 395  *hacks.xanalogtv.name:      XAnalogTV
 396  *hacks.xspirograph.name:    XSpiroGraph
 397  *hacks.nerverot.name:       NerveRot
 398 @@ -528,8 +555,6 @@
 399  *hacks.boxfit.name:         BoxFit
 400  *hacks.fliptext.name:       FlipText
 401  *hacks.glhanoi.name:        GLHanoi
 402 -*hacks.topblock.name:       TopBlock
 403 -*hacks.glschool.name:       GLSchool
 404
 405  ! obsolete, but still used by xscreensaver-demo-Xm.
 406  *hacks.documentation.isInstalled: True