circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-08 19:14:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Use window-status-separator in second and theird status lines, GitHub issue 5672. Also match width of session name correctly.
  Fix color range check, from Vaibhav Aggarwal.
  Do not lose a pending pane resize when entering the alternate screen, from mml00 dot work at gmail dot com.
  Adjust widths of a few codepoints incorrectly set to double width, from Sidney Cammeresi.
This commit is contained in:
tmux update bot
2026-10-05 12:43:43 +00:00
parent 2b5b538152 bd4a63ab34
commit 62c6d79a80
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
screen-write.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen-write.c,v 1.298 2026/10/02 15:20:41 nicm Exp $ */
/* $OpenBSD: screen-write.c,v 1.299 2026/10/05 08:41:23 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -3306,6 +3306,7 @@ screen_write_alternateon(struct screen_write_ctx *ctx, struct grid_cell *gc,
{
struct tty_ctx ttyctx;
struct window_pane *wp = ctx->wp;
int pending;
if (wp != NULL && !options_get_number(wp->options, "alternate-screen"))
return;
@@ -3315,11 +3316,12 @@ screen_write_alternateon(struct screen_write_ctx *ctx, struct grid_cell *gc,
return;
if (wp != NULL) {
pending = !TAILQ_EMPTY(&wp->resize_queue);
window_pane_clear_resizes(wp, NULL);
if (event_initialized(&wp->resize_timer))
evtimer_del(&wp->resize_timer);
layout_fix_panes(wp->window, NULL);
if (!TAILQ_EMPTY(&wp->resize_queue)) {
if (pending || !TAILQ_EMPTY(&wp->resize_queue)) {
window_pane_send_resize(wp, wp->sx, wp->sy);
window_pane_clear_resizes(wp, NULL);
}