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

2
image.c
View File

@@ -138,7 +138,7 @@ static const struct image_backend image_backend_sixel = {
static const struct image_backend *
image_tty_find_backend(struct tty *tty)
{
if (tty->term != NULL && tty->term->flags & TERM_KITTY)
if (tty->term != NULL && tty->term->flags & TERM_KITTYGRAPHICS)
return (&image_backend_kitty);
if (tty->term != NULL && tty->term->flags & TERM_SIXEL &&
tty->xpixel != 0 && tty->ypixel != 0) {