Merge branch 'master' into 4902-image-support

# 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
37 changed files with 781 additions and 122 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen.c,v 1.107 2026/07/26 09:20:54 nicm Exp $ */
/* $OpenBSD: screen.c,v 1.108 2026/10/12 10:50:06 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -716,6 +716,10 @@ screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor)
return 0;
}
/* Clamp cursor to the current screen size. */
if (s->cy > screen_size_y(s) - 1)
s->cy = screen_size_y(s) - 1;
/* Restore the saved grid. */
grid_duplicate_lines(s->grid, screen_hsize(s), s->saved_grid, 0,
s->saved_grid->sy);