From ccee548fda64eeb62a771e01b5ddab5f4177b2bf Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Thu, 4 Dec 2003 19:18:06 +0000
Subject: [PATCH] .

---
 TODO        | 53 ++++++++++++++++++++---------------------------------
 plumb/basic | 24 ++++++++++++++++++++++--
 rcmain      |  1 -
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/TODO b/TODO
index e46c76a8..e09311a6 100644
--- a/TODO
+++ b/TODO
@@ -1,48 +1,35 @@
-* Bring over various trivial but useful command-line programs:
-	cal
-	calendar
-	date
-	diff
-	echo
-	ed
-	hoc
-
 * Libdraw
-	- should implement the alt sequences for unicode composition
-	  the code is in drawterm, just needs to be pulled in.
-	- snarf code doesn't work on mac os?
+	- bug with discovery of initial window size in certain cases
+	  (reported by Sean Dorward)
 
 * Plumber
-	- need to redefine how you find and talk to the plumber,
-	  probably using named pipes or unix sockets.
-	- hook samterm up to the plumber
-	- now trivial to plumb to web browser!
+	- have named-pipe-based plumber from Caerwyn Jones
+	- 9term right-click plumbs
+	- plumb rules file runs B
+	- easy to hook up web browser:
 
-* 9term
-	- would be great to have a 9term lookalike that was 
-	  a little more faithful (or, better, like acme win)
+# urls to web browser
+type is text
+data matches '(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)://[a-zA-Z0-9_@\-]+([.:][a-zA-Z0-9_@\-]+)*/?[a-zA-Z0-9_?,%#~&/\-+=]+([:.][a-zA-Z0-9_?,%#~&/\-+=]+)*'
+plumb to web
+plumb start /usr/rsc/bin/web $0
+
+	- want to change back to 9P-based plumber, need to build
+	  infrastructure first
 
 * Acme
-	- once have a plumber, might not be too hard to
-	  redo the file system interface as a text rpc
-	  over unix domain sockets.
-	- until then, the x11 "ion" window manager is an
-	  interesting half-way point.  perhaps it makes
-	  more sense to split acme's editing into tightly
-	  coupled separate programs (perhaps communicating
-	  via the plumber?) and then have acme be
-	  a window manager a bit like ion?
+	- with 9P infrastructure, should "just work".
 
-* Mail
-	- no ideas here
+* upas/fs+Mail
+	- with 9P infrastructure, should "just work".
 
 * Venti
-	- server port is in progress (actually done, but with an 
-	  earlier library set).
-	- vac is easy to port
+	- wrote new venti library; server uses it and runs
+	- vac needs to be changed to use new library
 	- need way to mount vacs.  have all the code for a /vac file
 	  system (e.g., cd /vac/68b329da9893e34099c7d8ad5cb9c940da9393e3)
 	  but need to put it together.
+	- need to buffer writes sensibly in server.  have plan, need to implement.
 
 * Dump
 	- have a dump file system that sits on the side of ffs,
diff --git a/plumb/basic b/plumb/basic
index dd391698..a065799e 100644
--- a/plumb/basic
+++ b/plumb/basic
@@ -59,10 +59,30 @@ plumb to edit
 plumb start /usr/local/plan9/bin/B $file:$3
 # plumb client window $editor
 
-# .h files are looked up in /sys/include and passed to edit
+# .h files are looked up in /usr/include and passed to edit
 type is text
 data matches '([a-zA-Z¡-￿0-9]+\.h)('$addr')?'
-arg isfile	/sys/include/$1
+arg isfile	/usr/include/$1
+data set	$file
+attr add	addr=$3
+plumb to edit
+plumb start /usr/local/plan9/bin/B $file:$3
+# plumb client window $editor
+
+# .h files are looked up in /usr/local/include and passed to edit
+type is text
+data matches '([a-zA-Z¡-￿0-9]+\.h)('$addr')?'
+arg isfile	/usr/local/include/$1
+data set	$file
+attr add	addr=$3
+plumb to edit
+plumb start /usr/local/plan9/bin/B $file:$3
+# plumb client window $editor
+
+# .h files are looked up in /usr/local/plan9/include and passed to edit
+type is text
+data matches '([a-zA-Z¡-￿0-9]+\.h)('$addr')?'
+arg isfile	/usr/local/plan9/include/$1
 data set	$file
 attr add	addr=$3
 plumb to edit
diff --git a/rcmain b/rcmain
index f4213632..c4dda4cd 100644
--- a/rcmain
+++ b/rcmain
@@ -24,7 +24,6 @@ if(! ~ $#cflag 0){
 }
 if not if(flag i){
 	if(~ $TERM 9term){
-		stty tabs -onlcr -echo
 		if(~ $#'fn#cd' 0)
 			fn cd { builtin cd $1 && label `{pwd} }
 	}