Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/tmux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pub use session::Session;
pub use status_bar::{get_session_info_for_current, get_status_for_current_session};
pub use status_detection::detect_status_from_content;
pub use terminal_session::{ContainerTerminalSession, TerminalSession};
pub use utils::tmux_prefix_display;

#[cfg(any(test, feature = "test-support"))]
#[doc(hidden)]
Expand Down
3 changes: 2 additions & 1 deletion src/tmux/status_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ pub fn apply_status_bar(
set_session_option(session_name, "status-right-length", "80")?;

set_session_option(session_name, "status-style", &format!("bg={bg},fg={fg}"))?;
let prefix = crate::tmux::utils::tmux_prefix_display();
set_session_option(
session_name,
"status-left",
&format!(
" #[fg={accent},bold]#S#[fg={fg},nobold] \u{2502} #[fg={hint}]Ctrl+b d#[fg={hint}] to detach ",
" #[fg={accent},bold]#S#[fg={fg},nobold] \u{2502} #[fg={hint}]{prefix} d#[fg={hint}] to detach ",
),
)?;
set_session_option(session_name, "status-left-length", "50")?;
Expand Down
24 changes: 24 additions & 0 deletions src/tmux/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,30 @@ pub fn is_pane_running_shell(session_name: &str) -> bool {
.unwrap_or(false)
}

/// Returns the tmux prefix key formatted for display (e.g. "Ctrl+a", "Ctrl+b").
/// Reads `tmux show-option -gv prefix`; falls back to "Ctrl+b" if tmux is
/// unavailable or the option can't be parsed.
pub fn tmux_prefix_display() -> String {
let raw = Command::new("tmux")
.args(["show-option", "-gv", "prefix"])
.output()
.ok()
.and_then(|o| String::from_utf8(o.stdout).ok())
.map(|s| s.trim().to_string())
.unwrap_or_default();

// tmux reports prefix as e.g. "C-b", "C-a", "M-b". Convert to display form.
if let Some(key) = raw.strip_prefix("C-") {
format!("Ctrl+{}", key.to_uppercase())
} else if let Some(key) = raw.strip_prefix("M-") {
format!("Alt+{}", key.to_uppercase())
} else if !raw.is_empty() {
raw
} else {
"Ctrl+b".to_string()
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
17 changes: 8 additions & 9 deletions src/tui/dialogs/welcome.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,33 @@ impl WelcomeDialog {
.constraints([Constraint::Min(1), Constraint::Length(2)])
.split(inner);

let prefix = crate::tmux::tmux_prefix_display();
let detach_key = format!(" {} then d ", prefix);
let scroll_key = format!(" {} then [ ", prefix);
let note = format!("Note: Press {}, release, THEN press the next key.", prefix);

let content = vec![
Line::from("When you attach or start an AOE session, "),
Line::from("you're working directly in tmux."),
Line::from("Essential tmux commands:"),
Line::from(""),
Line::from(vec![
Span::styled(
" Ctrl+b then d ",
Style::default().fg(theme.title).bold(),
),
Span::styled(detach_key, Style::default().fg(theme.title).bold()),
Span::styled(
"Detach (exit without stopping)",
Style::default().fg(theme.text),
),
]),
Line::from(vec![
Span::styled(
" Ctrl+b then [ ",
Style::default().fg(theme.title).bold(),
),
Span::styled(scroll_key, Style::default().fg(theme.title).bold()),
Span::styled(
"Scroll mode (arrows to scroll, q to exit)",
Style::default().fg(theme.text),
),
]),
Line::from(""),
Line::from(Span::styled(
"Note: Press Ctrl+b, release, THEN press the next key.",
note,
Style::default().fg(theme.hint).italic(),
)),
Line::from(""),
Expand Down