← Back to branch summary

~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2

« back to all changes in this revision

Viewing changes to driver/XScreenSaver.ad.in

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2011-12-21 15:57:35 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: mathieu@canonical.com-20111221155735-m43kxy7824n1p36y
Merging shared upstream rev into target branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/XScreenSaver.ad.in
4
4
!            a screen saver and locker for the X window system
5
5
!                            by Jamie Zawinski
6
6
!
7
 
!                              version 5.14
8
 
!                              20-May-2011
 
7
!                              version 5.15
 
8
!                              28-Sep-2011
9
9
!
10
10
! See "man xscreensaver" for more info.  The latest version is always
11
11
! available at http://www.jwz.org/xscreensaver/
41
41
*grabDesktopImages:     True
42
42
*grabVideoFrames:       False
43
43
*chooseRandomImages:    @DEFAULT_IMAGES_P@
 
44
! This can be a local directory name, or the URL of an RSS or Atom feed.
44
45
*imageDirectory:        @DEFAULT_IMAGE_DIRECTORY@
45
46
*nice:                  10
46
47
*memoryLimit:           0
61
62
*textLiteral:           XScreenSaver
62
63
*textFile:              @DEFAULT_TEXT_FILE@
63
64
*textProgram:           fortune
64
 
*textURL:               http://www.livejournal.com/stats/latest-rss.bml
65
 
!*textURL:              http://twitter.com/statuses/public_timeline.atom
 
65
*textURL:               http://twitter.com/statuses/public_timeline.atom
 
66
!*textURL:              http://www.livejournal.com/stats/latest-rss.bml
66
67
 
67
68
*overlayTextForeground: #FFFF00
68
69
*overlayTextBackground: #000000
73
74
*sgiSaverExtension:     True
74
75
*xidleExtension:        True
75
76
*procInterrupts:        True
76
 
*xinputExtensionDev:    True
 
77
 
 
78
! Turning this on makes pointerHysteresis not work.
 
79
*xinputExtensionDev:    False
77
80
 
78
81
! Set this to True if you are experiencing longstanding XFree86 bug #421
79
82
! (xscreensaver not covering the whole screen)
349
352
-                               lcdscrub -root                              \n\
350
353
@GL_KLUDGE@ GL:                                 photopile -root                             \n\
351
354
@GL_KLUDGE@ GL:                                 skytentacles -root                          \n\
352
 
@GL_KLUDGE@ GL:                                 rubikblocks -root                           \n
 
355
@GL_KLUDGE@ GL:                                 rubikblocks -root                           \n\
 
356
@GL_KLUDGE@ GL:                                 companioncube -root                         \n\
 
357
@GL_KLUDGE@ GL:                                 hilbert -root                               \n\
 
358
@GL_KLUDGE@ GL:                                 tronbit -root                               \n
353
359
 
354
360
 
355
361
 
432
438
*hacks.bubble3d.name:       Bubble3D
433
439
*hacks.ccurve.name:         CCurve
434
440
*hacks.cloudlife.name:      CloudLife
 
441
*hacks.companioncube.name:  CompanionCube
435
442
*hacks.cubestorm.name:      CubeStorm
436
443
*hacks.cubicgrid.name:      CubicGrid
437
444
*hacks.cwaves.name:         CWaves
482
489
*hacks.t3d.name:            T3D
483
490
*hacks.timetunnel.name:     TimeTunnel
484
491
*hacks.topblock.name:       TopBlock
 
492
*hacks.tronbit.name:        TronBit
485
493
*hacks.vidwhacker.name:     VidWhacker
486
494
*hacks.webcollage.name:     WebCollage
487
495
*hacks.whirlwindwarp.name:  WhirlWindWarp