3 files changed, 107 insertions, 76 deletions
diff --git a/source/x/xterm/XTerm-console b/source/x/xterm/XTerm-console
new file mode 100644
index 000000000..7dbe6d55b
--- /dev/null
+++ b/source/x/xterm/XTerm-console
@@ -0,0 +1,102 @@
+! /etc/X11/app-defaults/XTerm-console !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+!  This resorce file will, as much as possible, configure
+!  xterm to look and act like a linux console:
+
+#include "XTerm-upstream"
+
+! VT100 Fonts !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*VT100.renderFont: false
+!   - Use bitmap fonts by default. User can switch to Scalable/TrueType 
+!     fonts from the VT_FONTS ctrl/right-click menu if required. 
+
+*VT100.initialFont: 3
+!   - Choose which of the following gets used on start, values: 1-6, or 'd'.
+!     It probably makes sense to set this to the same as the default font.
+
+! Bitmap fonts:
+!   note: Some folks may find these a little large, but 'hidpi' display
+!   users will appreciate the larger sizes, and the other sizes in the
+!   the terminus series don't maintain a consistent aspect ration and 
+!   can look a little odd when being resized.
+
+*VT100.font: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
+*VT100.font1: -*-terminus-bold-r-normal-*-12-*-*-*-*-*-iso10646-1
+*VT100.font2: -*-terminus-bold-r-normal-*-16-*-*-*-*-*-iso10646-1
+*VT100.font3: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
+*VT100.font4: -*-terminus-bold-r-normal-*-24-*-*-*-*-*-iso10646-1
+*VT100.font5: -*-terminus-bold-r-normal-*-28-*-*-*-*-*-iso10646-1
+*VT100.font6: -*-terminus-bold-r-normal-*-32-*-*-*-*-*-iso10646-1
+
+! Scalable/TrueType fonts:
+
+*VT100.faceName: monospace
+*VT100.faceSize: 12.0
+*VT100.faceSize1: 6.0
+*VT100.faceSize2: 10.0
+*VT100.faceSize3: 12.0
+*VT100.faceSize4: 16.0
+*VT100.faceSize5: 18.0
+*VT100.faceSize6: 22.0
+
+! VT100 colours and appearance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*VT100.Background: rgb:00/00/00
+*VT100.Foreground: rgb:aa/aa/aa
+*VT100.cursorUnderLine: true
+*VT100.cursorBlink: true
+
+! Simulate underline using colour, just like the console does:
+*VT100.colorULMode: true
+*VT100.colorUL: rgb:00/aa/aa
+
+! Simulate bold using colour, just like the console does:
+*VT100.boldMode: false
+*VT100.colorBDMode: true
+*VT100.colorBD: rgb:ff/ff/ff
+
+! CGA 16-colour palette:
+*VT100.color0: rgb:00/00/00
+*VT100.color1: rgb:aa/00/00
+*VT100.color2: rgb:00/aa/00
+*VT100.color3: rgb:aa/55/00
+*VT100.color4: rgb:00/00/aa
+*VT100.color5: rgb:aa/00/aa
+*VT100.color6: rgb:00/aa/aa
+*VT100.color7: rgb:aa/aa/aa
+*VT100.color8: rgb:55/55/55
+*VT100.color9: rgb:ff/55/55
+*VT100.color10: rgb:55/ff/55
+*VT100.color11: rgb:ff/ff/55
+*VT100.color12: rgb:55/55/ff
+*VT100.color13: rgb:ff/55/ff
+*VT100.color14: rgb:55/ff/ff
+*VT100.color15: rgb:ff/ff/ff
+
+*termName: xterm-16color
+!   - 16 colours only, just like the console.
+
+! Some behavioural stuff to make it work nice !!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*VT100.metaSendsEscape: true
+!   - Send meta-characters as a two-byte sequence prefixed with ESCAPE.
+!     "XTerm.vt100.eightBitInput: false" is an alternative approach
+!     but metaSendsEscape has a menu option in the ctrl-button1
+!     popup menu, allowing the user to turn it off if need be. The
+!     Linux console and most other terminal emulators do this by default.
+
+*VT100.bellIsUrgent: true
+!   - Enable urgency hit for Window managers.
+
+*VT100.charClass: 45-47:48,58:48,64:48
+!   - Set which characters are selected by double click.
+
+!*VT100.locale: true
+!   - Seems better to use the XTerm.locale below, as this throws an
+!     error if LC_ALL is unset.
+
+*XTerm.locale: true
+!   - Enable conversion between the locale and utf-8.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! End. !
diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad
deleted file mode 100644
index 12c4fdfed..000000000
--- a/source/x/xterm/linux-console-xterm.ad
+++ /dev/null
@@ -1,71 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!  These resources will, as much as possible, configure xterm to look
-!  like a linux console.
-!  To use this file, copy it to: /etc/X11/app-defaults/XTerm
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! Choose one below:
-!XTerm.termName: xterm-new
-!!   Use the more featureful 'xterm-new' terminfo entry.
-XTerm.termName: xterm
-!   Use the standard 'xterm' terminfo entry.
-
-XTerm.locale: true
-!   Enable conversion between the locale and utf-8 if necessary.
-!XTerm.ptyInitialErase: false
-!   Set the tty erase setting to match the terminfo/cap definition for
-!   this terminal type.
-!XTerm.backarrowKeyIsErase: true
-!   Send the erase character when the backarrow key (a.k.a. backspace)
-!   is pressed.
-XTerm.vt100.metaSendsEscape: true
-!   Send meta-characters as a two-byte sequence prefixed with ESCAPE.
-!   "XTerm.vt100.eightBitInput: false" is an alternative approach
-!   but metaSendsEscape has a menu option in the ctrl-button1
-!   popup menu, allowing the user to turn it off if need be. The
-!   Linux console and most other terminal emulators do this by default.
-XTerm.vt100.bellIsUrgent: true
-!   Enable urgency hit for Window managers.
-XTerm.vt100.renderFont: false
-!   Use bitmap fonts by default.User can switch to ttyfonts from menu,
-!   if required. 
-XTerm.vt100.font: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1
-XTerm.vt100.font1: -*-terminus-medium-r-normal-*-12-*-*-*-*-*-iso10646-1
-XTerm.vt100.font2: -*-terminus-medium-r-normal-*-14-*-*-*-*-*-iso10646-1
-XTerm.vt100.font3: -*-terminus-medium-r-normal-*-16-*-*-*-*-*-iso10646-1
-XTerm.vt100.font4: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1
-XTerm.vt100.font5: -*-terminus-medium-r-normal-*-24-*-*-*-*-*-iso10646-1
-XTerm.vt100.font6: -*-terminus-medium-r-normal-*-32-*-*-*-*-*-iso10646-1
-
-XTerm.vt100.faceName: monospace
-XTerm.vt100.faceSize: 14.0
-XTerm*Background: rgb:00/00/00
-XTerm*Foreground: rgb:aa/aa/aa
-XTerm*cursorUnderLine: true
-XTerm*cursorBlink: true
-XTerm*boldMode: false
-XTerm*colorULMode: true
-XTerm*colorUL: rgb:00/aa/aa
-XTerm*colorBDMode: true
-XTerm*colorBD: rgb:ff/ff/ff
-! CGA 16-colour palatte:
-XTerm*color0: rgb:00/00/00
-XTerm*color1: rgb:aa/00/00
-XTerm*color2: rgb:00/aa/00
-XTerm*color3: rgb:aa/55/00
-XTerm*color4: rgb:00/00/aa
-XTerm*color5: rgb:aa/00/aa
-XTerm*color6: rgb:00/aa/aa
-XTerm*color7: rgb:aa/aa/aa
-XTerm*color8: rgb:55/55/55
-XTerm*color9: rgb:ff/55/55
-XTerm*color10: rgb:55/ff/55
-XTerm*color11: rgb:ff/ff/55
-XTerm*color12: rgb:55/55/ff
-XTerm*color13: rgb:ff/55/ff
-XTerm*color14: rgb:55/ff/ff
-XTerm*color15: rgb:ff/ff/ff
-
-XTerm*charClass: 45-47:48,58:48,64:48
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index ff1aff97e..0b1aa21fd 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xterm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -113,10 +113,10 @@ cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
 
 # Install a sample XTerm app-defaults that looks like the Linux console.
 # Thanks to GazL.
-cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
-cp -a $CWD/linux-console-xterm.ad $PKG/etc/X11/app-defaults/XTerm.linux.console
-chown root:root $PKG/etc/X11/app-defaults/XTerm.linux.console
-chmod 644 $PKG/etc/X11/app-defaults/XTerm.linux.console
+cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm-upstream
+cp -a $CWD/XTerm-console $PKG/etc/X11/app-defaults/XTerm-console
+chown root:root $PKG/etc/X11/app-defaults/XTerm-console
+chmod 644 $PKG/etc/X11/app-defaults/XTerm-console
 
 # Install app-defaults as .new:
 mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new