diff options
author | June McEnroe <june@causal.agency> | 2022-02-18 23:39:46 -0500 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2022-02-18 23:39:46 -0500 |
commit | 573bc855a68766f38de2acb48bebc9d0adbf0a1f (patch) | |
tree | 18e2ffa24eba70eaf239987e242d21557b73fecb /ui.c | |
parent | Fix M-f ordering (diff) | |
download | catgirl-573bc855a68766f38de2acb48bebc9d0adbf0a1f.tar.gz catgirl-573bc855a68766f38de2acb48bebc9d0adbf0a1f.zip |
Simplify cursor positioning in input
Do some extra work by adding the portion before the cursor to the input window twice, but simplify the interaction with the split point. This fixes the awkward behaviour when moving the cursor across colour codes where the code would be partially interpreted up to the cursor.
Diffstat (limited to '')
-rw-r--r-- | ui.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ui.c b/ui.c index 369ed75..3df0cd6 100644 --- a/ui.c +++ b/ui.c @@ -791,6 +791,7 @@ static void inputUpdate(void) { skip = buf; } + int y, x; wmove(input, 0, 0); if (window->time && window->id != Network) { whline(input, ' ', uiTime.width); @@ -800,25 +801,24 @@ static void inputUpdate(void) { waddstr(input, prefix); waddstr(input, prompt); waddstr(input, suffix); + getyx(input, y, x); - int y, x; - const char *ptr = skip; + int posx; struct Style style = styleInput; - if (split && split < pos) { - ptr = inputStop(styleInput, &style, ptr, &buf[split]); - style = styleInput; - style.bg = Red; - } - ptr = inputStop(styleInput, &style, ptr, &buf[pos]); - getyx(input, y, x); - if (split && split >= pos) { + inputStop(styleInput, &style, skip, &buf[pos]); + getyx(input, y, posx); + wmove(input, y, x); + + style = styleInput; + const char *ptr = skip; + if (split) { ptr = inputStop(styleInput, &style, ptr, &buf[split]); style = styleInput; style.bg = Red; } inputAdd(styleInput, &style, ptr); wclrtoeol(input); - wmove(input, y, x); + wmove(input, y, posx); } void uiWindows(void) { |