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 branch 'master' into 4902-image-support

Browse Source 
# Conflicts:
#	Makefile.am
#	configure.ac
#	format.c
#	image-sixel.c
#	regress/tty-keys-replies.sh
#	resize.c
#	screen-redraw.c
#	screen-write.c
#	screen.c
#	tmux.1
#	tmux.h
#	tty-features.c
#	tty.c
This commit is contained in:
Nicholas Marriott
2026-10-12 17:01:36 +01:00
parent f988a7bc0b 58eb73a6d1
commit 2da1e0f30c
37 changed files with 781 additions and 122 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
@@ -651,7 +651,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;
}