From 293c2f6696bbaae215983291c0516c2e37fc7635 Mon Sep 17 00:00:00 2001
From: Christian Rocha <christian@rocha.is>
Date: Fri, 10 Jan 2020 23:46:46 -0500
Subject: [PATCH] Also use escape to quit

---
 example/main.go |  4 +++-
 key.go          | 31 +++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/example/main.go b/example/main.go
index 9a212e8..ce4b2ce 100644
--- a/example/main.go
+++ b/example/main.go
@@ -36,6 +36,8 @@ func update(msg tea.Msg, model tea.Model) (tea.Model, tea.Cmd) {
 			}
 
 		case "q":
+			fallthrough
+		case "esc":
 			return m, tea.Quit
 
 		}
@@ -56,7 +58,7 @@ func view(model tea.Model) string {
 	)
 
 	return fmt.Sprintf(
-		"What to do today?\n\n%s\n\n(press j/k or up/down to select, q to quit)",
+		"What to do today?\n\n%s\n\n(press j/k or up/down to select, q or esc to quit)",
 		choices,
 	)
 }
diff --git a/key.go b/key.go
index 0bbd0a3..c16b30c 100644
--- a/key.go
+++ b/key.go
@@ -9,6 +9,17 @@ import (
 // KeyPressMsg contains information about a keypress
 type KeyPressMsg string
 
+// Control keys
+const (
+	keyESC = 27
+	keyUS  = 31
+)
+
+var controlKeyNames = map[int]string{
+	keyESC: "esc",
+	keyUS:  "us",
+}
+
 var keyNames = map[string]string{
 	"\x1b[A": "up",
 	"\x1b[B": "down",
@@ -27,16 +38,24 @@ func ReadKey(r io.Reader) (string, error) {
 		return "", err
 	}
 
-	// Was it a special key, like an arrow key?
-	if s, ok := keyNames[string(buf[:n])]; ok {
-		return s, nil
-	}
-
-	// Nope, just a regular key
+	// Get rune
 	c, _ := utf8.DecodeRune(buf[:])
 	if c == utf8.RuneError {
 		return "", errors.New("no such rune")
 	}
 
+	// Is it a control character?
+	if n == 1 && c <= keyUS {
+		if s, ok := controlKeyNames[int(c)]; ok {
+			return s, nil
+		}
+	}
+
+	// Is it a special key, like an arrow key?
+	if s, ok := keyNames[string(buf[:n])]; ok {
+		return s, nil
+	}
+
+	// Nope, just a regular, ol' rune
 	return string(c), nil
 }