aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-30 17:36:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-30 17:36:37 +0000
commit61318d068e486eab77b833ed2bd2e4036ee54b25 (patch)
tree9f6f0c7e3610e5acf4492c6b479a7a0b2da4ed3e
parentrender: search box: fix glyph spacing (diff)
search: utility functions distance_{next,prev}_word()
These functions calculate the distance from the current cursor to the next/previous word.
-rw-r--r--search.c56
1 files changed, 56 insertions, 0 deletions
diff --git a/search.c b/search.c
index 4812b73f..5c9c16e5 100644
--- a/search.c
+++ b/search.c
@@ -1,6 +1,7 @@
#include "search.h"
#include <wchar.h>
+#include <wctype.h>
#include <wayland-client.h>
#include <xkbcommon/xkbcommon-compose.h>
@@ -217,6 +218,61 @@ search_update(struct terminal *term)
#undef ROW_DEC
}
+static size_t
+distance_next_word(const struct terminal *term)
+{
+ size_t cursor = term->search.cursor;
+
+ /* First eat non-whitespace. This is the word we're skipping past */
+ while (cursor < term->search.len) {
+ if (iswspace(term->search.buf[cursor++]))
+ break;
+ }
+
+ assert(cursor == term->search.len || iswspace(term->search.buf[cursor - 1]));
+
+ /* Now skip past whitespace, so that we end up at the beginning of
+ * the next word */
+ while (cursor < term->search.len) {
+ if (!iswspace(term->search.buf[cursor++]))
+ break;
+ }
+
+ LOG_INFO("cursor = %zu, iswspace() = %d", cursor, iswspace(term->search.buf[cursor - 1]));
+ assert(cursor == term->search.len || !iswspace(term->search.buf[cursor - 1]));
+
+ if (cursor < term->search.len && !iswspace(term->search.buf[cursor]))
+ cursor--;
+
+ return cursor - term->search.cursor;
+}
+
+static size_t
+distance_prev_word(const struct terminal *term)
+{
+ int cursor = term->search.cursor;
+
+ /* First, eat whitespace prefix */
+ while (cursor > 0) {
+ if (!iswspace(term->search.buf[--cursor]))
+ break;
+ }
+
+ assert(cursor == 0 || !iswspace(term->search.buf[cursor]));
+
+ /* Now eat non-whitespace. This is the word we're skipping past */
+ while (cursor > 0) {
+ if (iswspace(term->search.buf[--cursor]))
+ break;
+ }
+
+ assert(cursor == 0 || iswspace(term->search.buf[cursor]));
+ if (iswspace(term->search.buf[cursor]))
+ cursor++;
+
+ return term->search.cursor - cursor;
+}
+
void
search_input(struct terminal *term, uint32_t key, xkb_keysym_t sym, xkb_mod_mask_t mods)
{