Xdefaults: Spruce up somewhat.

Shouldn't be any substantive changes.

diff --git a/Xdefaults b/Xdefaults
index 702ab3562391020dd255d79464b38e6c5edc6473..80a9a12fa0bfe5e39b881f6f78ebd6e90c772659 100644 (file)
--- a/Xdefaults
+++ b/Xdefaults
@@ -1,216 +1,200 @@
-!
-! .Xdefaults
-!
+!!! .Xdefaults

 
 

-#define NICEFONT -adobe-helvetica-medium-r-normal--10-*-*-*-p-*-iso8859-1
-#define FIXED fixed
-
-! --- General configuration ---
-
-?*font:                        NICEFONT
-?*background:          lightgrey
-?*foreground:          black
-
-*cursor:               left_ptr
-
-! --- Xft settings ---
-
-Xft.dpi:               75
-Xft.hintstyle:         hintslight
-
-! --- Xcursor settings ---
-
-Xcursor.size:         24
-
-! --- Athena-related settings ---
-
-?*Text.background:     white
-?*AsciiSink*background:        white
-*Label.borderColor:    lightgrey
-?*List.background:     white
-*highlightThickness:   0
-*beNiceToColormap:     false
-
-*useRight:             true
-*useBottom:            true
-
-! --- Wily things ---
-
-wily*p9font:           FIXED
-wily*font:             FIXED
-wily*fixed:            FIXED
+!!!--------------------------------------------------------------------------
+!!! Global configuration.

 
 

-! --- Edwin ---
-
-edwin*font:            FIXED
-
-! --- Special settings for xterm ---
-
-XTerm.vt100.geometry:  80x35
-XTerm.vt100*font:      FIXED
-XTerm.vt100.foreground:        white
-XTerm.vt100.background:        black
-XTerm*scrollBar:       true
-XTerm*saveLines:       1000
-XTerm*scrollTtyOutput: false
-XTerm*scrollKey:       true
-XTerm*rightScrollBar:  true
-XTerm*metaSendsEscape: true
-XTerm*eightBitInput:   true
-
-XTerm*VT100*translations: #override \
-       <Btn4Down>:     scroll-back(1,halfpage) \n\
-       <Btn5Down>:     scroll-forw(1,halfpage)
-
-! --- XConsole settings ---
-
-XConsole*font:         FIXED
-XConsole*background:   #002000
-XConsole*foreground:   #54ff9f
-XConsole*geometry:     485x455
-
-! --- Emacs settings ---
-
-emacs.geometry:                77x33
-Emacs.pane.menubar.font: NICEFONT
-Emacs.menu*.font:      NICEFONT
-Emacs.font:            FIXED
-Emacs.cursorColor:     red
-Emacs.bitmapIcon:      true
-Emacs*foreground:      white
-Emacs*background:      black
-Emacs.pane.menubar.foreground: black
-Emacs.pane.menubar.background: lightgrey
-Emacs.menu*foreground: black
-Emacs.menu*background: lightgrey
+!! Macros for processing the rest of this file.
+#define HELV_MR10 -adobe-helvetica-medium-r-normal--10-*-*-*-p-*-iso8859-1
+#define HELV_MR12 -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1
+#define HELV_BR12 -adobe-helvetica-bold-r-normal--12-*-*-*-p-*-iso8859-1
+#define HELV_MI12 -adobe-helvetica-medium-i-normal--12-*-*-*-p-*-iso8859-1
+#define FIXED fixed
+#define NICEFONT HELV_MR10
+
+
+!! General configuration.
+?*font:                                NICEFONT
+?*background:                  lightgrey
+?*foreground:                  black
+*cursor:                       left_ptr
+
+!! Xft settings.
+Xft.dpi:                       75
+Xft.hintstyle:                 hintslight
+
+!! Xcursor settings.
+Xcursor.size:                  24
+
+!! Athena-related settings.
+?*Text.background:             white
+?*AsciiSink*background:                white
+*Label.borderColor:            lightgrey
+?*List.background:             white
+*highlightThickness:           0
+*beNiceToColormap:             false
+*useRight:                     true
+*useBottom:                    true
+
+!!!--------------------------------------------------------------------------
+!!! Application-specific settings.
+
+!! Wily.
+wily*p9font:                   FIXED
+wily*font:                     FIXED
+wily*fixed:                    FIXED
+
+!! Edwin.
+edwin*font:                    FIXED
+
+!! XTerm.
+XTerm.vt100.geometry:          80x35
+XTerm.vt100*font:              FIXED
+XTerm.vt100.foreground:                white
+XTerm.vt100.background:                black
+XTerm*scrollBar:               true
+XTerm*saveLines:               1000
+XTerm*scrollTtyOutput:         false
+XTerm*scrollKey:               true
+XTerm*rightScrollBar:          true
+XTerm*metaSendsEscape:         true
+XTerm*eightBitInput:           true
+XTerm*VT100*translations:      #override \
+       <Btn4Down>:             scroll-back(1,halfpage) \n\
+       <Btn5Down>:             scroll-forw(1,halfpage)
+
+!! XConsole.
+XConsole*font:                 FIXED
+XConsole*background:           #002000
+XConsole*foreground:           #54ff9f
+XConsole*geometry:             485x455
+
+!! Emacs.
+emacs.geometry:                        77x33
+Emacs.pane.menubar.font:       NICEFONT
+Emacs.menu*.font:              NICEFONT
+Emacs.font:                    FIXED
+Emacs.cursorColor:             red
+Emacs.bitmapIcon:              true
+Emacs*foreground:              white
+Emacs*background:              black
+Emacs.pane.menubar.foreground: black
+Emacs.pane.menubar.background: lightgrey
+Emacs.menu*foreground:         black
+Emacs.menu*background:         lightgrey

 Emacs.scrollbar*attributeBackground: lightgrey
 Emacs.scrollbar*attributeBackground: lightgrey

