From 0c21a07dae6f6ac216e5411e0e5cd05955abe9af Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 13 Jun 2016 12:08:13 +0100
Subject: [PATCH] chiarks, on mariner

---
 dot/configs/chiarks  | 24 ++++++++++++++++++++++++
 dot/configs/xclients |  7 +++++--
 scripts/xterm-CT     | 24 ++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100755 dot/configs/chiarks
 create mode 100755 scripts/xterm-CT

diff --git a/dot/configs/chiarks b/dot/configs/chiarks
new file mode 100755
index 0000000..14df3d6
--- /dev/null
+++ b/dot/configs/chiarks
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+eval `cd $HOME && .configs/configure`
+
+# ssh -L 6667:chiark:6667 -L 3128:chiark:3128 ijackson@chiark.greenend.org.uk sleep 604800 </dev/null &
+
+case "$1" in
+-q)	exit 0;;
+'')	;;
+*)	echo >&2 'usage: .../chiarks [-q]'; exit 1;;
+esac
+
+for x in 3 2 1
+do
+	sz=80x55
+	y=$(( 35*$x+100+$pixels_y ))
+	xb=$(( (($pixels_x-503)*(3-$x))/2 ))
+	xterm-CT "chiark ssh #$x" -geometry $sz+$xb+$y \
+		-e ssh tunnel.chiark.greenend.org.uk -l ijackson &
+	echo -n :
+#	xterm-CT "chiark ssh ian #$x" -geometry $sz+$(( $pixels_x + $xb ))+$y \
+#		-e ssh tunnel.chiark.greenend.org.uk -l ian &
+#	echo -n :
+done
diff --git a/dot/configs/xclients b/dot/configs/xclients
index 81ea9a7..73764fb 100755
--- a/dot/configs/xclients
+++ b/dot/configs/xclients
@@ -23,8 +23,11 @@ mate-power-manager &
 (sleep 1; exec nm-applet) &
 
 
-.configs/chiarks
-
+case "$(hostname)" in
+mariner)
+        .configs/chiarks
+        ;;
+esac
 
 #
 #if test -d /proc/acpi/battery; then
diff --git a/scripts/xterm-CT b/scripts/xterm-CT
new file mode 100755
index 0000000..15e8d7c
--- /dev/null
+++ b/scripts/xterm-CT
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+titlebase="$1"
+shift
+touch "$HOME/.counters/l.$DISPLAY"
+newcount=`with-lock-ex -w "$HOME/.counters/l.$DISPLAY" perl -e '
+	chdir($ARGV[2]) or die $!;
+	$tb= unpack("H*",$ARGV[1]); $found=0;
+	open(X,"v.$ARGV[0]\0") or die $!;
+	open(Z,">n.$ARGV[0]\0") or die $!;
+	while (<X>) {
+		if (m/^(\d+) $tb$/o && !$found++) {
+			$nx= $1+1;
+		} else {
+			print Z "$_" or die $!;
+		}
+	}
+	if (!defined($nx)) { $nx= 1; }
+	print Z "$nx $tb\n" or die $!;
+	close(Z) or die $!;
+	rename("n.$ARGV[0]","v.$ARGV[0]") or die $!;
+	print "$nx\n";
+' "$DISPLAY" "$titlebase" "$HOME/.counters"`
+exec xterm -T "$titlebase"' ['$newcount']' "$@"
-- 
2.30.2