aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-03-16 19:17:02 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-03-19 18:01:25 +0000
commit485c473e76e7b90676a484d0f433d713f0c4c9ce (patch)
treefc578e5662135f525650219a720a336de1db5c93
parentcsi: add support for DECNKM private mode (diff)
selection: don’t translate \r to \n when pasting
In non-bracketed paste mode, we translate \n to \r, and \r\n to \r. The latter matches XTerm, urxvt, alacritty and kitty. The former matches alacritty and kitty (xterm and urxvt just blindly replaces all \n occurrences with \r, meaning \r\n is translated to \r\r. For some reason, we then unconditionally translated all \r back to \n, regardless of whether bracketed paste was enabled or not. Unsure why/where this comes from, but it doesn't match any of the other terminal emulators I tested. One example where this caused issues is in older versions of nano (at least up to 2.9). Closes #980
-rw-r--r--CHANGELOG.md2
-rw-r--r--selection.c9
2 files changed, 4 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3baa0ee..0fb7015b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,8 @@
sequences (https://codeberg.org/dnkl/foot/issues/325).
* OSC-4 and OSC-11 replies now uses four digits instead of 2
(https://codeberg.org/dnkl/foot/issues/971).
+* `\r` is no longer translated to `\n` when pasting clipboard data
+ (https://codeberg.org/dnkl/foot/issues/980).
### Deprecated
diff --git a/selection.c b/selection.c
index e9a9f752..fbd0f484 100644
--- a/selection.c
+++ b/selection.c
@@ -1638,11 +1638,6 @@ fdm_receive_timeout(struct fdm *fdm, int fd, int events, void *data)
static void
fdm_receive_decoder_plain(struct clipboard_receive *ctx, char *data, size_t size)
{
- /* \r -> \n */
- for (size_t i = 0; i < size; i++) {
- if (data[i] == '\r')
- data[i] = '\n';
- }
ctx->cb(data, size, ctx->user);
}
@@ -1760,8 +1755,8 @@ fdm_receive(struct fdm *fdm, int fd, int events, void *data)
/*
* Call cb while at same time replace:
- * - \r\n -> \r
- * - \n -> \r
+ * - \r\n -> \r (non-bracketed paste)
+ * - \n -> \r (non-bracketed paste)
* - C0 -> <nothing> (strip non-formatting C0 characters)
* - \e -> <nothing> (i.e. strip ESC)
*/