diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-02-02 21:02:56 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-03 16:58:25 +0000 |
| commit | 69e2bff8c8dbe0692651637539862cdb99aa9b30 (patch) | |
| tree | 08e5b05d3318bd8851d62f573c16a6309329d2e0 | |
| parent | selection: don’t quote file URIs on the alt screen (diff) | |
extract: ensure line-based selections are terminated with a newline
Closes #869
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | extract.c | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 960428fe..1a59bba5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,8 @@ (https://codeberg.org/dnkl/foot/issues/900). * File pasted, or dropped, on the alt screen is no longer quoted (https://codeberg.org/dnkl/foot/issues/379). +* Line-based selections now include a trailing newline when copied + (https://codeberg.org/dnkl/foot/issues/869). ### Deprecated @@ -86,9 +86,24 @@ extract_finish_wide(struct extraction_context *ctx, wchar_t **text, size_t *len) } else { xassert(ctx->idx > 0); xassert(ctx->idx <= ctx->size); - if (ctx->buf[ctx->idx - 1] == L'\n') - ctx->buf[ctx->idx - 1] = L'\0'; - else { + + switch (ctx->selection_kind) { + default: + if (ctx->buf[ctx->idx - 1] == L'\n') + ctx->buf[ctx->idx - 1] = L'\0'; + break; + + case SELECTION_LINE_WISE: + if (ctx->buf[ctx->idx - 1] != L'\n') { + if (!ensure_size(ctx, 1)) + goto err; + ctx->buf[ctx->idx++] = L'\n'; + } + break; + + } + + if (ctx->buf[ctx->idx - 1] != L'\0') { if (!ensure_size(ctx, 1)) goto err; ctx->buf[ctx->idx++] = L'\0'; |
