circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-11 21:14:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge and fix conflicts.

Browse Source
This commit is contained in:
Michael Grant
2026-10-10 10:16:38 +02:00
parent ff391aa052 95c1c3d7c5
commit 3739dfeab3
150 changed files with 8083 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
options-table.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: options-table.c,v 1.247 2026/09/21 10:22:31 nicm Exp $ */
/* $OpenBSD: options-table.c,v 1.252 2026/10/09 13:12:14 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -183,7 +183,8 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#[pop-default]" \
"#[norange default]"
#define OPTIONS_TABLE_STATUS_FORMAT2 \
"#[align=left]#{R: ,#{n:#{session_name}}}P: " \
"#[align=left]" \
"#{R: ,#{e|-:#{w;T;=/#{status-left-length}:status-left},3}}P: " \
"#[norange default]" \
"#[list=on align=#{status-justify}]" \
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
@@ -194,7 +195,8 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#[push-default]" \
"#{T:window-pane-status-format}" \
"#[pop-default]" \
"#[norange list=on default] " \
"#[norange list=on default]" \
"#{?loop_last_flag,,#{E:window-status-separator}}" \
"," \
"#[range=pane|#{pane_id} list=focus " \
"#{?#{!=:#{E:pane-status-current-style},default}," \
@@ -205,10 +207,12 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#[push-default]" \
"#{T:window-pane-current-status-format}" \
"#[pop-default]" \
"#[norange list=on default] " \
"#[norange list=on default]" \
"#{?loop_last_flag,,#{E:window-status-separator}}" \
"}"
#define OPTIONS_TABLE_STATUS_FORMAT3 \
"#[align=left]#{R: ,#{n:#{session_name}}}S: " \
"#[align=left]" \
"#{R: ,#{e|-:#{w;T;=/#{status-left-length}:status-left},3}}S: " \
"#[norange default]" \
"#[list=on align=#{status-justify}]" \
"#[list=left-marker]<#[list=right-marker]>#[list=on]" \
@@ -217,7 +221,7 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"#{E:session-status-style}" \
"]" \
"#[push-default]" \
"#S#{session_alert}" \
"#S#{q/h:session_alert}" \
"#[pop-default]" \
"#[norange list=on default] " \
"," \
@@ -228,7 +232,7 @@ static const char *options_table_copy_mode_line_numbers_list[] = {
"}" \
"]" \
"#[push-default]" \
"#S*#{session_alert}" \
"#S*#{q/h:session_alert}" \
"#[pop-default]" \
"#[norange list=on default] " \
"}"
@@ -325,7 +329,8 @@ const struct options_table_entry options_table[] = {
"server-info=show-messages -JT,"
"info=show-messages -JT,"
"choose-window=choose-tree -w,"
"choose-session=choose-tree -s",
"choose-session=choose-tree -s,"
"help=list-commands -h",
.separator = ",",
.text = "Array of command aliases. "
"Each entry is an alias and a command separated by '='."
@@ -739,6 +744,15 @@ const struct options_table_entry options_table[] = {
"'User0', 'User1' and so on."
},
#ifdef HAVE_UTEMPTER
{ .name = "utmp",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_SERVER,
.default_num = 1,
.text = "Whether to maintain utmp records."
},
#endif
{ .name = "variation-selector-always-wide",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_SERVER,
@@ -1410,8 +1424,12 @@ const struct options_table_entry options_table[] = {
"#{t/p:top_line_time}#{?#{e|>:#{top_line_time},0}, ,}"
"[#{copy_position}/#{copy_position_limit}]"
"#{?search_timed_out, (timed out),"
"#{?search_count, (#{search_count}"
"#{?search_count_partial,+,} results),}}",
"#{?search_count_present, ("
"#{?#{==:#{search_count},0},0 matches,"
"#{?search_count_partial,#{search_count}+ matches,"
"#{?#{==:#{search_count},1},1 of 1 match,"
"#{?search_count_current,#{search_count_current} of "
"#{search_count} matches,#{search_count} matches}}}}),}}",
.text = "Format of the position indicator in copy mode."
},
@@ -1773,6 +1791,14 @@ const struct options_table_entry options_table[] = {
.text = "Default style of the active pane."
},
{ .name = "window-default-command",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "",
.text = "Default command to run in new panes. If set, "
"overrides 'default-command'."
},
{ .name = "window-pane-current-status-format",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,