circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-20 17:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-15 16:15:07 +01:00
parent 13de7cafb2 bb750b07bc
commit c156e597dc
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
screen-write.c
View File

@@ -2678,7 +2678,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
if (ri->nx == 0) if (ri->nx == 0)
continue; continue;
for (n = 0; n < ri->nx; n++) { for (n = 0; n < ri->nx; n++) {
ttyctx.ocx = ri->px + n; ttyctx.ocx = (int)ri->px - xoff + (int)n;
tty_write(tty_cmd_cell, &ttyctx); tty_write(tty_cmd_cell, &ttyctx);
} }
} }

9
server-client.c
View File

@@ -2047,8 +2047,13 @@ server_client_check_redraw(struct client *c)
} }
} }
} }
if (needed && (left = EVBUFFER_LENGTH(tty->out)) != 0) { left = EVBUFFER_LENGTH(tty->out);
log_debug("%s: redraw deferred (%zu left)", c->name, left); if (needed && (left != 0 || (tty->flags & TTY_BLOCK))) {
if (left != 0) {
log_debug("%s: redraw deferred (%zu left)", c->name,
left);
} else
log_debug("%s: redraw deferred (blocked)", c->name);
if (!evtimer_initialized(&ev)) if (!evtimer_initialized(&ev))
evtimer_set(&ev, server_client_redraw_timer, NULL); evtimer_set(&ev, server_client_redraw_timer, NULL);
if (!evtimer_pending(&ev, NULL)) { if (!evtimer_pending(&ev, NULL)) {