diff options
| author | June McEnroe <june@causal.agency> | 2020-03-23 14:55:43 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-03-23 14:55:43 -0400 |
| commit | 60b189200e1a77741bb441de39621ac17db1b6f7 (patch) | |
| tree | 2e4f874ec4ccc57c620ab45c98c52762c4b1c1c0 /ui.c | |
| parent | Allow commands to take multiline input (diff) | |
| download | catgirl-60b189200e1a77741bb441de39621ac17db1b6f7.tar.gz catgirl-60b189200e1a77741bb441de39621ac17db1b6f7.zip | |
Handle bracketed paste, including newlines
Diffstat (limited to 'ui.c')
| -rw-r--r-- | ui.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ui.c b/ui.c index b3f3b09..0500118 100644 --- a/ui.c +++ b/ui.c @@ -704,8 +704,15 @@ static void inputAdd(struct Style *style, const char *str) { break; case R: waddch(input, 'R'); break; case I: waddch(input, 'I'); break; case U: waddch(input, 'U'); + break; case '\n': waddch(input, 'N'); } if (str - code > 1) waddnstr(input, &code[1], str - &code[1]); + if (str[0] == '\n') { + str++; + len--; + } + size_t nl = strcspn(str, "\n"); + if (nl < len) len = nl; wattr_set( input, style->attr | colorAttr(Colors[style->fg]), @@ -853,8 +860,6 @@ static void keyCode(int code) { break; case KEY_RESIZE: resize(); break; case KeyFocusIn: unmark(window); break; case KeyFocusOut: mark(window); - break; case KeyPasteOn:; // TODO - break; case KeyPasteOff:; // TODO break; case KeyMetaSlash: windowShow(windows.swap); @@ -939,9 +944,15 @@ void uiRead(void) { int ret; wint_t ch; - static bool style; + static bool paste, style; while (ERR != (ret = wget_wch(input, &ch))) { - if (ret == KEY_CODE_YES) { + if (ret == KEY_CODE_YES && ch == KeyPasteOn) { + paste = true; + } else if (ret == KEY_CODE_YES && ch == KeyPasteOff) { + paste = false; + } else if (paste) { + edit(windows.ptrs[windows.show]->id, EditInsert, ch); + } else if (ret == KEY_CODE_YES) { keyCode(ch); } else if (ch == (L'Z' ^ L'@')) { style = true; |