mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-13 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

selection: don’t replace \r\n and \n with \r in bracketed paste mode

Browse source
This commit is contained in:
Daniel Eklöf 2021-01-27 10:44:28 +01:00
parent c1675af103
commit 81fb756ea7
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
selection.c
View file

@ -1448,6 +1448,7 @@ struct clipboard_receive {
int read_fd; int read_fd;
int timeout_fd; int timeout_fd;
struct itimerspec timeout; struct itimerspec timeout;
bool bracketed;
void (*decoder)(struct clipboard_receive *ctx, char *data, size_t size); void (*decoder)(struct clipboard_receive *ctx, char *data, size_t size);
void (*finish)(struct clipboard_receive *ctx); 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 *start = ctx->buf.data;
char *end = NULL; 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); decode_one_uri(ctx, start, end - start);
start = end + 1; start = end + 1;
} }
@ -1624,12 +1633,13 @@ fdm_receive(struct fdm *fdm, int fd, int events, void *data)
break; break;
case '\n': case '\n':
p[i] = '\r'; if (!ctx->bracketed)
p[i] = '\r';
break; break;
case '\r': case '\r':
/* Convert \r\n -> \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); ctx->decoder(ctx, p, i + 1);
xassert(i + 2 <= left); xassert(i + 2 <= left);
@ -1704,6 +1714,7 @@ begin_receive_clipboard(struct terminal *term, int read_fd,
.read_fd = read_fd, .read_fd = read_fd,
.timeout_fd = timeout_fd, .timeout_fd = timeout_fd,
.timeout = timeout, .timeout = timeout,
.bracketed = term->bracketed_paste,
.decoder = (mime_type == DATA_OFFER_MIME_URI_LIST .decoder = (mime_type == DATA_OFFER_MIME_URI_LIST
? &fdm_receive_decoder_uri ? &fdm_receive_decoder_uri
: &fdm_receive_decoder_plain), : &fdm_receive_decoder_plain),