aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2014-09-25 11:43:05 +0200
committerMarc André Tanner <mat@brain-dump.org>2014-09-25 11:43:05 +0200
commitcf2d9645e703f37d96af372b67168989862c1478 (patch)
tree74210340647c1a45eab5513a1b9854e686f883e8
parent5d43998c54d35358d154ad99add19cd1130f9f3e (diff)
downloadvis-cf2d9645e703f37d96af372b67168989862c1478.tar.gz
vis-cf2d9645e703f37d96af372b67168989862c1478.tar.xz
Introduce text_line_lastchar
-rw-r--r--text-motions.c8
-rw-r--r--text-motions.h9
2 files changed, 13 insertions, 4 deletions
diff --git a/text-motions.c b/text-motions.c
index 69afcc7..85deab8 100644
--- a/text-motions.c
+++ b/text-motions.c
@@ -126,6 +126,14 @@ size_t text_line_finish(Text *txt, size_t pos) {
return it.pos;
}
+size_t text_line_lastchar(Text *txt, size_t pos) {
+ char c;
+ Iterator it = text_iterator_get(txt, text_line_end(txt, pos));
+ if (text_iterator_char_prev(&it, &c) && c == '\n')
+ text_iterator_byte_next(&it, NULL);
+ return it.pos;
+}
+
size_t text_line_end(Text *txt, size_t pos) {
char c;
Iterator it = text_iterator_get(txt, pos);
diff --git a/text-motions.h b/text-motions.h
index 18457a5..4afa56b 100644
--- a/text-motions.h
+++ b/text-motions.h
@@ -21,16 +21,17 @@ size_t text_char_prev(Text*, size_t pos);
size_t text_find_char_next(Text*, size_t pos, const char *s, size_t len);
size_t text_find_char_prev(Text*, size_t pos, const char *s, size_t len);
-/* begin finish next
- * v v v
+/* begin finish end next
+ * v v v v
* [\r]\n I am a line! [\r]\n
- * ^ ^ ^
- * prev start end
+ * ^ ^ ^
+ * prev start lastchar
*/
size_t text_line_prev(Text*, size_t pos);
size_t text_line_begin(Text*, size_t pos);
size_t text_line_start(Text*, size_t pos);
size_t text_line_finish(Text*, size_t pos);
+size_t text_line_lastchar(Text*, size_t pos);
size_t text_line_end(Text*, size_t pos);
size_t text_line_next(Text*, size_t pos);
/*