about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-09 03:56:18 -0500
committerJune McEnroe <june@causal.agency>2020-02-09 03:58:13 -0500
commitd7c96fc81b71b77b30511d6526fe3acaa84c39ee (patch)
tree8a3bafe6dc5fca996b2da40a4905d70ee2eab52a
parentAdd C-d (diff)
downloadcatgirl-d7c96fc81b71b77b30511d6526fe3acaa84c39ee.tar.gz
catgirl-d7c96fc81b71b77b30511d6526fe3acaa84c39ee.zip
Add C-k
Also rename all the edit ops to something consistent.
Diffstat (limited to '')
-rw-r--r--catgirl.16
-rw-r--r--chat.h15
-rw-r--r--edit.c17
-rw-r--r--ui.c29
4 files changed, 37 insertions, 30 deletions
diff --git a/catgirl.1 b/catgirl.1
index f68e6c3..a356fe0 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -201,12 +201,16 @@ Switch to window by number.
 Move to beginning of line.
 .It Ic C-b
 Move left.
+.It Ic C-d
+Delete next character.
 .It Ic C-e
 Move to end of line.
 .It Ic C-f
 Move right.
+.It Ic C-k
+Delete to end of line.
 .It Ic C-u
-Delete line.
+Delete to beginning of line.
 .El
 .
 .Ss Window Keys
diff --git a/chat.h b/chat.h
index d6d9e1c..aa1bcc1 100644
--- a/chat.h
+++ b/chat.h
@@ -145,13 +145,14 @@ void uiFormat(
 ) __attribute__((format(printf, 4, 5)));
 
 enum Edit {
-	EditHome,
-	EditEnd,
-	EditLeft,
-	EditRight,
-	EditKill,
-	EditErase,
-	EditDelete,
+	EditHead,
+	EditTail,
+	EditPrev,
+	EditNext,
+	EditKillPrev,
+	EditKillNext,
+	EditDeletePrev,
+	EditDeleteNext,
 	EditInsert,
 	EditComplete,
 	EditEnter,
diff --git a/edit.c b/edit.c
index c30e725..7fcff40 100644
--- a/edit.c
+++ b/edit.c
@@ -133,14 +133,15 @@ static void tabReject(void) {
 void edit(size_t id, enum Edit op, wchar_t ch) {
 	size_t init = pos;
 	switch (op) {
-		break; case EditHome:  pos = 0;
-		break; case EditEnd:   pos = len;
-		break; case EditLeft:  if (pos) pos--;
-		break; case EditRight: if (pos < len) pos++;
-
-		break; case EditKill:   len = pos = 0;
-		break; case EditErase:  if (pos) delete(--pos, 1);
-		break; case EditDelete: delete(pos, 1);
+		break; case EditHead: pos = 0;
+		break; case EditTail: pos = len;
+		break; case EditPrev: if (pos) pos--;
+		break; case EditNext: if (pos < len) pos++;
+
+		break; case EditDeletePrev: if (pos) delete(--pos, 1);
+		break; case EditDeleteNext: delete(pos, 1);
+		break; case EditKillPrev: delete(0, pos); pos = 0;
+		break; case EditKillNext: delete(pos, len - pos);
 
 		break; case EditInsert: {
 			reserve(pos, 1);
diff --git a/ui.c b/ui.c
index 8e502ca..d83a1f3 100644
--- a/ui.c
+++ b/ui.c
@@ -624,13 +624,13 @@ static void keyCode(int code) {
 
 		break; case KeyMetaM: waddch(windows.active->pad, '\n');
 
-		break; case KEY_BACKSPACE: edit(id, EditErase, 0);
-		break; case KEY_DC: edit(id, EditDelete, 0);
-		break; case KEY_END: edit(id, EditEnd, 0);
+		break; case KEY_BACKSPACE: edit(id, EditDeletePrev, 0);
+		break; case KEY_DC: edit(id, EditDeleteNext, 0);
+		break; case KEY_END: edit(id, EditTail, 0);
 		break; case KEY_ENTER: edit(id, EditEnter, 0);
-		break; case KEY_HOME: edit(id, EditHome, 0);
-		break; case KEY_LEFT: edit(id, EditLeft, 0);
-		break; case KEY_RIGHT: edit(id, EditRight, 0);
+		break; case KEY_HOME: edit(id, EditHead, 0);
+		break; case KEY_LEFT: edit(id, EditPrev, 0);
+		break; case KEY_RIGHT: edit(id, EditNext, 0);
 		
 		break; default: {
 			if (code >= KeyMeta0 && code <= KeyMeta9) {
@@ -643,17 +643,18 @@ static void keyCode(int code) {
 static void keyCtrl(wchar_t ch) {
 	size_t id = windows.active->id;
 	switch (ch ^ L'@') {
-		break; case L'?': edit(id, EditErase, 0);
-		break; case L'A': edit(id, EditHome, 0);
-		break; case L'B': edit(id, EditLeft, 0);
-		break; case L'D': edit(id, EditDelete, 0);
-		break; case L'E': edit(id, EditEnd, 0);
-		break; case L'F': edit(id, EditRight, 0);
-		break; case L'H': edit(id, EditErase, 0);
+		break; case L'?': edit(id, EditDeletePrev, 0);
+		break; case L'A': edit(id, EditHead, 0);
+		break; case L'B': edit(id, EditPrev, 0);
+		break; case L'D': edit(id, EditDeleteNext, 0);
+		break; case L'E': edit(id, EditTail, 0);
+		break; case L'F': edit(id, EditNext, 0);
+		break; case L'H': edit(id, EditDeletePrev, 0);
 		break; case L'I': edit(id, EditComplete, 0);
 		break; case L'J': edit(id, EditEnter, 0);
+		break; case L'K': edit(id, EditKillNext, 0);
 		break; case L'L': clearok(curscr, true);
-		break; case L'U': edit(id, EditKill, 0);
+		break; case L'U': edit(id, EditKillPrev, 0);
 	}
 }