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

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Respect the ncv capability and do not combine attributes and colours that will not work, reported by Joan Bruguera Micó in GitHub issue 5727.
  Clear implied Meta when discarding BackTab modifiers, GitHub issue 5730 from Joan Fabrégat.
  Do not treat compact padding cells as width 1, make them width 0. GitHub issue 5718 from dustgle at gmail dot com.
  Do not reuse old session group names when a new session is the same as its original session, GitHub issue 5704.
This commit is contained in:
tmux update bot
2026-10-12 11:40:06 +00:00
parent 8f7cf1fdef 801703a3ac
commit b973733720
6 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
grid.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: grid.c,v 1.159 2026/10/08 07:50:05 nicm Exp $ */
/* $OpenBSD: grid.c,v 1.160 2026/10/12 08:08:37 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -45,7 +45,7 @@ const struct grid_cell grid_default_cell = {
/*
* Padding grid cell data. Padding cells are the only zero width cell that
* appears in the grid - because of this, they are always extended cells.
* appears in the grid.
*/
static const struct grid_cell grid_padding_cell = {
{ { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 8, 0
@@ -642,7 +642,10 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc)
if (gce->flags & GRID_FLAG_BG256)
gc->bg |= COLOUR_FLAG_256;
gc->us = 8;
utf8_set(&gc->data, gce->data.data);
if (gc->flags & GRID_FLAG_PADDING)
memcpy(&gc->data, &grid_padding_cell.data, sizeof gc->data);
else
utf8_set(&gc->data, gce->data.data);
gc->link = 0;
}