Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2024-10-10 12:01:08 +01:00
commit 66c738bc10
2 changed files with 11 additions and 0 deletions

View File

@ -2320,6 +2320,13 @@ format_cb_version(__unused struct format_tree *ft)
return (xstrdup(getversion())); return (xstrdup(getversion()));
} }
/* Callback for sixel_support. */
static void *
format_cb_sixel_support(__unused struct format_tree *ft)
{
return (xstrdup("0"));
}
/* Callback for active_window_index. */ /* Callback for active_window_index. */
static void * static void *
format_cb_active_window_index(struct format_tree *ft) format_cb_active_window_index(struct format_tree *ft)
@ -3147,6 +3154,9 @@ static const struct format_table_entry format_table[] = {
{ "session_windows", FORMAT_TABLE_STRING, { "session_windows", FORMAT_TABLE_STRING,
format_cb_session_windows format_cb_session_windows
}, },
{ "sixel_support", FORMAT_TABLE_STRING,
format_cb_sixel_support
},
{ "socket_path", FORMAT_TABLE_STRING, { "socket_path", FORMAT_TABLE_STRING,
format_cb_socket_path format_cb_socket_path
}, },

1
tmux.1
View File

@ -5956,6 +5956,7 @@ The following variables are available, where appropriate:
.It Li "session_stack" Ta "" Ta "Window indexes in most recent order" .It Li "session_stack" Ta "" Ta "Window indexes in most recent order"
.It Li "session_windows" Ta "" Ta "Number of windows in session" .It Li "session_windows" Ta "" Ta "Number of windows in session"
.It Li "socket_path" Ta "" Ta "Server socket path" .It Li "socket_path" Ta "" Ta "Server socket path"
.It Li "sixel_support" Ta "" Ta "1 if server has support for SIXEL"
.It Li "start_time" Ta "" Ta "Server start time" .It Li "start_time" Ta "" Ta "Server start time"
.It Li "uid" Ta "" Ta "Server UID" .It Li "uid" Ta "" Ta "Server UID"
.It Li "user" Ta "" Ta "Server user" .It Li "user" Ta "" Ta "Server user"