mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 02:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix --dump-bytes duplicating bytes because of input_delay

Browse Source
This commit is contained in:
Kovid Goyal
2024-02-18 12:02:24 +05:30
parent 559be309ea
commit c08523a1ad
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/vt-parser.c
View File

@@ -1384,20 +1384,13 @@ run_worker(void *p, ParseData *pd, bool flush) {
PS *self = (PS*)screen->vt_parser->state; PS *self = (PS*)screen->vt_parser->state;
with_lock { with_lock {
self->read.sz += self->write.pending; self->write.pending = 0; self->read.sz += self->write.pending; self->write.pending = 0;
#ifdef DUMP_COMMANDS
self->window_id = screen->window_id;
if (self->read.consumed < self->read.sz && pd->dump_callback) {
RAII_PyObject(mv, PyMemoryView_FromMemory((char*)self->buf + self->read.consumed, self->read.sz - self->read.consumed, PyBUF_READ));
PyObject *ret = PyObject_CallFunction(pd->dump_callback, "KsO", screen->window_id, "bytes", mv);
if (ret) { Py_DECREF(ret); } else { PyErr_Clear(); }
}
#endif
if (self->read.pos < self->read.sz) { if (self->read.pos < self->read.sz) {
pd->time_since_new_input = pd->now - self->new_input_at; pd->time_since_new_input = pd->now - self->new_input_at;
if (flush || pd->time_since_new_input >= OPT(input_delay) || self->read.sz + 16 * 1024 > BUF_SZ) { if (flush || pd->time_since_new_input >= OPT(input_delay) || self->read.sz + 16 * 1024 > BUF_SZ) {
pd->input_read = true; pd->input_read = true;
self->dump_callback = pd->dump_callback; self->now = pd->now; self->dump_callback = pd->dump_callback; self->now = pd->now;
self->screen = screen; self->screen = screen;
self->read.consumed = 0;
do { do {
end_with_lock; { end_with_lock; {
consume_input(self); consume_input(self);
@@ -1406,11 +1399,15 @@ run_worker(void *p, ParseData *pd, bool flush) {
} while (self->read.pos < self->read.sz); } while (self->read.pos < self->read.sz);
self->new_input_at = 0; self->new_input_at = 0;
if (self->read.consumed) { if (self->read.consumed) {
#ifdef DUMP_COMMANDS
RAII_PyObject(mv, PyMemoryView_FromMemory((char*)self->buf + self->read.pos - self->read.consumed, self->read.consumed, PyBUF_READ));
PyObject *ret = PyObject_CallFunction(pd->dump_callback, "KsO", screen->window_id, "bytes", mv);
if (ret) { Py_DECREF(ret); } else { PyErr_Clear(); }
#endif
pd->write_space_created = self->read.sz >= BUF_SZ; pd->write_space_created = self->read.sz >= BUF_SZ;
self->read.pos -= MIN(self->read.pos, self->read.consumed); self->read.pos -= MIN(self->read.pos, self->read.consumed);
self->read.sz -= MIN(self->read.sz, self->read.consumed); self->read.sz -= MIN(self->read.sz, self->read.consumed);
if (self->read.sz) memmove(self->buf, self->buf + self->read.consumed, self->read.sz); if (self->read.sz) memmove(self->buf, self->buf + self->read.consumed, self->read.sz);
self->read.consumed = 0;
} }
} }
} }