-Emacs.toolBar:         0
-Emacs.verticalScrollBars: right
-
-! --- VNC ---
+Emacs.toolBar:                 0
+Emacs.verticalScrollBars:      right

 
 

+!! VNC.

 xvncviewer*shareDesktop: true
 xvncviewer*desktop.translations: #override\n\
 xvncviewer*shareDesktop: true
 xvncviewer*desktop.translations: #override\n\

-                       <Key>F8: SendRFBEvent()\n\
-                       !Ctrl<Key>Escape: ShowPopup()
+       <Key>F8: SendRFBEvent()\n\
+       !Ctrl<Key>Escape: ShowPopup()

 
 

-! --- Ytalk settings ---
+!! YTalk.
+YTalk*font:                    FIXED

 
 

-YTalk*font:            FIXED
-
-! --- Xman ---
-
-xman*bothShown:                true
-xman*topBox:           false
+!! Xman.
+xman*bothShown:                        true
+xman*topBox:                   false

 xman*manualBrowser.geometry:   500x888
 xman*manualBrowser.geometry:   500x888

-xman*manualPage.translations: #augment\n\
-                       <Key>Down:      Page(Line, 1)\n\
-                       <Key>Up:        Page(Line, -1)\n\
-                       <Key>Next:      Page(Forward)\n\
-                       <Key>Prior:     Page(Back)
-
-! --- Xlock ---
-
-xlock.mode:            random
-xlock.enablesaver:     true
-xlock*background:      black
-xlock*foreground:      white
-xlock*erasedelay:      100
-xlock*boil:            true
-xlock*trek:            0
-
-phosphor*cursor:       333
-phosphor*delay:                60000
-phosphor*program:      /usr/games/fortune
-phosphor*font:         fixed
-phosphor*scale:                3
-phosphor*ticks:                20
-noseguy*program:       /usr/games/fortune -s
-
-! --- XDvi ---
-
-XDvi.keepPosition:     true
-XDvi.shrinkFactor:     6
-
-XDvi.background:       white
-XDvi.expert:           true
-XDvi.statusline:       false
-XDvi.Hush:             true
-XDvi.thorough:         true
-XDvi.gsAlpha:          true
-XDvi.not1lib:          true
-XDvi.watchFile:                1
-
-xdvirv.background:     black
-xdvirv.foreground:     white
-xdvirv.highlight:      black
-
-! --- xbiff ---
-
-xbiff*volume:          0
-
-! --- tkinfo ---
-
-tkinfo*pagesep:                0
-tkinfo*showballoons:   0
-tkinfo*geometry:       80x54
-tkinfo*linkfont:       FIXED
-tkinfo*highlightfont:  FIXED
-tkinfo*searchfont:     FIXED
-tkinfo*Text.font:      FIXED
-
-! --- xdaliclock ---
-
-xdaliclock*mode: 24
-xdaliclock*datemode: yy/mm/dd
-xdaliclock*cycle: true
-xdaliclock*memory: low
-! xdaliclock*font: -*-palatino-bold-i-normal--*-360-*-*-p-*-iso8859-1
-xdaliclock*font: BUILTIN
-
-! --- xboard ---
-
-xboard*boardSize: small
-xboard*firstChessProgram: crafty
-xboard*secondChessProgram: crafty
-
-! --- Nasty window manager ---
-
-dtwm*iconPlacement:    top right tight
-
-! --- XLess ---
-
-xless*labelFont: NICEFONT
-xless*buttonFont: NICEFONT
-xless*textFont: FIXED
-xless*editorDoesWindows: true
-
-! --- Ghostview ---
-
-ghostview*page.background: white
-ghostview*magstep:     2
-
-! --- XZX ---
-
-xzx*scale: 2
-xzx*joyUp: q
-xzx*joyDown: a
-xzx*joyLeft: i
-xzx*joyRight: o
-xzx*joyFire: space
-xzx*sound: true
-xzx*mf128: true
-xzx*libDir: .:/usr/lib/xzx:/usr/local/share/spectrum
-
-! --- Axiom HyperDoc ---
-
-Axiom.hyperdoc.RmFont: -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1
-Axiom.hyperdoc.BoldFont: -adobe-helvetica-bold-r-normal--12-*-*-*-p-*-iso8859-1
-Axiom.hyperdoc.ActiveFont: -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1
-Axiom.hyperdoc.EmphasizeFont: -adobe-helvetica-medium-i-normal--12-*-*-*-p-*-iso8859-1
-Axiom.hyperdoc.ActiveColor: blue
-Axiom.hyperdoc.AxiomFont: FIXED
-Axiom.hyperdoc.TtFont: FIXED
-Axiom.hyperdoc.InputForeground: black
-Axiom.hyperdoc.InputBackground: white
-Axiom.hyperdoc.Background: lightgrey
+xman*manualPage.translations:  #augment\n\
+       <Key>Down:              Page(Line, 1)\n\
+       <Key>Up:                Page(Line, -1)\n\
+       <Key>Next:              Page(Forward)\n\
+       <Key>Prior:             Page(Back)
+
+!! Xlock.
+xlock.mode:                    random
+xlock.enablesaver:             true
+xlock*background:              black
+xlock*foreground:              white
+xlock*erasedelay:              100
+xlock*boil:                    true
+xlock*trek:                    0
+
+phosphor*cursor:               333
+phosphor*delay:                        60000
+phosphor*program:              /usr/games/fortune
+phosphor*font:                 fixed
+phosphor*scale:                        3
+phosphor*ticks:                        20
+noseguy*program:               /usr/games/fortune -s
+
+!! XDvi
+XDvi.keepPosition:             true
+XDvi.shrinkFactor:             6
+XDvi.background:               white
+XDvi.expert:                   true
+XDvi.statusline:               false
+XDvi.Hush:                     true
+XDvi.thorough:                 true
+XDvi.gsAlpha:                  true
+XDvi.not1lib:                  true
+XDvi.watchFile:                        1
+xdvirv.background:             black
+xdvirv.foreground:             white
+xdvirv.highlight:              black
+
+!! xbiff.
+xbiff*volume:                  0
+
+!! tkinfo.
+tkinfo*pagesep:                        0
+tkinfo*showballoons:           0
+tkinfo*geometry:               80x54
+tkinfo*linkfont:               FIXED
+tkinfo*highlightfont:          FIXED
+tkinfo*searchfont:             FIXED
+tkinfo*Text.font:              FIXED
+
+!! xdaliclock.
+xdaliclock*mode:               24
+xdaliclock*datemode:           yy/mm/dd
+xdaliclock*cycle:              true
+xdaliclock*memory:             low
+!! xdaliclock*font:            \
+!!     -*-palatino-bold-i-normal--*-360-*-*-p-*-iso8859-1
+xdaliclock*font:               BUILTIN
+
+!! xboard.
+xboard*boardSize:              small
+xboard*firstChessProgram:      crafty
+xboard*secondChessProgram:     crafty
+
+!! dtwm (bletch).
+dtwm*iconPlacement:            top right tight
+
+!! XLess.
+xless*labelFont:               NICEFONT
+xless*buttonFont:              NICEFONT
+xless*textFont:                        FIXED
+xless*editorDoesWindows:       true
+
+!! Ghostview.
+ghostview*page.background:     white
+ghostview*magstep:             2
+
+!! XZX.
+xzx*scale:                     2
+xzx*joyUp:                     q
+xzx*joyDown:                   a
+xzx*joyLeft:                   i
+xzx*joyRight:                  o
+xzx*joyFire:                   space
+xzx*sound:                     true
+xzx*mf128:                     true
+xzx*libDir:                    .:/usr/lib/xzx:/usr/local/share/spectrum
+
+!! Axiom hyperdoc.
+Axiom.hyperdoc.RmFont:         HELV_MR12
+Axiom.hyperdoc.BoldFont:       HELV_BR12
+Axiom.hyperdoc.ActiveFont:     HELV_MR12
+Axiom.hyperdoc.EmphasizeFont:  HELV_MI12
+Axiom.hyperdoc.ActiveColor:    blue
+Axiom.hyperdoc.AxiomFont:      FIXED
+Axiom.hyperdoc.TtFont:         FIXED
+Axiom.hyperdoc.InputForeground:        black
+Axiom.hyperdoc.InputBackground:        white
+Axiom.hyperdoc.Background:     lightgrey
+