From 0c863672d721034d3d63ba62afe8857ea0308cf3 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Fri, 20 Jul 2001 20:30:15 +0000
Subject: [PATCH] Improvements.

---
 config                        |  5 ++--
 files/_.configs_setenvir      |  7 ++++--
 files/_.configs_xbiffs        |  5 +++-
 files/_.configs_xmodmap-kb=pc |  4 ++++
 files/_.vtwmrc                | 44 ++++++++++++++++++++++++++---------
 gpt                           |  4 ++--
 6 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/config b/config
index 6c6b6c6..d9d49e6 100644
--- a/config
+++ b/config
@@ -12,5 +12,6 @@ if ($s =~ m/^Linux$/) {
     }
 }
 
-$ncipher= $hostname =~ m/\.ncipher\.com$/ 
-    || $hostname =~ m/\.ncipherusa\.com$/;
+$ncipher= $hostname =~ m/\.ncipher\.com$/ ? 'cam' :
+          $hostname =~ m/\.ncipherusa\.com$/ ? 'bos' :
+          0;
diff --git a/files/_.configs_setenvir b/files/_.configs_setenvir
index a5ce354..2580c22 100755
--- a/files/_.configs_setenvir
+++ b/files/_.configs_setenvir
@@ -11,7 +11,8 @@ PATH=$PATH:/opt/bin:/usr/bin/X11
 export PATH
 
 CDPATH=:..:$HOME:$HOME/things
-CVSROOT=:ext:iwj@cvs:/ncipher/local-CVS
+CVS_RSH=ssh
+CVSROOT=:ext:cvs:/ncipher/local-CVS
 EDITOR=emacs
 ESHELL=/usr/bin/bash
 HISTORY=256
@@ -24,8 +25,10 @@ PAGER=less
 PS1="$ "
 TRNINIT=$HOME/.trninit
 WWW_HOME=http://www.chiark.greenend.org.uk/~ijackson/
-export CDPATH CVSROOT EDITOR ESHELL HISTORY HOST LANG LESS
+
+export CDPATH CVS_RSH CVSROOT EDITOR ESHELL HISTORY HOST LANG LESS
 export PAGER PERLLIB PS1 TRNINIT WWW_HOME
+
 # NNTPAUTH
 
 NC_SITES=cam:bos
diff --git a/files/_.configs_xbiffs b/files/_.configs_xbiffs
index 9c4b757..d18d6fa 100755
--- a/files/_.configs_xbiffs
+++ b/files/_.configs_xbiffs
@@ -3,7 +3,10 @@
 echo -n @
 
 d="$DISPLAY"
-if [ "x$d" = "x:0.0" ]; then d="$HOSTNAME$DISPLAY"; fi
+if [ "x$d" = "x:0.0" ]; then d="`hostname -f`$DISPLAY"; fi
+@@? $ncipher eq 'bos' ?@@
+rcp .Xauthority dover.ncipher.com:.
+@@;
 
 rsh dover <<END sh
 echo -n @
diff --git a/files/_.configs_xmodmap-kb=pc b/files/_.configs_xmodmap-kb=pc
index 38de9fb..74677ef 100644
--- a/files/_.configs_xmodmap-kb=pc
+++ b/files/_.configs_xmodmap-kb=pc
@@ -7,6 +7,8 @@ keycode 94 = backslash bar
 keycode 103 = Prior
 keycode 99 = End
 keycode 113 = Multi_key
+keycode 64 = Alt_L
+keycode 115 = Alt_L
 
 remove Lock = Caps_Lock
 remove Control = Control_L
@@ -16,3 +18,5 @@ add Lock = Caps_Lock
 add Control = Control_L
 
 clear mod4
+clear mod1
+add mod1 = Alt_L Alt_R
diff --git a/files/_.vtwmrc b/files/_.vtwmrc
index 0de4627..65e9e70 100644
--- a/files/_.vtwmrc
+++ b/files/_.vtwmrc
@@ -282,18 +282,40 @@ menu "programs"
 Menu "hosts"
 {
         "Hosts"		f.title
- "Dounreay"	!"remoteshell dounreay &"
- "Dover"	!"remoteshell -rrsh dover &"
- "Titanic"	!"xterm-CT 'titanic rlogin' -e rlogin titanic &"
- "Belgrano"	!"xterm-CT 'belgrano ssh' -e ssh belgrano &"
+@@-
+	sub host {
+		my ($x,$usex,$rsh) = @_;
+		$x =~ m/^(.)(.*)$/;
+		my ($y) = (uc $1).$2;
+		my ($rlss) = $rsh ? 'rlogin' : 'ssh';
+		return " \"$y\"\t\t!\"".
+ ($usex ? "remoteshell ".($rsh?'-rrsh ':'')."$x" :
+	"xterm-CT '$x $rlss' -e $rlss $x"). "\t&\"";
+	}
+@@
+
+@@? $ncipher ?@@
+@@-
+	sub host_nc {
+		my ($x,$h,$rsh) = @_;
+		&host($x, $ncipher eq $h, $rsh);
+	}
+@@
+@@ &host_nc(	'dounreay',	'cam',	0)	@@
+@@ &host_nc(	'dover',	'cam',	1)	@@
+@@ &host(	'titanic',	0,	1)	@@
+@@ &host(	'belgrano',	0,	0)	@@
  ""		f.nop
- "Jura"		!"remoteshell jura &"
- "Islay"	!"remoteshell -rrsh islay &"
- "Keynes"	!"remoteshell -rrsh keynes &"
- "Scarp"	!"remoteshell -rrsh scarp &"
- "Fowey"	!"remoteshell -rrsh fowey &"
- "Ludlow"	!"remoteshell -rrsh ludlow &"
- "Greenock"	!"remoteshell -rrsh greenock &"
+@@ &host_nc(	'jura',		'cam',	0)	@@
+@@ &host_nc(	'viking',	'bos',	0)	@@
+@@ &host_nc(	'islay',	'cam',	0)	@@
+@@ &host_nc(	'keynes',	'cam',	1)	@@
+@@ &host_nc(	'scarp',	'cam',	1)	@@
+@@ &host_nc(	'fowey',	'cam',	1)	@@
+@@ &host_nc(	'ludlow',	'cam',	1)	@@
+@@ &host_nc(	'greenock',	'cam',	1)	@@
+@@;
+
  ""		f.nop
  "Relativity"	!"xterm-CT 'Relativity' -e ssh -p24 r-ian@relativity.dynamic.greenend.org.uk &"
  ""		f.nop
diff --git a/gpt b/gpt
index f16320c..8524650 100755
--- a/gpt
+++ b/gpt
@@ -89,10 +89,10 @@ sub process_input () {
 	print DEBUG "L $fn:$lno:",join('',@oplist),
 	            ":`$l' e\`$expr' s\`$substr'\n";
 	if (@oplist & 1) { # scanning perl
-	    if ($l =~ m/(.)\@\@/m || $l =~ m/^()\@\@/m) {
+	    if ($l =~ m/^()\@\@/ || $l =~ m/([^\000])\@\@/) {
 		($to,$op,$esc,$l) = ($`,$1,$&,$');
 		add_perl($to);
-		if ($op =~ m/[ 0-9a-zA-Z_\;\)\}?]/ || $op eq '') {
+		if ($op =~ m/[ \t\n0-9a-zA-Z_\;\)\}?]/ || $op eq '') {
 		    $top= pop @oplist;
 		    if (!@oplist) {
 			# And evaluate.
-- 
2.30.2