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:
  Preserve pixel sizes with manual sizing.
  Add kittygraphics terminal feature.
  Add Kitty feature detection and sixel to WezTerm.
  Add image_support to replace sixel_support variable.
  Fail an integer format expression with a NaN or out-of-range value, from someone in GitHub issue 5725.
  Keep the row RM 1049 restores inside the saved grid, from someone in GitHub issue 5724.
  Ignore a resize from a client whose tty is closed, from someone in GitHub issue 5723.
  Do not use a dead pane when redrawing a menu, from someone in GitHub issue 5722.
This commit is contained in:
tmux update bot
2026-10-12 15:29:54 +00:00
parent fcb9ac2b2b 89e2015fb2
commit e5456565f3
10 changed files with 112 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tty-features.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tty-features.c,v 1.46 2026/09/24 08:16:13 nicm Exp $ */
/* $OpenBSD: tty-features.c,v 1.48 2026/10/12 12:35:03 nicm Exp $ */
/*
* Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -369,6 +369,13 @@ static const struct tty_feature tty_feature_sixel = {
TERM_SIXEL
};
/* Terminal supports Kitty graphics Unicode placeholders. */
static const struct tty_feature tty_feature_kittygraphics = {
"kittygraphics",
NULL,
TERM_KITTYGRAPHICS
};
/* Terminal supports the OSC 9;4 progress bar. */
static const char *const tty_feature_progressbar_capabilities[] = {
"Spb=\\E]9;4;%p1%d;%p2%d\\E\\\\",
@@ -399,6 +406,7 @@ static const struct tty_feature *const tty_features[] = {
&tty_feature_extkeys,
&tty_feature_focus,
&tty_feature_ignorefkeys,
&tty_feature_kittygraphics,
&tty_feature_margins,
&tty_feature_mouse,
&tty_feature_osc7,
@@ -638,6 +646,7 @@ tty_default_features(struct client *c, const char *name, u_int version)
"focus,"
"hyperlinks,"
"margins,"
"sixel,"
"usstyle"
},
{ .name = "ghostty",
@@ -652,7 +661,20 @@ tty_default_features(struct client *c, const char *name, u_int version)
"osc7,"
"sync,"
"usstyle,"
"progressbar"
"progressbar,"
"kittygraphics"
},
{ .name = "kitty",
.features = TTY_FEATURES_BASE_MODERN_XTERM ","
"ccolour,"
"cstyle,"
"extkeys,"
"focus,"
"hyperlinks,"
"osc7,"
"sync,"
"usstyle,"
"kittygraphics"
},
{ .name = "Rio",
.features = TTY_FEATURES_BASE_MODERN_XTERM ","