circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 22:26:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-05-12 12:01:11 +01:00
parent c3036116de 9e3653a612
commit f1f0158741
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
control.c
View File

@@ -846,9 +846,9 @@ control_stop(struct client *c)
if (evtimer_initialized(&cs->subs_timer)) if (evtimer_initialized(&cs->subs_timer))
evtimer_del(&cs->subs_timer); evtimer_del(&cs->subs_timer);
control_reset_offsets(c);
TAILQ_FOREACH_SAFE(cb, &cs->all_blocks, all_entry, cb1) TAILQ_FOREACH_SAFE(cb, &cs->all_blocks, all_entry, cb1)
control_free_block(cs, cb); control_free_block(cs, cb);
control_reset_offsets(c);
c->control_state = NULL; c->control_state = NULL;
free(cs); free(cs);

10
screen-redraw.c
View File

@@ -1112,11 +1112,17 @@ screen_redraw_draw_scrollbar(struct screen_redraw_ctx *ctx,
if (sb_x >= sx || sb_y >= sy) if (sb_x >= sx || sb_y >= sy)
return; return;
imax = sb_w + sb_pad; imax = sb_w + sb_pad;
if ((int)imax + sb_x > sx) if ((int)imax + sb_x > sx) {
if (sb_x >= sx)
return;
imax = sx - sb_x; imax = sx - sb_x;
}
jmax = sb_h; jmax = sb_h;
if ((int)jmax + sb_y > sy) if ((int)jmax + sb_y > sy) {
if (sb_y >= sy)
return;
jmax = sy - sb_y; jmax = sy - sb_y;
}
for (j = 0; j < jmax; j++) { for (j = 0; j < jmax; j++) {
py = sb_y + j; py = sb_y + j;

2
utf8-combined.c
View File

@@ -175,7 +175,7 @@ utf8_should_combine(const struct utf8_data *with, const struct utf8_data *add)
return (1); return (1);
break; break;
} }
return 0; return (0);
} }
static enum hanguljamo_subclass static enum hanguljamo_subclass

2
utf8.c
View File

@@ -599,7 +599,7 @@ utf8_towc(const struct utf8_data *ud, wchar_t *wc)
case 0: case 0:
return (UTF8_ERROR); return (UTF8_ERROR);
} }
log_debug("UTF-8 %.*s is %05X", (int)ud->size, ud->data, (u_int)*wc); log_debug("UTF-8 %.*s is U+%06X", (int)ud->size, ud->data, (u_int)*wc);
return (UTF8_DONE); return (UTF8_DONE);
} }

4
window.c
View File

@@ -374,12 +374,10 @@ window_pane_destroy_ready(struct window_pane *wp)
{ {
int n; int n;
if (wp->pipe_fd != -1) { if (wp->pipe_fd != -1 && EVBUFFER_LENGTH(wp->pipe_event->output) != 0)
if (EVBUFFER_LENGTH(wp->pipe_event->output) != 0)
return (0); return (0);
if (ioctl(wp->fd, FIONREAD, &n) != -1 && n > 0) if (ioctl(wp->fd, FIONREAD, &n) != -1 && n > 0)
return (0); return (0);
}
if (~wp->flags & PANE_EXITED) if (~wp->flags & PANE_EXITED)
return (0); return (0);