about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-09 07:32:35 -0500
committerJune McEnroe <june@causal.agency>2020-02-09 07:32:35 -0500
commit02ca8e972bbf1b3a5b66df9ba0bd0e77903ba6d8 (patch)
tree976223c3cace260f06b415a376f15b82414019a0
parentAdd C-y (diff)
downloadcatgirl-02ca8e972bbf1b3a5b66df9ba0bd0e77903ba6d8.tar.gz
catgirl-02ca8e972bbf1b3a5b66df9ba0bd0e77903ba6d8.zip
Use iswspace for word movement
-rw-r--r--edit.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/edit.c b/edit.c
index 16fa910..fe79e76 100644
--- a/edit.c
+++ b/edit.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include <wctype.h>
 
 #include "chat.h"
 
@@ -150,11 +151,11 @@ void edit(size_t id, enum Edit op, wchar_t ch) {
 		break; case EditNext: if (pos < len) pos++;
 		break; case EditPrevWord: {
 			if (pos) pos--;
-			while (pos && buf[pos - 1] != L' ') pos--;
+			while (pos && !iswspace(buf[pos - 1])) pos--;
 		}
 		break; case EditNextWord: {
 			if (pos < len) pos++;
-			while (pos < len && buf[pos] != L' ') pos++;
+			while (pos < len && !iswspace(buf[pos])) pos++;
 		}
 
 		break; case EditDeleteHead: delete(0, pos); pos = 0;
@@ -164,14 +165,14 @@ void edit(size_t id, enum Edit op, wchar_t ch) {
 		break; case EditDeletePrevWord: {
 			if (!pos) break;
 			size_t word = pos - 1;
-			while (word && buf[word - 1] != L' ') word--;
+			while (word && !iswspace(buf[word - 1])) word--;
 			delete(word, pos - word);
 			pos = word;
 		}
 		break; case EditDeleteNextWord: {
 			if (pos == len) break;
 			size_t word = pos + 1;
-			while (word < len && buf[word] != L' ') word++;
+			while (word < len && !iswspace(buf[word])) word++;
 			delete(pos, word - pos);
 		}
 		break; case EditPaste: {