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

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Shorten some long lines.
  Use grid_free_line when freeing reflow lines.
This commit is contained in:
tmux update bot
2026-10-12 18:35:33 +00:00
parent 9551cdcd67 7d01314422
commit ae2fb3797c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
grid.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: grid.c,v 1.160 2026/10/12 08:08:37 nicm Exp $ */ /* $OpenBSD: grid.c,v 1.161 2026/10/12 15:40:17 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1453,8 +1453,7 @@ grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
/* Remove the lines that were completely consumed. */ /* Remove the lines that were completely consumed. */
for (i = yy + 1; i < yy + 1 + lines; i++) { for (i = yy + 1; i < yy + 1 + lines; i++) {
free(gd->linedata[i].celldata); grid_free_line(gd, i);
free(gd->linedata[i].extddata);
grid_reflow_dead(&gd->linedata[i]); grid_reflow_dead(&gd->linedata[i]);
} }

11
input.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: input.c,v 1.273 2026/10/08 07:50:05 nicm Exp $ */ /* $OpenBSD: input.c,v 1.274 2026/10/12 17:04:48 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2020,6 +2020,7 @@ static void
input_csi_dispatch_sm_private(struct input_ctx *ictx) input_csi_dispatch_sm_private(struct input_ctx *ictx)
{ {
struct screen_write_ctx *sctx = &ictx->ctx; struct screen_write_ctx *sctx = &ictx->ctx;
struct window_pane *wp = ictx->wp;
struct grid_cell *gc = &ictx->cell.cell; struct grid_cell *gc = &ictx->cell.cell;
u_int i; u_int i;
@@ -2081,13 +2082,13 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx)
break; break;
case 2031: case 2031:
screen_write_mode_set(sctx, MODE_THEME_UPDATES); screen_write_mode_set(sctx, MODE_THEME_UPDATES);
if (ictx->wp != NULL) { if (wp != NULL) {
ictx->wp->last_theme = window_pane_get_theme(ictx->wp); wp->last_theme = window_pane_get_theme(wp);
ictx->wp->flags &= ~PANE_THEMECHANGED; wp->flags &= ~PANE_THEMECHANGED;
} }
break; break;
case 2026: case 2026:
screen_write_start_sync(ictx->wp); screen_write_start_sync(wp);
break; break;
default: default:
log_debug("%s: unknown '%c'", __func__, ictx->ch); log_debug("%s: unknown '%c'", __func__, ictx->ch);