X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=7c29cd789b81c14dd0fba65f59237d96fdffce96;hp=67923746973a45a88904f17e461e7fda8538e0cf;hb=481b95e2617b69e6fd4444432747d7e1e0c3dc85;hpb=186b0b9f1638444c650c9273df38085e0db71e4a diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in index 67923746..7c29cd78 100644 --- a/driver/XScreenSaver.ad.in +++ b/driver/XScreenSaver.ad.in @@ -1,4 +1,12 @@ -! app-defaults file for XScreenSaver by Jamie Zawinski. +! +! XScreenSaver +! +! a screen saver and locker for the X window system +! by Jamie Zawinski +! +! version 2.24 +! 30-Jun-98 +! ! See "man xscreensaver" for more info. The latest version is always ! available at http://people.netscape.com/jwz/xscreensaver/ @@ -9,6 +17,7 @@ *nice: 10 *lock: False *verbose: False +*timestamp: False *fade: True *unfade: False *fadeSeconds: 3 @@ -16,8 +25,8 @@ *captureStderr: True *captureStdout: True -*textForeground: Yellow -*textBackground: Black +*overlayTextForeground: #FFFF00 +*overlayTextBackground: #000000 *overlayStderr: True *font: *-medium-r-*-140-*-m-* @@ -51,9 +60,12 @@ ! metacharacters are used, they must be understandable to `sh', not `csh' ! (the $SHELL variable is not consulted, for unfortunate but good reasons.) ! -*programs: qix -root \n\ - qix -root -solid -delay 0 -segments 100 \n\ - qix -root -linear -count 10 -size 100 -segments 200 \n\ +! Be sure to check out Demo Mode: run the command `xscreensaver-command -demo' +! and it will cause the running XScreenSaver program to pop up a dialog box +! that lets you try out the following programs interactively. See the man +! pages for details. +! +*programs: qix -root -solid -delay 0 -segments 100 \n\ attraction -root -mode balls \n\ attraction -root -mode lines -points 3 -segments 200 \n\ attraction -root -mode splines -segments 300 \n\ @@ -69,6 +81,9 @@ imsmap -root \n\ slidescreen -root \n\ decayscreen -root \n\ + jigsaw -root \n\ + blitspin -root -grab \n\ + slip -root \n\ hypercube -root \n\ halo -root \n\ maze -root \n\ @@ -77,10 +92,9 @@ lmorph -root \n\ deco -root \n\ moire -root \n\ - kaleidescope -root \n\ + moire2 -root \n\ lightning -root \n\ strange -root \n\ - fract -root \n\ spiral -root \n\ laser -root \n\ grav -root \n\ @@ -92,19 +106,36 @@ sierpinski -root \n\ braid -root \n\ galaxy -root \n\ - slip -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\ starfish -root \n\ starfish -root -blob \n\ munch -root \n\ fadeplot -root \n\ coral -root \n\ + mountain -root \n\ + triangle -root \n\ + worm -root \n\ + rotor -root \n\ + ant -root \n\ + vines -root \n\ + kaleidescope -root \n\ + xjack -root \n\ + cynosure -root \n\ + flow -root \n\ + epicycle -root \n\ + interference -root \n\ + truchet -root -randomize \n\ + bsod -root \n\ + crystal -root \n\ + discrete -root \n\ + kumppa -root \n\ \ mono: rocks -root \n\ color: rocks -root -fg darksalmon \n\ @@ -127,20 +158,37 @@ @GL_KLUDGE_2@ gears -root \n\ @GL_KLUDGE_2@ superquadrics -root \n\ @GL_KLUDGE_2@ morph3d -root \n\ -@GL_KLUDGE_2@ escher -root \n\ +@GL_KLUDGE_2@ cage -root \n\ +@GL_KLUDGE_2@ moebius -root \n\ +@GL_KLUDGE_2@ stairs -root \n\ @GL_KLUDGE_2@ pipes -root \n\ @GL_KLUDGE_2@ sproingies -root \n\ -@GL_KLUDGE_2@ rubik -root \n +@GL_KLUDGE_2@ rubik -root \n\ +@GL_KLUDGE_2@ atlantis -root \n ! A few of the hacks require OpenGL, and will only be built if you have it. -! Note that those hacks (gears, superquadratics, escher, pipes, and -! sproingies) will work best on a visual *half* as deep as the depth of the -! screen, since that way they can do double-buffering -- on an SGI, you -! should specify the 12-bit TrueColor visual (probably 0x29) instead of -! letting XScreenSaver pick the visual itself (specifying "TrueColor" would -! select the 24-bit TrueColor visual, and double-buffering wouldn't be used, -! resulting in flicker.) +! If your vendor doesn't provide real OpenGL, you might want to consider +! building MesaGL, which is a free implementation -- GL is way cool. +! +! Note that those hacks (gears, superquadratics, morph3d, cage, moebius, +! stairs, pipes, sproingies, and rubik) tend to work best on a visual *half* +! as deep as the depth of the screen, since that way, they can do +! double-buffering -- try it and see, but you will probably find that you +! should specify the deepest visual that is half as deep as the screen. +! +! For example, on a screen that supports both 24-bit TrueColor and 12-bit +! PseudoColor, the 12-bit visual will probably work best (this is true of +! base-model SGI Indys: the 0x29 visual is the one you want.) Oddly, on SGI +! O2s, (machines that have serious hardware support for GL) the 12-bit +! PseudoColor visual looks awful (you get a black and white, flickery image.) +! On these machines, the visual you want turns out to be 0x31 -- this is but +! one of the eight 15-bit TrueColor visuals (yes, 8, and yes, 15) that O2s +! provide. This is the only visual that works properly -- as far as xdpyinfo +! is concerned, all of the 15-bit TrueColor visuals are identical, but some +! flicker like mad, and some have deeply weird artifacts (hidden surfaces +! show through!) I suppose these other visuals must be tied to some arcane +! hardware feature... Your mileage, therefore, may vary dramatically. ! ! Some other programs that you might want to track down (these work as ! XScreenSaver helpers, but are not distributed with it): @@ -151,7 +199,7 @@ ! xbouncebits ... \n\ ! ico -r -faces -sleep 1 -obj ico \n\ ! xsplinefun \n\ -! kaleid -root \n\ +! xmountains -b -M \n\ ! color: xfishtank -c black -d -r 2 \n\ ! ! xtacy is ok, but it only works on the default visual. We can satisfy @@ -162,40 +210,56 @@ ! default: xtacy -root -delay 100 -mixer \n\ ! default: xtacy -root -delay 100 -taffy -pal 4 \n\ ! -! To display a slideshow of images, you can do something like this: +! To display a randomized slideshow of images, you can do something like this: ! -! default: xv -root -rmode 5 image-1.gif -quit -! default: xv -root -rmode 5 image-2.gif -quit -! default: xv -root -rmode 5 image-3.gif -quit +! default-n: xv -root -rmode 5 image-1.gif -quit +! default-n: xv -root -rmode 5 image-2.gif -quit +! default-n: xv -root -rmode 5 image-3.gif -quit ! ...and so on... ! -! however, for this to work, you must also have started the screensaver so -! that it uses the default colormap (the "-no-install" command-line option, or -! the "installColormap: False" resource) because when XV is running in "-root" -! mode, it always assumes that the default colormap is being used, rather than -! examining the window it is drawing on to see what colormap it has. (It -! also assumes the default visual, but we've taken care of that above.) +! Note that we've used "default-n" as the visual name, rather than just +! "default": this means "default visual, no install", that is, it's like +! specifying the command-line arguments "-visual default -no-install". +! This is necessary because, when XV is running in "-root" mode, it always +! assumes that the default visual and colormap are being used, rather than +! examining the window it is drawing on to see what visual and colormap it +! has. If we didn't force the default visual to be used, xv would get an +! X error. If we didn't force the default colormap to be installed, the +! colors would be all wrong. "default-i" may also be used as a visual name +! (meaning, "-visual default -install") but you probably won't ever need +! to use that. +! +! XEarth is nice, too: ! -! Some SGI GL programs work with XScreenSaver; most don't. +! default-n: xearth -nostars -wait 0 -timewarp 400 -pos sunrel/38/-30 ! -! Bongo works fine: ! -! /usr/demos/bin/bongo -wbongo +! Some of the GL demos that SGI ships work with XScreenSaver; most don't. +! XScreenSaver includes a program (not built or installed by default) +! called "xscreensaver-sgigl". To use the SGI demos with XScreenSaver, +! build that program, and use it to launch the SGI demos. For example, +! on Irix 6.2, you can do this: ! -! ElectroPaint sort-of works; XScreenSaver will launch it, and it will run -! properly, but when it's time to turn off the screensaver, you need to hit -! the Escape key, rather than just moving the mouse. Apparently GL programs -! are able to intercept the keyboard even when X has the keyboard grabbed! +! xscreensaver-sgigl /usr/demos/bin/ep -S +! xscreensaver-sgigl /usr/demos/bin/bongo ! -! /usr/demos/bin/ep +! On Irix 6.3, things have moved, so you need to do it like this: ! -! None of the other SGI GL demos I've tried worked, because none of them seem -! to have command-line options that will make them take up the whole screen; -! so all you get is a miniscule 100x100 image, which is worthless. This is a -! shame, since many of those demos would make fine screensavers. +! xscreensaver-sgigl /usr/sbin/ep -S ! -! If anyone who understands how "haven" works would like to send me the code -! necessary to do what it does, I would be much obliged. +! You can also use the "ant" demo, but first you need to wrap a shell script +! around it that cds to its home directory, so that it can find its files; +! and also pass it the -S argument, to prevent it from forking. +! +! +! Also, since these actually end up mapping their own windows instead of +! drawing on the XScreenSaver-provided root, when they are being run from +! demo-mode, you can't pop up the demo-mode dialog just by clicking the +! mouse: you must first type ESC to make the SGI programs exit. This sucks. +! Things should work properly when they are being run by xscreensaver in +! non-demo-mode, however. +! +! Basically, the SGI demo writers went out of their way to make my life hell. @@ -211,18 +275,21 @@ *fontList: *-helvetica-medium-r-*-*-*-120-*-*-*-iso8859-1 *demoDialog*label1.fontList: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1 *passwdDialog*fontList: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1 -*XmList.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 *XmTextField.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 *passwdDialog.passwdText.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 +XScreenSaver*XmList.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 +! Need to fully-qualify the preceeding in the case of of *sgiMode. -*XmDialogShell*foreground: black -*XmDialogShell*background: gray90 -*XmDialogShell*XmTextField.foreground: black -*XmDialogShell*XmTextField.background: white -*XmDialogShell*demoList.foreground: black -*XmDialogShell*demoList.background: white -*XmDialogShell*rogerLabel.foreground: red3 -*XmDialogShell*rogerLabel.background: white +*XmDialogShell*foreground: #000000 +*XmDialogShell*background: #E5E5E5 +*XmDialogShell*XmTextField.foreground: #000000 +*XmDialogShell*XmTextField.background: #FFFFFF +*XmDialogShell*demoList.foreground: #000000 +*XmDialogShell*demoList.background: #FFFFFF + +! Need to fully-qualify the following in the case of of *sgiMode. +XScreenSaver*XmDialogShell*rogerLabel.foreground: #CD0000 +XScreenSaver*XmDialogShell*rogerLabel.background: #FFFFFF *XmDialogShell.title: XScreenSaver *allowShellResize: True @@ -233,13 +300,13 @@ *label1.labelString: XScreenSaver %s *label1.label: XScreenSaver %s -*label2.labelString: Copyright © 1991-1997 by Jamie Zawinski -*label2.label: Copyright © 1991-1997 by Jamie Zawinski +*label2.labelString: Copyright © 1991-1998 by Jamie Zawinski +*label2.label: Copyright © 1991-1998 by Jamie Zawinski *demoList.visibleItemCount: 10 *demoList.automaticSelection: True *next.labelString: Run Next *prev.labelString: Run Previous -*edit.labelString: Edit Parameters +*edit.labelString: Preferences *done.labelString: Exit Demo Mode *restart.labelString: Reinitialize @@ -258,14 +325,14 @@ *fadeToggle.labelString: Fade Colormap *unfadeToggle.labelString: Unfade Colormap *lockToggle.labelString: Require Password -*resourcesDone.labelString: Done +*resourcesDone.labelString: OK *resourcesCancel.labelString: Cancel *passwdDialog.title: Password *passwdLabel1.labelString: XScreenSaver %s *passwdLabel2.labelString: This display is locked. *passwdLabel3.labelString: Please type %s's password to unlock it. -*passwdDone.labelString: Done +*passwdDone.labelString: OK *passwdCancel.labelString: Cancel *passwdLabel1.alignment: ALIGNMENT_BEGINNING @@ -273,6 +340,14 @@ *passwdLabel3.alignment: ALIGNMENT_BEGINNING *rogerLabel.width: 150 +! Disable Motif drag-and-drop in dialog boxes. This is kind of pathetic, but +! in some older versions of Motif, most any attempt to drag cause immediate +! flaming death from above. This *should* rip the legs off that bug. +! +XScreenSaver*dragInitiatorProtocolStyle: DRAG_NONE +XScreenSaver*dragReceiverProtocolStyle: DRAG_NONE + + ! Resources for the dialog boxes using the abominable Athena widgets: ! @@ -281,32 +356,34 @@ *passwd_dialog*font: *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1 *demo_dialog*label1.font: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 *resources_dialog*label1.font: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 -*demo_dialog*List.font: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 - -! This is a hack to make the typed password invisible. -! Surely someone can do better than this... -*passwd_dialog*passwd_form.value*font: *nil* - -*demo_dialog*foreground: black -*demo_dialog*background: gray90 -*demo_dialog*List.background: white -*demo_dialog*Scrollbar.background: gray85 -*demo_dialog*Command.background: gray85 - -*resources_dialog*foreground: black -*resources_dialog*background: gray90 -*resources_dialog*Command.background: gray85 -*resources_dialog*Toggle.background: gray85 -*resources_dialog*Text*background: white +XScreenSaver.demo_dialog*List.font: \ + *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 +XScreenSaver.demo_dialog*Text*font: \ + *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1 + +XScreenSaver.demo_dialog*foreground: #000000 +XScreenSaver.demo_dialog*background: #E5E5E5 +XScreenSaver.demo_dialog*List.background: #FFFFFF +XScreenSaver.demo_dialog*Scrollbar.background: #D9D9D9 +XScreenSaver.demo_dialog*Command.background: #D9D9D9 +XScreenSaver.demo_dialog*Text*background: #FFFFFF + +XScreenSaver.resources_dialog*foreground: #000000 +XScreenSaver.resources_dialog*background: #E5E5E5 +XScreenSaver.resources_dialog*Command.background: #D9D9D9 +XScreenSaver.resources_dialog*Toggle.background: #D9D9D9 +XScreenSaver.resources_dialog*Text*background: #FFFFFF *resources_dialog*Dialog.value.translations: #override\n\ Return: beginning-of-line()\n -*passwd_dialog*foreground: black -*passwd_dialog*background: gray90 -*passwd_dialog*Text*background: white +XScreenSaver.passwd_dialog*foreground: #000000 +XScreenSaver.passwd_dialog*background: #E5E5E5 +XScreenSaver.passwd_dialog*Command.background: #D9D9D9 +XScreenSaver.passwd_dialog*Text*background: #FFFFFF +XScreenSaver.passwd_dialog*roger.foreground: #CD0000 +XScreenSaver.passwd_dialog*roger.background: #FFFFFF -*demo_dialog*viewport.width: 400 *demo_dialog*viewport.height: 200 *Form.borderWidth: 0 *Box.borderWidth: 0 @@ -315,9 +392,11 @@ *demo_dialog*next.label: Run Next *demo_dialog*prev.label: Run Previous -*demo_dialog*edit.label: Edit Parameters +*demo_dialog*edit.label: Preferences *demo_dialog*done.label: Exit Demo Mode *demo_dialog*restart.label: Reinitialize +XScreenSaver.demo_dialog*Command.internalWidth: 10 +XScreenSaver.demo_dialog*Command.internalHeight: 4 *resources_dialog*timeout.label: Saver Timeout: *resources_dialog*cycle.label: Cycle Timeout: @@ -332,29 +411,27 @@ *resources_dialog*buttonbox.fade.label: Fade Colormap *resources_dialog*buttonbox.unfade.label: Unfade Colormap *resources_dialog*buttonbox.lock.label: Require Password -*resources_dialog*done.label: Done +*resources_dialog*done.label: OK *resources_dialog*cancel.label: Cancel *passwd_dialog*label1.label: XScreenSaver %s *passwd_dialog*label2.label: This display is locked. *passwd_dialog*label3.label: Please type %s's password to unlock it. -*passwd_dialog*ok.label: Done +*passwd_dialog*ok.label: OK *passwd_dialog*cancel.label: Cancel -*passwd_dialog*passwd_form*label.label: Enter password: -*passwd_dialog*Dialog.label: Enter password: +*passwd_dialog*passwd_form*label.label: +*passwd_dialog*Dialog.label: *passwd_dialog*passwd_form*Text.width: 200 +*passwd_dialog*passwd_form.borderWidth: 0 *passwd_dialog*roger.width: 150 *passwd_dialog*roger.height: 150 -*passwd_dialog*roger.foreground: red3 -*passwd_dialog*roger.background: white *passwd_dialog*roger.borderWidth: 1 ! You probably won't need to change these. They are only used if no server ! extension is in use. ! -*pointerPollTime: 5 -*initialDelay: 30 -*windowCreationTimeout: 30 - -*bourneShell: /bin/sh +XScreenSaver.pointerPollTime: 5 +XScreenSaver.initialDelay: 0 +XScreenSaver.windowCreationTimeout: 30 +XScreenSaver.bourneShell: /bin/sh