diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-01-27 09:54:10 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-01-27 09:54:10 +0000 |
| commit | 4c0c9727263540b2a0bacbe5b28cec79ba15d1b1 (patch) | |
| tree | 2f3a24dcfbb6b8287fbe1b92eadf2f0769a70ee0 /selection.c | |
| parent | Merge branch 'delay-tiocswinsz-on-interactive-resize' (diff) | |
| parent | selection: don’t replace \r\n and \n with \r in bracketed paste mode (diff) | |
Merge branch 'selection-no-newline-replace-in-bracketed-paste'
Diffstat (limited to 'selection.c')
| -rw-r--r-- | selection.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/selection.c b/selection.c index 8ed9b0cc..e9c3fce6 100644 --- a/selection.c +++ b/selection.c @@ -1448,6 +1448,7 @@ struct clipboard_receive { int read_fd; int timeout_fd; struct itimerspec timeout; + bool bracketed; void (*decoder)(struct clipboard_receive *ctx, char *data, size_t size); void (*finish)(struct clipboard_receive *ctx); @@ -1559,7 +1560,15 @@ fdm_receive_decoder_uri(struct clipboard_receive *ctx, char *data, size_t size) char *start = ctx->buf.data; char *end = NULL; - while ((end = memchr(start, '\r', ctx->buf.idx - (start - ctx->buf.data))) != NULL) { + while (true) { + for (end = start; end < &ctx->buf.data[ctx->buf.idx]; end++) { + if (*end == '\r' || *end == '\n') + break; + } + + if (end >= &ctx->buf.data[ctx->buf.idx]) + break; + decode_one_uri(ctx, start, end - start); start = end + 1; } @@ -1624,12 +1633,13 @@ fdm_receive(struct fdm *fdm, int fd, int events, void *data) break; case '\n': - p[i] = '\r'; + if (!ctx->bracketed) + p[i] = '\r'; break; case '\r': /* Convert \r\n -> \r */ - if (i + 1 < left && p[i + 1] == '\n') { + if (!ctx->bracketed && i + 1 < left && p[i + 1] == '\n') { ctx->decoder(ctx, p, i + 1); xassert(i + 2 <= left); @@ -1704,6 +1714,7 @@ begin_receive_clipboard(struct terminal *term, int read_fd, .read_fd = read_fd, .timeout_fd = timeout_fd, .timeout = timeout, + .bracketed = term->bracketed_paste, .decoder = (mime_type == DATA_OFFER_MIME_URI_LIST ? &fdm_receive_decoder_uri : &fdm_receive_decoder_plain), |
