From f74e19e6733fb284ceffc535822934163e236f14 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sun, 19 Jan 2020 11:16:41 -0600
Subject: [PATCH] Improve alt keys and at alt-f and alt-b to repl

---
 src/mainclient/line.c | 50 +++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/mainclient/line.c b/src/mainclient/line.c
index b549f86e..611d7f52 100644
--- a/src/mainclient/line.c
+++ b/src/mainclient/line.c
@@ -334,6 +334,16 @@ static void kleft(void) {
     }
 }
 
+static void kleftw(void) {
+    while (gbl_pos > 0 && isspace(gbl_buf[gbl_pos - 1])) {
+        gbl_pos--;
+    }
+    while (gbl_pos > 0 && !isspace(gbl_buf[gbl_pos - 1])) {
+        gbl_pos--;
+    }
+    refresh();
+}
+
 static void kright(void) {
     if (gbl_pos != gbl_len) {
         gbl_pos++;
@@ -341,6 +351,16 @@ static void kright(void) {
     }
 }
 
+static void krightw(void) {
+    while (gbl_pos != gbl_len && !isspace(gbl_buf[gbl_pos])) {
+        gbl_pos++;
+    }
+    while (gbl_pos != gbl_len && isspace(gbl_buf[gbl_pos])) {
+        gbl_pos++;
+    }
+    refresh();
+}
+
 static void kbackspace(int draw) {
     if (gbl_pos > 0) {
         memmove(gbl_buf + gbl_pos - 1, gbl_buf + gbl_pos, gbl_len - gbl_pos);
@@ -383,6 +403,13 @@ static int is_symbol_char_gen(uint8_t c) {
             c == '_');
 }
 
+static void kbackspaceword(void) {
+    while (gbl_pos && is_symbol_char_gen(gbl_buf[gbl_pos - 1])) {
+        kbackspace(0);
+    }
+    refresh();
+}
+
 static JanetByteView get_symprefix(void) {
     /* Calculate current partial symbol. Maybe we could actually hook up the Janet
      * parser here...*/
@@ -605,10 +632,7 @@ static int line() {
                 refresh();
                 break;
             case 23: /* ctrl-w */
-                while (gbl_pos && is_symbol_char_gen(gbl_buf[gbl_pos - 1])) {
-                    kbackspace(0);
-                }
-                refresh();
+                kbackspaceword();
                 break;
             case 26: /* ctrl-z */
                 norawmode();
@@ -621,8 +645,8 @@ static int line() {
                  * Use two calls to handle slow terminals returning the two
                  * chars at different times. */
                 if (read(STDIN_FILENO, seq, 1) == -1) break;
-                if (read(STDIN_FILENO, seq + 1, 1) == -1) break;
                 if (seq[0] == '[') {
+                    if (read(STDIN_FILENO, seq + 1, 1) == -1) break;
                     if (seq[1] >= '0' && seq[1] <= '9') {
                         /* Extended escape, read additional byte. */
                         if (read(STDIN_FILENO, seq + 2, 1) == -1) break;
@@ -662,18 +686,16 @@ static int line() {
                                 break;
                         }
                     }
-                } else if (seq[0] == 'O') {
-                    /* Alt codes */
-                    switch (seq[1]) {
+                } else {
+                    /* Check alt-(shift) bindings */
+                    switch (seq[0]) {
                         default:
                             break;
-                        case 'H':
-                            gbl_pos = 0;
-                            refresh();
+                        case 'b':
+                            kleftw();
                             break;
-                        case 'F':
-                            gbl_pos = gbl_len;
-                            refresh();
+                        case 'f':
+                            krightw();
                             break;
                     }
                 }