From bf3b7c070ce0c060e53dfc3638c1da904772d0c7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 13 Jun 2016 12:01:54 +0100
Subject: [PATCH] merge vtwmrc, turn it into a template

---
 dot/configs/list                  |  3 +++
 dot/trnmailcap                    |  1 +
 dot/vtwmrc => templates/vtwmrc.in | 30 +++++++++++++-----------------
 3 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 dot/trnmailcap
 rename dot/vtwmrc => templates/vtwmrc.in (94%)
 mode change 100644 => 100755

diff --git a/dot/configs/list b/dot/configs/list
index 7341d1f..008a5d2 100644
--- a/dot/configs/list
+++ b/dot/configs/list
@@ -23,6 +23,9 @@ dpi_x>104           : font=larger
 pixels_x>1024		: maccel=4 mthresh=5
 dpi_x>99		: maccel=3 mthresh=5
 
+default         : vtwmvdesktop=6432x3608-208-0
+pixels_x=3200   : vtwmvdesktop=19200x9100-0-0
+
 display=lettuce     : font=fixed
 display=flamingo    : font=fixed
 
diff --git a/dot/trnmailcap b/dot/trnmailcap
new file mode 100644
index 0000000..0993bcc
--- /dev/null
+++ b/dot/trnmailcap
@@ -0,0 +1 @@
+application/octet-stream; /u/iwj/personal/linux-i386/bin/show-octet-stream %s
diff --git a/dot/vtwmrc b/templates/vtwmrc.in
old mode 100644
new mode 100755
similarity index 94%
rename from dot/vtwmrc
rename to templates/vtwmrc.in
index 844ca56..1ca85fc
--- a/dot/vtwmrc
+++ b/templates/vtwmrc.in
@@ -1,3 +1,8 @@
+#!/bin/bash
+set -e
+. infra/template
+
+cat <<END
 #
 # Ian's twm configuration file.
 #
@@ -26,18 +31,11 @@ Function "select" { f.iconify f.deiconify }
 WindowFunction f.function "select"
 WindowRing { "emacs" "emacs18" "XTerm" }
 OldFashionedTwmWindowsMenu
+NoStackMode { "emacs" "Iceweasel" }
 
-NoStackMode {
-	"Iceweasel"
-}
-
-#VirtualDesktop "6x5-0-0" 48
-VirtualDesktop "19200x9100-0-0" 48
-
-#VirtualDesktop "8228x3848-0-0" 48
+VirtualDesktop $vtwmvdesktop 48
 
 #VirtualDesktop "6432x3608-208-0" 48
-
 #VirtualDesktop "6400x3600-208-0" 48
 # +32,+8
 
@@ -218,7 +216,6 @@ Function "drag-with-up" {
 	f.nail
 	!"raise-mini-desktop"
 }
-
 Function "drag-with-down" {
 	f.nail
 	f.pandown "100"
@@ -318,11 +315,11 @@ menu "programs"
  "IRC Diziet" !"xterm -geometry 80x24+24-0 -T ' IRC' -e sh -c 'ssh -vt ijackson@tunnel.chiark.greenend.org.uk screen -x irc; read x' &"
 # "IRC iwj" !"xterm -geometry 80x70+340-0 -T 'IRC iwj' -e irc iwj cam.irc.devel.ncipher.com &"
    	""		f.nop
-	"Trn"		!"xterm -geometry 80x45+240+95 -e trn &"
+	"Trn"		!"MAILCAPS=/u/iwj/.trnmailcap xterm -geometry 80x45+240+95 -e trn4 &"
    	"Archie"	!"xarchie &"
    	"Calc"		!"xcalc &"
 #   	"Xab large"	!"xab &"
-#   	"Xab small"	!"perl -e '$xab=\"xab\"; exec $xab \"other-xab\"' &"
+#   	"Xab small"	!"perl -e '\$xab=\"xab\"; exec \$xab \"other-xab\"' &"
    	""		f.nop
    	"Management"	f.menu "special"
    	"Hosts"		f.menu "hosts"
@@ -361,9 +358,9 @@ Menu "hosts"
  "Shep"		!"xterm-CT 'shep ssh' -e ssh shep.cl.cam.ac.uk -l iwj10 &"
  "Ouse"		!"xterm-CT 'ouse ssh' -e ssh ouse.cl.cam.ac.uk -l iwj10 &"
 	""		f.nop
- "Chiark"	!"xterm-CT 'chiark ssh' -e ssh chiark.greenend.org.uk -l ijackson &"
- "Chiark ian"	!"xterm-CT 'chiark ssh ian' -e ssh chiark.greenend.org.uk -l ian &"
- "Chiark II"	!"xterm-CT 'chiark ssh II' -e ssh chiark.greenend.org.uk -t -l ijackson personal/linux/bin/II &"
+ "Chiark"	!"xterm-CT 'chiark ssh' -e ssh tunnel.chiark.greenend.org.uk -l ijackson &"
+ "Chiark ian"	!"xterm-CT 'chiark ssh ian' -e ssh tunnel.chiark.greenend.org.uk -l ian &"
+ "Chiark II"	!"xterm-CT 'chiark ssh II' -e ssh tunnel.chiark.greenend.org.uk -t -l ijackson personal/linux/bin/II &"
  "Iguana"	!"xterm-CT 'iguana ssh' -e ssh iguana.ucam.org -l ijackson &"
  "Utter"	!"xterm-CT 'utter ssh' -e ssh utter.chaos.org.uk -l ijackson &"
 	""		f.nop
@@ -382,8 +379,6 @@ Menu "hosts"
  "Va"		!"xterm-CT 'va' -e ssh va.debian.org -l iwj &"
  "Nyx"		!"xterm-CT 'nyx - rlogin' -e rlogin nyx.cs.du.edu -l ijackson &"
  "Sunsite"	!"xterm-CT 'sunsite' -e rlogin sunsite.unc.edu -l iwj &"
- "White"		!"xterm-CT 'white' -geometry 80x25 -e sh -c \
- 		'rlogin white.dogwood.com; line >/dev/null' &"
 }
 
 Menu "demos"
@@ -414,3 +409,4 @@ Menu "games"
 	"Solitaire"			!"xsol &"
 	"Spider"			!"spider &"
 }
+END
-- 
2.30.2