From 397f7f8752e48c4055b672fd761087271d77746a Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Sun, 7 Dec 2014 12:20:56 -0500
Subject: [PATCH] client line handling improvements

---
 client.go | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/client.go b/client.go
index 47cf2b8..3c8d3d7 100644
--- a/client.go
+++ b/client.go
@@ -78,7 +78,8 @@ func (c *Client) info(template string, args ...interface{}) {
 }
 
 func (c *Client) trunc() {
-	fmt.Print("\r")
+	fmt.Print("\033[1K") // clear to beginning of the line
+	fmt.Print("\r")      // move to beginning of the line
 }
 
 func (c *Client) err(template string, args ...interface{}) {
@@ -105,21 +106,27 @@ func (c *Client) run() {
 }
 
 func (c *Client) renderLine() {
-	fmt.Printf("\r%s%s", c.prompt, string(c.line))
+	fmt.Printf("\033[1K")                        // clear to beginning of current line
+	fmt.Printf("\r")                             // move to beginning of current line
+	fmt.Printf("%s%s", c.prompt, string(c.line)) // print the line with prompt
 }
 
 func (c *Client) control(r rune) {
 	switch r {
-	case 13: // enter
-		c.enter()
-	case 12: // ctrl+l
-		c.clear()
 	case 3: // ctrl+c
 		c.eof()
 	case 4: // EOF
 		c.eof()
+	case 12: // ctrl+l
+		c.clear()
+	case 13: // enter
+		c.enter()
+	case 21: // ctrl+u
+		c.clearLine()
+	case 127: // backspace
+		c.backspace()
 	default:
-		c.info("control: %v %d %c", r, r, r)
+		c.info("undefined control sequence: %v %d %c", r, r, r)
 	}
 }
 
@@ -130,7 +137,8 @@ func (c *Client) enter() {
 }
 
 func (c *Client) eof() {
-	fmt.Print("\r")
+	fmt.Print("\033[1K") // clear to beginning of current line
+	fmt.Print("\r")      // move to beginning of current line
 	c.done <- 1
 }
 
@@ -140,6 +148,19 @@ func (c *Client) clear() {
 	c.renderLine()
 }
 
+func (c *Client) clearLine() {
+	c.line = make([]rune, 0, 32)
+	c.renderLine()
+}
+
+func (c *Client) backspace() {
+	if len(c.line) == 0 {
+		return
+	}
+	c.line = c.line[:len(c.line)-1]
+	c.renderLine()
+}
+
 func (c *Client) term() {
 	old, err := terminal.MakeRaw(0)
 	if err != nil {