diff options
author | June McEnroe <june@causal.agency> | 2018-09-12 22:55:02 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2018-09-12 22:55:02 -0400 |
commit | b36a1347022965fdbe1b61298dc6a05be2d2a34d (patch) | |
tree | b758829545252a09cac25ac7e89774faa36ae186 /format.c | |
parent | Factor out IRC formatting parsing (diff) | |
download | test-b36a1347022965fdbe1b61298dc6a05be2d2a34d.tar.gz test-b36a1347022965fdbe1b61298dc6a05be2d2a34d.zip |
Use formatParse split to position input cursor
Diffstat (limited to 'format.c')
-rw-r--r-- | format.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/format.c b/format.c index 800388b..30b287e 100644 --- a/format.c +++ b/format.c @@ -64,10 +64,11 @@ static const wchar_t Stops[] = { L'\0', }; -bool formatParse(struct Format *format, const wchar_t *stop) { +bool formatParse(struct Format *format, const wchar_t *split) { format->str += format->len; if (!format->str[0]) return false; + const wchar_t *init = format->str; switch (format->str[0]) { break; case IRCBold: format->str++; format->bold ^= true; break; case IRCItalic: format->str++; format->italic ^= true; @@ -76,14 +77,15 @@ bool formatParse(struct Format *format, const wchar_t *stop) { break; case IRCColor: format->str++; parseColor(format); break; case IRCReset: format->str++; formatReset(format); } + format->split = (split >= init && split <= format->str); if (format->str[0] == L' ') { format->len = 1 + wcscspn(&format->str[1], Stops); } else { format->len = wcscspn(format->str, Stops); } - if (stop && stop > format->str && stop < &format->str[format->len]) { - format->len = stop - format->str; + if (split > format->str && split < &format->str[format->len]) { + format->len = split - format->str; } return true; } |