X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=fa2587a905f424666d7a4f5405785a0aa72c1d54;hb=39809ded547bdbb08207d3e514950425215b4410;hp=1c1850fb4ac394d8f3af25bfa5a0c1d91292196f;hpb=88cfe534a698a0562e81345957a50714af1453bc;p=xscreensaver diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in index 1c1850fb..fa2587a9 100644 --- a/driver/XScreenSaver.ad.in +++ b/driver/XScreenSaver.ad.in @@ -4,11 +4,11 @@ ! a screen saver and locker for the X window system ! by Jamie Zawinski ! -! version 5.34 -! 24-Oct-2015 +! version 5.38 +! 20-Dec-2017 ! ! See "man xscreensaver" for more info. The latest version is always -! available at http://www.jwz.org/xscreensaver/ +! available at https://www.jwz.org/xscreensaver/ ! These resources, when placed in the system-wide app-defaults directory @@ -90,7 +90,7 @@ GetViewPortIsFullOfLies: False ! This is the URL loaded by the "Help" button on the splash screen, ! and by the "Documentation" menu item in xscreensaver-demo. -*helpURL: http://www.jwz.org/xscreensaver/man.html +*helpURL: https://www.jwz.org/xscreensaver/man.html ! loadURL -- how the "Help" buttons load the helpURL (/bin/sh syntax.) ! manualCommand -- how the "Documentation" buttons display man pages. @@ -371,7 +371,18 @@ GetViewPortIsFullOfLies: False tessellimage -root \n\ @GL_KLUDGE@ GL: winduprobot -root \n\ @GL_KLUDGE@ GL: splitflap -root \n\ - testx11 -root \n +@GL_KLUDGE@ GL: cubestack -root \n\ +@GL_KLUDGE@ GL: cubetwist -root \n\ +@GL_KLUDGE@ GL: discoball -root \n\ +@GL_KLUDGE@ GL: dymaxionmap -root \n\ +@GL_KLUDGE@ GL: energystream -root \n\ +@GL_KLUDGE@ GL: hexstrut -root \n\ +@GL_KLUDGE@ GL: hydrostat -root \n\ +@GL_KLUDGE@ GL: raverhoop -root \n\ +@GL_KLUDGE@ GL: splodesic -root \n\ +@GL_KLUDGE@ GL: unicrud -root \n\ +@GL_KLUDGE@ GL: esper -root \n\ +@GL_KLUDGE@ GL: vigilance -root \n @@ -392,15 +403,37 @@ XScreenSaver.bourneShell: /bin/sh ! Resources for the password and splash-screen dialog boxes of ! the "xscreensaver" daemon. ! -*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 +*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 + +! Fucking Ubuntu doesn't install Helvetica by default! Come ON! +! What a weirdo exotic font that is, that nobody would care to use! +! +*Dialog.headingFont2: -*-bitstream charter-bold-r-*-*-*-160-*-*-*-*-iso8859-1 +*Dialog.bodyFont2: -*-bitstream charter-bold-r-*-*-*-120-*-*-*-*-iso8859-1 +*Dialog.labelFont2: -*-bitstream charter-bold-r-*-*-*-120-*-*-*-*-iso8859-1 +*Dialog.unameFont2: -*-bitstream charter-bold-r-*-*-*-100-*-*-*-*-iso8859-1 +*Dialog.buttonFont2: -*-bitstream charter-bold-r-*-*-*-120-*-*-*-*-iso8859-1 +*Dialog.dateFont2: -*-bitstream charter-medium-r-*-*-*-80-*-*-*-*-iso8859-1 + +! Fall back to anything variable width that supports ASCII. +*Dialog.headingFont3: -*-*-bold-r-*-*-*-180-*-*-p-*-iso8859-1 +*Dialog.bodyFont3: -*-*-bold-r-*-*-*-140-*-*-p-*-iso8859-1 +*Dialog.labelFont3: -*-*-bold-r-*-*-*-140-*-*-p-*-iso8859-1 +*Dialog.unameFont3: -*-*-bold-r-*-*-*-120-*-*-p-*-iso8859-1 +*Dialog.buttonFont3: -*-*-bold-r-*-*-*-140-*-*-p-*-iso8859-1 +*Dialog.dateFont3: -*-*-medium-r-*-*-*-80-*-*-p-*-iso8859-1 + ! Helvetica asterisks look terrible. -!*passwd.passwdFont: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1 -*passwd.passwdFont: *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1 +*passwd.passwdFont: -*-courier-medium-r-*-*-*-140-*-*-*-iso8859-1 +*passwd.passwdFont2: -*-bitstream-courier 10 pitch-medium-r-*-*-*-140-*-*-*-iso8859-1 +*passwd.passwdFont3: -*-*-medium-r-*-*-*-140-*-m-*-iso8859-1 +*passwd.passwdFont4: -*-*-medium-r-*-*-*-140-*-c-*-iso8859-1 + *Dialog.foreground: #000000 *Dialog.background: #E6E6E6 @@ -430,7 +463,7 @@ XScreenSaver.bourneShell: /bin/sh *passwd.uname: True *splash.heading.label: XScreenSaver %s -*splash.body.label: Copyright \251 1991-2015 by +*splash.body.label: Copyright \251 1991-2017 by *splash.body2.label: Jamie Zawinski *splash.demo.label: Settings *splash.help.label: Help @@ -456,12 +489,16 @@ XScreenSaver.bourneShell: /bin/sh *hacks.ccurve.name: CCurve *hacks.cloudlife.name: CloudLife *hacks.companioncube.name: CompanionCube +*hacks.cubestack.name: CubeStack *hacks.cubestorm.name: CubeStorm +*hacks.cubetwist.name: CubeTwist *hacks.cubicgrid.name: CubicGrid *hacks.cwaves.name: CWaves *hacks.dangerball.name: DangerBall *hacks.decayscreen.name: DecayScreen *hacks.dnalogo.name: DNA Logo +*hacks.dymaxionmap.name: DymaxionMap +*hacks.energystream.name: EnergyStream *hacks.euler2d.name: Euler2D *hacks.fadeplot.name: FadePlot *hacks.flipflop.name: FlipFlop @@ -494,6 +531,7 @@ XScreenSaver.bourneShell: /bin/sh *hacks.popsquares.name: PopSquares *hacks.projectiveplane.name:ProjectivePlane *hacks.quasicrystal.name: QuasiCrystal +*hacks.raverhoop.name: RaverHoop *hacks.rd-bomb.name: RDbomb *hacks.rdbomb.name: RDbomb *hacks.romanboy.name: RomanBoy