aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2026-03-21 13:43:27 +0000
committerDaniel Eklöf <daniel@ekloef.se>2026-03-21 13:43:27 +0000
commit037a2f4fa2c6fab014248d62efa8a6e14f617832 (patch)
tree8c64722dacf548dea60c2381622a15ccc06d3d6e /terminal.c
parentchangelog: add new 'unreleased' section (diff)
term: enqueue data to slave if there are queued paste data buffers
When writing paste data to the terminal (either interactively, or as an OSC-52 reply), we enqueue other data (key presses, for examples, or query replies) while the paste is happening. The idea is to send the key press _after_ all paste data has been written, to ensure consistency. Unfortunately, we only checked for an on-going paste. I.e. where the paste itself hasn't yet finished. It is also possible the paste itself has finished, but we haven't yet flushed all the paste buffers. That is, if we were able to *receive* paste data faster than the terminal client was able to *consume* it. In this case, we've queued up paste data in the terminal. These are in separate queues, and when emitting e.g. a key press, we didn't check if all _those_ queues had been flushed yet. Closes #2307
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/terminal.c b/terminal.c
index ac7922a7..8eafbcbe 100644
--- a/terminal.c
+++ b/terminal.c
@@ -120,7 +120,10 @@ term_to_slave(struct terminal *term, const void *data, size_t len)
return false;
}
- if (tll_length(term->ptmx_buffers) > 0 || term->is_sending_paste_data) {
+ if (unlikely(tll_length(term->ptmx_buffers) > 0 ||
+ term->is_sending_paste_data ||
+ tll_length(term->ptmx_paste_buffers) > 0))
+ {
/*
* Don't even try to send data *now* if there's queued up
* data, since that would result in events arriving out of