aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-10-20 16:57:25 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-10-20 16:57:25 +0000
commitfbc0155c55c5dede2afef2721aad4a2768ae98d6 (patch)
tree2b77076baf06056ec1097f0a02794f278cc773de
parentMerge branch 'nordiq' (diff)
parentselection: convert \r -> \n when reading clipboard data (diff)
Merge branch 'clipboard-convert-carriage-ret-to-new-line'
Closes #752
-rw-r--r--CHANGELOG.md2
-rw-r--r--selection.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c445a445..d87b632f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,8 @@
state, foot was looking at **depressed** modifiers, not
**effective** modifiers, like it should.
* Fix crashes after enabling CSD at runtime when `csd.size` is 0.
+* Convert `\r` to `\n` when reading clipboard data
+ (https://codeberg.org/dnkl/foot/issues/752).
### Security
diff --git a/selection.c b/selection.c
index b6bae978..91523d3b 100644
--- a/selection.c
+++ b/selection.c
@@ -1609,6 +1609,11 @@ 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);
}