mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
5591912f0b
Fixes multiple scrollback and terminal resize issues: #5538, #5576, #8352, #12223, #16165, and #15380. ## Why Codex writes finalized transcript output into terminal scrollback after wrapping it for the current viewport width. A later terminal resize could leave that scrollback shaped for the old width, so wider windows kept narrow output and narrower windows could show stale wrapping artifacts until enough new output replaced the visible area. This is also the foundation PR for responsive markdown tables. Table rendering needs finalized transcript content to be width-sensitive after insertion, not only while content is first streaming. Markdown table rendering itself stays in #18576. ## Stack - PR1: resize backlog reflow and interrupt cleanup - #18576: markdown table support ## What Changed - Rebuild source-backed transcript history when the terminal width changes. `terminal_resize_reflow` is introduced through the experimental feature system, but is enabled by default for this rollout so we can validate behavior across real terminals. - Preserve assistant and plan stream source so finalized streaming output can participate in resize reflow after consolidation. - Debounce resize work, but force a final source-backed reflow when a resize happened during active or unconsolidated streaming output. - Clear stale pending history lines on resize so old-width wrapped output is not emitted just before rebuilt scrollback. - Bound replay work with `[tui.terminal_resize_reflow].max_rows`: omitted uses terminal-specific defaults, `0` keeps all rendered rows, and a positive value sets an explicit cap. The cap applies both while initially replaying a resumed transcript into scrollback and when rebuilding scrollback after terminal resize. - Consolidate interrupted assistant streams before cleanup, then clear pending stream output and active-tail state consistently. - Move resize reflow and thread event buffering helpers out of `app.rs` into dedicated TUI modules. - Add focused coverage for resize reflow, feature-gated behavior, streaming source preservation, interrupted output cleanup, unicode-neutral text, terminal-specific row caps, and composer/layout stability. ## Runtime Bounds Resize reflow keeps only the most recent rendered rows when a row cap is active. The default is `auto`, which maps to the detected terminal's default scrollback size where Codex can identify it: VS Code `1000`, Windows Terminal `9001`, WezTerm `3500`, and Alacritty `10000`. Terminals without a dedicated mapping use the conservative fallback of `1000` rows. Users can override this with `[tui.terminal_resize_reflow] max_rows = N`, or set `max_rows = 0` to disable row limiting. ## Validation - `just fmt` - `git diff --check` - `cargo test --manifest-path codex-rs/Cargo.toml -p codex-tui reflow` - `cargo test --manifest-path codex-rs/Cargo.toml -p codex-tui transcript_reflow` - `just fix -p codex-tui` - PR CI in progress on the squashed branch
949 lines
33 KiB
Rust
949 lines
33 KiB
Rust
use std::fmt;
|
|
use std::future::Future;
|
|
use std::io::IsTerminal;
|
|
use std::io::Result;
|
|
use std::io::Stdout;
|
|
use std::io::stdin;
|
|
use std::io::stdout;
|
|
use std::panic;
|
|
use std::pin::Pin;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::atomic::Ordering;
|
|
use std::time::Duration;
|
|
|
|
use crossterm::Command;
|
|
use crossterm::SynchronizedUpdate;
|
|
use crossterm::event::DisableBracketedPaste;
|
|
use crossterm::event::DisableFocusChange;
|
|
use crossterm::event::EnableBracketedPaste;
|
|
use crossterm::event::EnableFocusChange;
|
|
use crossterm::event::KeyEvent;
|
|
use crossterm::event::KeyboardEnhancementFlags;
|
|
use crossterm::event::PopKeyboardEnhancementFlags;
|
|
use crossterm::event::PushKeyboardEnhancementFlags;
|
|
use crossterm::terminal::EnterAlternateScreen;
|
|
use crossterm::terminal::LeaveAlternateScreen;
|
|
use crossterm::terminal::supports_keyboard_enhancement;
|
|
use ratatui::backend::Backend;
|
|
use ratatui::backend::CrosstermBackend;
|
|
use ratatui::crossterm::execute;
|
|
use ratatui::crossterm::terminal::disable_raw_mode;
|
|
use ratatui::crossterm::terminal::enable_raw_mode;
|
|
use ratatui::layout::Offset;
|
|
use ratatui::layout::Position;
|
|
use ratatui::layout::Rect;
|
|
use ratatui::layout::Size;
|
|
use ratatui::text::Line;
|
|
use tokio::sync::broadcast;
|
|
use tokio_stream::Stream;
|
|
|
|
pub use self::frame_requester::FrameRequester;
|
|
use crate::custom_terminal;
|
|
use crate::custom_terminal::Terminal as CustomTerminal;
|
|
use crate::notifications::DesktopNotificationBackend;
|
|
use crate::notifications::detect_backend;
|
|
use crate::tui::event_stream::EventBroker;
|
|
use crate::tui::event_stream::TuiEventStream;
|
|
#[cfg(unix)]
|
|
use crate::tui::job_control::SuspendContext;
|
|
use codex_config::types::NotificationCondition;
|
|
use codex_config::types::NotificationMethod;
|
|
|
|
mod event_stream;
|
|
mod frame_rate_limiter;
|
|
mod frame_requester;
|
|
#[cfg(unix)]
|
|
mod job_control;
|
|
|
|
/// Target frame interval for UI redraw scheduling.
|
|
pub(crate) const TARGET_FRAME_INTERVAL: Duration = frame_rate_limiter::MIN_FRAME_INTERVAL;
|
|
const DISABLE_KEYBOARD_ENHANCEMENT_ENV_VAR: &str = "CODEX_TUI_DISABLE_KEYBOARD_ENHANCEMENT";
|
|
|
|
/// A type alias for the terminal type used in this application
|
|
pub type Terminal = CustomTerminal<CrosstermBackend<Stdout>>;
|
|
|
|
fn keyboard_enhancement_disabled() -> bool {
|
|
let disable_env = std::env::var(DISABLE_KEYBOARD_ENHANCEMENT_ENV_VAR).ok();
|
|
let is_wsl = running_in_wsl();
|
|
let is_vscode_terminal = is_wsl && running_in_vscode_terminal();
|
|
keyboard_enhancement_disabled_for(disable_env.as_deref(), is_wsl, is_vscode_terminal)
|
|
}
|
|
|
|
fn keyboard_enhancement_disabled_for(
|
|
disable_env: Option<&str>,
|
|
is_wsl: bool,
|
|
is_vscode_terminal: bool,
|
|
) -> bool {
|
|
if let Some(disabled) = parse_bool_env(disable_env) {
|
|
return disabled;
|
|
}
|
|
|
|
// VS Code running a WSL shell can hide TERM_PROGRAM from the Linux process
|
|
// environment, so `running_in_vscode_terminal` also probes the Windows-side
|
|
// environment through WSL interop.
|
|
is_wsl && is_vscode_terminal
|
|
}
|
|
|
|
fn parse_bool_env(value: Option<&str>) -> Option<bool> {
|
|
match value.map(str::trim) {
|
|
Some("1") => Some(true),
|
|
Some(value) if value.eq_ignore_ascii_case("true") => Some(true),
|
|
Some(value) if value.eq_ignore_ascii_case("yes") => Some(true),
|
|
Some("0") => Some(false),
|
|
Some(value) if value.eq_ignore_ascii_case("false") => Some(false),
|
|
Some(value) if value.eq_ignore_ascii_case("no") => Some(false),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn running_in_wsl() -> bool {
|
|
#[cfg(target_os = "linux")]
|
|
{
|
|
crate::clipboard_paste::is_probably_wsl()
|
|
}
|
|
|
|
#[cfg(not(target_os = "linux"))]
|
|
{
|
|
false
|
|
}
|
|
}
|
|
|
|
pub(crate) fn running_in_vscode_terminal() -> bool {
|
|
vscode_terminal_detected(
|
|
std::env::var("TERM_PROGRAM").ok().as_deref(),
|
|
windows_term_program().as_deref(),
|
|
)
|
|
}
|
|
|
|
fn vscode_terminal_detected(
|
|
linux_term_program: Option<&str>,
|
|
windows_term_program: Option<&str>,
|
|
) -> bool {
|
|
term_program_is_vscode(linux_term_program) || term_program_is_vscode(windows_term_program)
|
|
}
|
|
|
|
fn term_program_is_vscode(value: Option<&str>) -> bool {
|
|
value.is_some_and(|value| value.eq_ignore_ascii_case("vscode"))
|
|
}
|
|
|
|
fn windows_term_program() -> Option<String> {
|
|
#[cfg(target_os = "linux")]
|
|
{
|
|
static WINDOWS_TERM_PROGRAM: std::sync::OnceLock<Option<String>> =
|
|
std::sync::OnceLock::new();
|
|
WINDOWS_TERM_PROGRAM
|
|
.get_or_init(read_windows_term_program)
|
|
.clone()
|
|
}
|
|
|
|
#[cfg(not(target_os = "linux"))]
|
|
{
|
|
None
|
|
}
|
|
}
|
|
|
|
#[cfg(target_os = "linux")]
|
|
fn read_windows_term_program() -> Option<String> {
|
|
let output = std::process::Command::new("cmd.exe")
|
|
.args(["/d", "/s", "/c", "set TERM_PROGRAM"])
|
|
.stdin(std::process::Stdio::null())
|
|
.stderr(std::process::Stdio::null())
|
|
.output()
|
|
.ok()?;
|
|
|
|
if !output.status.success() {
|
|
return None;
|
|
}
|
|
|
|
String::from_utf8_lossy(&output.stdout)
|
|
.lines()
|
|
.find_map(|line| {
|
|
line.trim_end_matches('\r')
|
|
.strip_prefix("TERM_PROGRAM=")
|
|
.map(str::to_string)
|
|
})
|
|
.filter(|value| !value.trim().is_empty())
|
|
}
|
|
|
|
fn should_emit_notification(condition: NotificationCondition, terminal_focused: bool) -> bool {
|
|
match condition {
|
|
NotificationCondition::Unfocused => !terminal_focused,
|
|
NotificationCondition::Always => true,
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::keyboard_enhancement_disabled_for;
|
|
use super::parse_bool_env;
|
|
use super::should_emit_notification;
|
|
use super::vscode_terminal_detected;
|
|
use codex_config::types::NotificationCondition;
|
|
|
|
#[test]
|
|
fn unfocused_notification_condition_is_suppressed_when_focused() {
|
|
assert!(!should_emit_notification(
|
|
NotificationCondition::Unfocused,
|
|
/*terminal_focused*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn always_notification_condition_emits_when_focused() {
|
|
assert!(should_emit_notification(
|
|
NotificationCondition::Always,
|
|
/*terminal_focused*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn unfocused_notification_condition_emits_when_unfocused() {
|
|
assert!(should_emit_notification(
|
|
NotificationCondition::Unfocused,
|
|
/*terminal_focused*/ false
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn keyboard_enhancement_env_flag_parses_common_values() {
|
|
assert_eq!(parse_bool_env(Some("1")), Some(true));
|
|
assert_eq!(parse_bool_env(Some("true")), Some(true));
|
|
assert_eq!(parse_bool_env(Some("YES")), Some(true));
|
|
assert_eq!(parse_bool_env(Some("0")), Some(false));
|
|
assert_eq!(parse_bool_env(Some("false")), Some(false));
|
|
assert_eq!(parse_bool_env(Some("NO")), Some(false));
|
|
assert_eq!(parse_bool_env(Some("unexpected")), None);
|
|
assert_eq!(parse_bool_env(/*value*/ None), None);
|
|
}
|
|
|
|
#[test]
|
|
fn keyboard_enhancement_auto_disables_for_vscode_in_wsl() {
|
|
assert!(keyboard_enhancement_disabled_for(
|
|
/*disable_env*/ None, /*is_wsl*/ true, /*is_vscode_terminal*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn keyboard_enhancement_auto_disable_requires_wsl_and_vscode() {
|
|
assert!(!keyboard_enhancement_disabled_for(
|
|
/*disable_env*/ None, /*is_wsl*/ true, /*is_vscode_terminal*/ false
|
|
));
|
|
assert!(!keyboard_enhancement_disabled_for(
|
|
/*disable_env*/ None, /*is_wsl*/ false, /*is_vscode_terminal*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn keyboard_enhancement_env_flag_overrides_auto_detection() {
|
|
assert!(!keyboard_enhancement_disabled_for(
|
|
Some("0"),
|
|
/*is_wsl*/ true,
|
|
/*is_vscode_terminal*/ true
|
|
));
|
|
assert!(keyboard_enhancement_disabled_for(
|
|
Some("1"),
|
|
/*is_wsl*/ false,
|
|
/*is_vscode_terminal*/ false
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn vscode_terminal_detection_uses_linux_and_windows_term_program() {
|
|
assert!(vscode_terminal_detected(
|
|
Some("vscode"),
|
|
/*windows_term_program*/ None
|
|
));
|
|
assert!(vscode_terminal_detected(
|
|
/*linux_term_program*/ None,
|
|
Some("vscode")
|
|
));
|
|
assert!(!vscode_terminal_detected(
|
|
/*linux_term_program*/ None,
|
|
Some("WindowsTerminal")
|
|
));
|
|
assert!(!vscode_terminal_detected(
|
|
/*linux_term_program*/ None, /*windows_term_program*/ None
|
|
));
|
|
}
|
|
}
|
|
|
|
pub fn set_modes() -> Result<()> {
|
|
execute!(stdout(), EnableBracketedPaste)?;
|
|
|
|
enable_raw_mode()?;
|
|
// Enable keyboard enhancement flags so modifiers for keys like Enter are disambiguated.
|
|
// chat_composer.rs is using a keyboard event listener to enter for any modified keys
|
|
// to create a new line that require this.
|
|
// Some terminals (notably legacy Windows consoles) do not support
|
|
// keyboard enhancement flags. Attempt to enable them, but continue
|
|
// gracefully if unsupported.
|
|
if !keyboard_enhancement_disabled() {
|
|
let _ = execute!(
|
|
stdout(),
|
|
PushKeyboardEnhancementFlags(
|
|
KeyboardEnhancementFlags::DISAMBIGUATE_ESCAPE_CODES
|
|
| KeyboardEnhancementFlags::REPORT_EVENT_TYPES
|
|
| KeyboardEnhancementFlags::REPORT_ALTERNATE_KEYS
|
|
)
|
|
);
|
|
}
|
|
|
|
let _ = execute!(stdout(), EnableFocusChange);
|
|
Ok(())
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
struct EnableAlternateScroll;
|
|
|
|
impl Command for EnableAlternateScroll {
|
|
fn write_ansi(&self, f: &mut impl fmt::Write) -> fmt::Result {
|
|
write!(f, "\x1b[?1007h")
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn execute_winapi(&self) -> Result<()> {
|
|
Err(std::io::Error::other(
|
|
"tried to execute EnableAlternateScroll using WinAPI; use ANSI instead",
|
|
))
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn is_ansi_code_supported(&self) -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
struct DisableAlternateScroll;
|
|
|
|
impl Command for DisableAlternateScroll {
|
|
fn write_ansi(&self, f: &mut impl fmt::Write) -> fmt::Result {
|
|
write!(f, "\x1b[?1007l")
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn execute_winapi(&self) -> Result<()> {
|
|
Err(std::io::Error::other(
|
|
"tried to execute DisableAlternateScroll using WinAPI; use ANSI instead",
|
|
))
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn is_ansi_code_supported(&self) -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
fn restore_common(should_disable_raw_mode: bool) -> Result<()> {
|
|
// Pop may fail on platforms that didn't support the push; ignore errors.
|
|
let _ = execute!(stdout(), PopKeyboardEnhancementFlags);
|
|
execute!(stdout(), DisableBracketedPaste)?;
|
|
let _ = execute!(stdout(), DisableFocusChange);
|
|
if should_disable_raw_mode {
|
|
disable_raw_mode()?;
|
|
}
|
|
let _ = execute!(stdout(), crossterm::cursor::Show);
|
|
Ok(())
|
|
}
|
|
|
|
/// Restore the terminal to its original state.
|
|
/// Inverse of `set_modes`.
|
|
pub fn restore() -> Result<()> {
|
|
let should_disable_raw_mode = true;
|
|
restore_common(should_disable_raw_mode)
|
|
}
|
|
|
|
/// Restore the terminal to its original state, but keep raw mode enabled.
|
|
pub fn restore_keep_raw() -> Result<()> {
|
|
let should_disable_raw_mode = false;
|
|
restore_common(should_disable_raw_mode)
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum RestoreMode {
|
|
#[allow(dead_code)]
|
|
Full, // Fully restore the terminal (disables raw mode).
|
|
KeepRaw, // Restore the terminal but keep raw mode enabled.
|
|
}
|
|
|
|
impl RestoreMode {
|
|
fn restore(self) -> Result<()> {
|
|
match self {
|
|
RestoreMode::Full => restore(),
|
|
RestoreMode::KeepRaw => restore_keep_raw(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Flush the underlying stdin buffer to clear any input that may be buffered at the terminal level.
|
|
/// For example, clears any user input that occurred while the crossterm EventStream was dropped.
|
|
#[cfg(unix)]
|
|
fn flush_terminal_input_buffer() {
|
|
// Safety: flushing the stdin queue is safe and does not move ownership.
|
|
let result = unsafe { libc::tcflush(libc::STDIN_FILENO, libc::TCIFLUSH) };
|
|
if result != 0 {
|
|
let err = std::io::Error::last_os_error();
|
|
tracing::warn!("failed to tcflush stdin: {err}");
|
|
}
|
|
}
|
|
|
|
/// Flush the underlying stdin buffer to clear any input that may be buffered at the terminal level.
|
|
/// For example, clears any user input that occurred while the crossterm EventStream was dropped.
|
|
#[cfg(windows)]
|
|
fn flush_terminal_input_buffer() {
|
|
use windows_sys::Win32::Foundation::GetLastError;
|
|
use windows_sys::Win32::Foundation::INVALID_HANDLE_VALUE;
|
|
use windows_sys::Win32::System::Console::FlushConsoleInputBuffer;
|
|
use windows_sys::Win32::System::Console::GetStdHandle;
|
|
use windows_sys::Win32::System::Console::STD_INPUT_HANDLE;
|
|
|
|
let handle = unsafe { GetStdHandle(STD_INPUT_HANDLE) };
|
|
if handle == INVALID_HANDLE_VALUE || handle == 0 {
|
|
let err = unsafe { GetLastError() };
|
|
tracing::warn!("failed to get stdin handle for flush: error {err}");
|
|
return;
|
|
}
|
|
|
|
let result = unsafe { FlushConsoleInputBuffer(handle) };
|
|
if result == 0 {
|
|
let err = unsafe { GetLastError() };
|
|
tracing::warn!("failed to flush stdin buffer: error {err}");
|
|
}
|
|
}
|
|
|
|
#[cfg(not(any(unix, windows)))]
|
|
pub(crate) fn flush_terminal_input_buffer() {}
|
|
|
|
/// Initialize the terminal (inline viewport; history stays in normal scrollback)
|
|
pub fn init() -> Result<Terminal> {
|
|
if !stdin().is_terminal() {
|
|
return Err(std::io::Error::other("stdin is not a terminal"));
|
|
}
|
|
if !stdout().is_terminal() {
|
|
return Err(std::io::Error::other("stdout is not a terminal"));
|
|
}
|
|
set_modes()?;
|
|
|
|
flush_terminal_input_buffer();
|
|
|
|
set_panic_hook();
|
|
|
|
let backend = CrosstermBackend::new(stdout());
|
|
let tui = CustomTerminal::with_options(backend)?;
|
|
Ok(tui)
|
|
}
|
|
|
|
fn set_panic_hook() {
|
|
let hook = panic::take_hook();
|
|
panic::set_hook(Box::new(move |panic_info| {
|
|
let _ = restore(); // ignore any errors as we are already failing
|
|
hook(panic_info);
|
|
}));
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub enum TuiEvent {
|
|
/// A terminal key event after focus, paste, and protocol bookkeeping has been handled.
|
|
Key(KeyEvent),
|
|
/// A bracketed paste payload normalized by the app layer before it reaches the composer.
|
|
Paste(String),
|
|
/// A terminal size notification that should be handled as resize-sensitive draw work.
|
|
///
|
|
/// Resize is separate from `Draw` so the app can run feature-gated pre-render logic without
|
|
/// changing the default draw path for scheduled frames.
|
|
Resize,
|
|
/// A scheduled repaint that does not necessarily correspond to a terminal size change.
|
|
Draw,
|
|
}
|
|
|
|
pub struct Tui {
|
|
frame_requester: FrameRequester,
|
|
draw_tx: broadcast::Sender<()>,
|
|
event_broker: Arc<EventBroker>,
|
|
pub(crate) terminal: Terminal,
|
|
pending_history_lines: Vec<Line<'static>>,
|
|
alt_saved_viewport: Option<ratatui::layout::Rect>,
|
|
#[cfg(unix)]
|
|
suspend_context: SuspendContext,
|
|
// True when overlay alt-screen UI is active
|
|
alt_screen_active: Arc<AtomicBool>,
|
|
// True when terminal/tab is focused; updated internally from crossterm events
|
|
terminal_focused: Arc<AtomicBool>,
|
|
enhanced_keys_supported: bool,
|
|
notification_backend: Option<DesktopNotificationBackend>,
|
|
notification_condition: NotificationCondition,
|
|
is_zellij: bool,
|
|
// When false, enter_alt_screen() becomes a no-op (for Zellij scrollback support)
|
|
alt_screen_enabled: bool,
|
|
}
|
|
|
|
impl Tui {
|
|
pub fn new(terminal: Terminal) -> Self {
|
|
let (draw_tx, _) = broadcast::channel(1);
|
|
let frame_requester = FrameRequester::new(draw_tx.clone());
|
|
|
|
// Detect keyboard enhancement support before any EventStream is created so the
|
|
// crossterm poller can acquire its lock without contention.
|
|
let enhanced_keys_supported =
|
|
!keyboard_enhancement_disabled() && supports_keyboard_enhancement().unwrap_or(false);
|
|
// Cache this to avoid contention with the event reader.
|
|
supports_color::on_cached(supports_color::Stream::Stdout);
|
|
let _ = crate::terminal_palette::default_colors();
|
|
let is_zellij = matches!(
|
|
codex_terminal_detection::terminal_info().multiplexer,
|
|
Some(codex_terminal_detection::Multiplexer::Zellij {})
|
|
);
|
|
|
|
Self {
|
|
frame_requester,
|
|
draw_tx,
|
|
event_broker: Arc::new(EventBroker::new()),
|
|
terminal,
|
|
pending_history_lines: vec![],
|
|
alt_saved_viewport: None,
|
|
#[cfg(unix)]
|
|
suspend_context: SuspendContext::new(),
|
|
alt_screen_active: Arc::new(AtomicBool::new(false)),
|
|
terminal_focused: Arc::new(AtomicBool::new(true)),
|
|
enhanced_keys_supported,
|
|
notification_backend: Some(detect_backend(NotificationMethod::default())),
|
|
notification_condition: NotificationCondition::default(),
|
|
is_zellij,
|
|
alt_screen_enabled: true,
|
|
}
|
|
}
|
|
|
|
/// Set whether alternate screen is enabled. When false, enter_alt_screen() becomes a no-op.
|
|
pub fn set_alt_screen_enabled(&mut self, enabled: bool) {
|
|
self.alt_screen_enabled = enabled;
|
|
}
|
|
|
|
pub fn set_notification_settings(
|
|
&mut self,
|
|
method: NotificationMethod,
|
|
condition: NotificationCondition,
|
|
) {
|
|
self.notification_backend = Some(detect_backend(method));
|
|
self.notification_condition = condition;
|
|
}
|
|
|
|
pub fn frame_requester(&self) -> FrameRequester {
|
|
self.frame_requester.clone()
|
|
}
|
|
|
|
pub fn enhanced_keys_supported(&self) -> bool {
|
|
self.enhanced_keys_supported
|
|
}
|
|
|
|
pub fn is_alt_screen_active(&self) -> bool {
|
|
self.alt_screen_active.load(Ordering::Relaxed)
|
|
}
|
|
|
|
// Drop crossterm EventStream to avoid stdin conflicts with other processes.
|
|
pub fn pause_events(&mut self) {
|
|
self.event_broker.pause_events();
|
|
}
|
|
|
|
// Resume crossterm EventStream to resume stdin polling.
|
|
// Inverse of `pause_events`.
|
|
pub fn resume_events(&mut self) {
|
|
self.event_broker.resume_events();
|
|
}
|
|
|
|
/// Temporarily restore terminal state to run an external interactive program `f`.
|
|
///
|
|
/// This pauses crossterm's stdin polling by dropping the underlying event stream, restores
|
|
/// terminal modes (optionally keeping raw mode enabled), then re-applies Codex TUI modes and
|
|
/// flushes pending stdin input before resuming events.
|
|
pub async fn with_restored<R, F, Fut>(&mut self, mode: RestoreMode, f: F) -> R
|
|
where
|
|
F: FnOnce() -> Fut,
|
|
Fut: Future<Output = R>,
|
|
{
|
|
// Pause crossterm events to avoid stdin conflicts with external program `f`.
|
|
self.pause_events();
|
|
|
|
// Leave alt screen if active to avoid conflicts with external program `f`.
|
|
let was_alt_screen = self.is_alt_screen_active();
|
|
if was_alt_screen {
|
|
let _ = self.leave_alt_screen();
|
|
}
|
|
|
|
if let Err(err) = mode.restore() {
|
|
tracing::warn!("failed to restore terminal modes before external program: {err}");
|
|
}
|
|
|
|
let output = f().await;
|
|
|
|
if let Err(err) = set_modes() {
|
|
tracing::warn!("failed to re-enable terminal modes after external program: {err}");
|
|
}
|
|
// After the external program `f` finishes, reset terminal state and flush any buffered keypresses.
|
|
flush_terminal_input_buffer();
|
|
|
|
if was_alt_screen {
|
|
let _ = self.enter_alt_screen();
|
|
}
|
|
|
|
self.resume_events();
|
|
output
|
|
}
|
|
|
|
/// Emit a desktop notification now if the terminal is unfocused.
|
|
/// Returns true if a notification was posted.
|
|
pub fn notify(&mut self, message: impl AsRef<str>) -> bool {
|
|
let terminal_focused = self.terminal_focused.load(Ordering::Relaxed);
|
|
if !should_emit_notification(self.notification_condition, terminal_focused) {
|
|
return false;
|
|
}
|
|
|
|
let Some(backend) = self.notification_backend.as_mut() else {
|
|
return false;
|
|
};
|
|
|
|
let message = message.as_ref().to_string();
|
|
match backend.notify(&message) {
|
|
Ok(()) => true,
|
|
Err(err) => {
|
|
let method = backend.method();
|
|
tracing::warn!(
|
|
error = %err,
|
|
method = %method,
|
|
"Failed to emit terminal notification; disabling future notifications"
|
|
);
|
|
self.notification_backend = None;
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn event_stream(&self) -> Pin<Box<dyn Stream<Item = TuiEvent> + Send + 'static>> {
|
|
#[cfg(unix)]
|
|
let stream = TuiEventStream::new(
|
|
self.event_broker.clone(),
|
|
self.draw_tx.subscribe(),
|
|
self.terminal_focused.clone(),
|
|
self.suspend_context.clone(),
|
|
self.alt_screen_active.clone(),
|
|
);
|
|
#[cfg(not(unix))]
|
|
let stream = TuiEventStream::new(
|
|
self.event_broker.clone(),
|
|
self.draw_tx.subscribe(),
|
|
self.terminal_focused.clone(),
|
|
);
|
|
Box::pin(stream)
|
|
}
|
|
|
|
/// Enter alternate screen and expand the viewport to full terminal size, saving the current
|
|
/// inline viewport for restoration when leaving.
|
|
pub fn enter_alt_screen(&mut self) -> Result<()> {
|
|
if !self.alt_screen_enabled {
|
|
return Ok(());
|
|
}
|
|
let _ = execute!(self.terminal.backend_mut(), EnterAlternateScreen);
|
|
// Enable "alternate scroll" so terminals may translate wheel to arrows
|
|
let _ = execute!(self.terminal.backend_mut(), EnableAlternateScroll);
|
|
if let Ok(size) = self.terminal.size() {
|
|
self.alt_saved_viewport = Some(self.terminal.viewport_area);
|
|
self.terminal.set_viewport_area(ratatui::layout::Rect::new(
|
|
0,
|
|
0,
|
|
size.width,
|
|
size.height,
|
|
));
|
|
let _ = self.terminal.clear();
|
|
}
|
|
self.alt_screen_active.store(true, Ordering::Relaxed);
|
|
Ok(())
|
|
}
|
|
|
|
/// Leave alternate screen and restore the previously saved inline viewport, if any.
|
|
pub fn leave_alt_screen(&mut self) -> Result<()> {
|
|
if !self.alt_screen_enabled {
|
|
return Ok(());
|
|
}
|
|
// Disable alternate scroll when leaving alt-screen
|
|
let _ = execute!(self.terminal.backend_mut(), DisableAlternateScroll);
|
|
let _ = execute!(self.terminal.backend_mut(), LeaveAlternateScreen);
|
|
if let Some(saved) = self.alt_saved_viewport.take() {
|
|
self.terminal.set_viewport_area(saved);
|
|
}
|
|
self.alt_screen_active.store(false, Ordering::Relaxed);
|
|
Ok(())
|
|
}
|
|
|
|
pub fn insert_history_lines(&mut self, lines: Vec<Line<'static>>) {
|
|
self.pending_history_lines.extend(lines);
|
|
self.frame_requester().schedule_frame();
|
|
}
|
|
|
|
pub fn clear_pending_history_lines(&mut self) {
|
|
self.pending_history_lines.clear();
|
|
}
|
|
|
|
/// Resize the inline viewport to `height` rows, scrolling content above it if
|
|
/// the viewport would extend past the bottom of the screen. Returns `true` when
|
|
/// the caller must invalidate the diff buffer (Zellij mode), because the scroll
|
|
/// was performed with raw newlines that ratatui cannot track.
|
|
fn update_inline_viewport(
|
|
terminal: &mut Terminal,
|
|
height: u16,
|
|
is_zellij: bool,
|
|
) -> Result<bool> {
|
|
let size = terminal.size()?;
|
|
let mut needs_full_repaint = false;
|
|
|
|
let mut area = terminal.viewport_area;
|
|
area.height = height.min(size.height);
|
|
area.width = size.width;
|
|
if area.bottom() > size.height {
|
|
let scroll_by = area.bottom() - size.height;
|
|
if is_zellij {
|
|
Self::scroll_zellij_expanded_viewport(terminal, size, scroll_by)?;
|
|
needs_full_repaint = true;
|
|
} else {
|
|
terminal
|
|
.backend_mut()
|
|
.scroll_region_up(0..area.top(), scroll_by)?;
|
|
}
|
|
area.y = size.height - area.height;
|
|
}
|
|
if area != terminal.viewport_area {
|
|
// TODO(nornagon): probably this could be collapsed with the clear + set_viewport_area above.
|
|
terminal.clear()?;
|
|
terminal.set_viewport_area(area);
|
|
}
|
|
|
|
Ok(needs_full_repaint)
|
|
}
|
|
|
|
/// Push content above the viewport upward by `scroll_by` rows using raw
|
|
/// newlines at the screen bottom. This is the Zellij-safe alternative to
|
|
/// `scroll_region_up`, which relies on DECSTBM sequences Zellij does not
|
|
/// support.
|
|
fn scroll_zellij_expanded_viewport(
|
|
terminal: &mut Terminal,
|
|
size: Size,
|
|
scroll_by: u16,
|
|
) -> Result<()> {
|
|
crossterm::queue!(
|
|
terminal.backend_mut(),
|
|
crossterm::cursor::MoveTo(0, size.height.saturating_sub(1))
|
|
)?;
|
|
for _ in 0..scroll_by {
|
|
crossterm::queue!(terminal.backend_mut(), crossterm::style::Print("\n"))?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Resize the inline viewport for the resize-reflow path.
|
|
///
|
|
/// Unlike the legacy draw path, this path does not scroll rows above the viewport when the
|
|
/// terminal shrinks. Resize reflow owns rebuilding those rows from transcript source, so
|
|
/// scrolling here would move the viewport once and then replay history into the wrong row.
|
|
fn update_inline_viewport_for_resize_reflow(
|
|
terminal: &mut Terminal,
|
|
height: u16,
|
|
is_zellij: bool,
|
|
) -> Result<bool> {
|
|
let size = terminal.size()?;
|
|
let terminal_height_shrank = size.height < terminal.last_known_screen_size.height;
|
|
let terminal_height_grew = size.height > terminal.last_known_screen_size.height;
|
|
let viewport_was_bottom_aligned =
|
|
terminal.viewport_area.bottom() == terminal.last_known_screen_size.height;
|
|
let previous_area = terminal.viewport_area;
|
|
|
|
let mut area = terminal.viewport_area;
|
|
area.height = height.min(size.height);
|
|
area.width = size.width;
|
|
let mut needs_full_repaint = false;
|
|
|
|
if area.bottom() > size.height {
|
|
let scroll_by = area.bottom() - size.height;
|
|
if !terminal_height_shrank {
|
|
if is_zellij {
|
|
Self::scroll_zellij_expanded_viewport(terminal, size, scroll_by)?;
|
|
} else {
|
|
terminal
|
|
.backend_mut()
|
|
.scroll_region_up(0..area.top(), scroll_by)?;
|
|
}
|
|
}
|
|
area.y = size.height - area.height;
|
|
} else if terminal_height_grew && viewport_was_bottom_aligned {
|
|
area.y = size.height - area.height;
|
|
}
|
|
|
|
if area != terminal.viewport_area {
|
|
let clear_position = Position::new(/*x*/ 0, previous_area.y.min(area.y));
|
|
terminal.set_viewport_area(area);
|
|
terminal.clear_after_position(clear_position)?;
|
|
needs_full_repaint = true;
|
|
}
|
|
|
|
Ok(needs_full_repaint)
|
|
}
|
|
|
|
/// Write any buffered history lines above the viewport and clear the buffer.
|
|
/// Returns `true` when Zellij mode was used, signaling that the caller must
|
|
/// invalidate the diff buffer for a full repaint.
|
|
fn flush_pending_history_lines(
|
|
terminal: &mut Terminal,
|
|
pending_history_lines: &mut Vec<Line<'static>>,
|
|
is_zellij: bool,
|
|
) -> Result<bool> {
|
|
if pending_history_lines.is_empty() {
|
|
return Ok(false);
|
|
}
|
|
|
|
crate::insert_history::insert_history_lines_with_mode(
|
|
terminal,
|
|
pending_history_lines.clone(),
|
|
crate::insert_history::InsertHistoryMode::new(is_zellij),
|
|
)?;
|
|
pending_history_lines.clear();
|
|
Ok(is_zellij)
|
|
}
|
|
|
|
pub fn draw(
|
|
&mut self,
|
|
height: u16,
|
|
draw_fn: impl FnOnce(&mut custom_terminal::Frame),
|
|
) -> Result<()> {
|
|
// If we are resuming from ^Z, we need to prepare the resume action now so we can apply it
|
|
// in the synchronized update.
|
|
#[cfg(unix)]
|
|
let mut prepared_resume = self
|
|
.suspend_context
|
|
.prepare_resume_action(&mut self.terminal, &mut self.alt_saved_viewport);
|
|
|
|
// Precompute any viewport updates that need a cursor-position query before entering
|
|
// the synchronized update, to avoid racing with the event reader.
|
|
let mut pending_viewport_area = self.pending_viewport_area()?;
|
|
|
|
stdout().sync_update(|_| {
|
|
#[cfg(unix)]
|
|
if let Some(prepared) = prepared_resume.take() {
|
|
prepared.apply(&mut self.terminal)?;
|
|
}
|
|
|
|
let terminal = &mut self.terminal;
|
|
if let Some(new_area) = pending_viewport_area.take() {
|
|
terminal.set_viewport_area(new_area);
|
|
terminal.clear()?;
|
|
}
|
|
|
|
let mut needs_full_repaint =
|
|
Self::update_inline_viewport(terminal, height, self.is_zellij)?;
|
|
needs_full_repaint |= Self::flush_pending_history_lines(
|
|
terminal,
|
|
&mut self.pending_history_lines,
|
|
self.is_zellij,
|
|
)?;
|
|
|
|
if needs_full_repaint {
|
|
terminal.invalidate_viewport();
|
|
}
|
|
|
|
// Update the y position for suspending so Ctrl-Z can place the cursor correctly.
|
|
#[cfg(unix)]
|
|
{
|
|
let area = terminal.viewport_area;
|
|
let inline_area_bottom = if self.alt_screen_active.load(Ordering::Relaxed) {
|
|
self.alt_saved_viewport
|
|
.map(|r| r.bottom().saturating_sub(1))
|
|
.unwrap_or_else(|| area.bottom().saturating_sub(1))
|
|
} else {
|
|
area.bottom().saturating_sub(1)
|
|
};
|
|
self.suspend_context.set_cursor_y(inline_area_bottom);
|
|
}
|
|
|
|
terminal.draw(|frame| {
|
|
draw_fn(frame);
|
|
})
|
|
})?
|
|
}
|
|
|
|
/// Draw a frame using the resize-reflow viewport and history insertion rules.
|
|
///
|
|
/// This is the feature-gated counterpart to `draw`. It intentionally skips
|
|
/// `pending_viewport_area`, whose cursor-position heuristic is part of the legacy path, and
|
|
/// instead lets transcript reflow rebuild scrollback before the frame is rendered.
|
|
pub fn draw_with_resize_reflow(
|
|
&mut self,
|
|
height: u16,
|
|
draw_fn: impl FnOnce(&mut custom_terminal::Frame),
|
|
) -> Result<()> {
|
|
// If we are resuming from ^Z, we need to prepare the resume action now so we can apply it
|
|
// in the synchronized update.
|
|
#[cfg(unix)]
|
|
let mut prepared_resume = self
|
|
.suspend_context
|
|
.prepare_resume_action(&mut self.terminal, &mut self.alt_saved_viewport);
|
|
|
|
stdout().sync_update(|_| {
|
|
#[cfg(unix)]
|
|
if let Some(prepared) = prepared_resume.take() {
|
|
prepared.apply(&mut self.terminal)?;
|
|
}
|
|
|
|
let terminal = &mut self.terminal;
|
|
let mut needs_full_repaint =
|
|
Self::update_inline_viewport_for_resize_reflow(terminal, height, self.is_zellij)?;
|
|
let flushed_history = Self::flush_pending_history_lines(
|
|
terminal,
|
|
&mut self.pending_history_lines,
|
|
self.is_zellij,
|
|
)?;
|
|
needs_full_repaint |= flushed_history;
|
|
|
|
if needs_full_repaint {
|
|
terminal.invalidate_viewport();
|
|
}
|
|
|
|
// Update the y position for suspending so Ctrl-Z can place the cursor correctly.
|
|
#[cfg(unix)]
|
|
{
|
|
let area = terminal.viewport_area;
|
|
let inline_area_bottom = if self.alt_screen_active.load(Ordering::Relaxed) {
|
|
self.alt_saved_viewport
|
|
.map(|r| r.bottom().saturating_sub(1))
|
|
.unwrap_or_else(|| area.bottom().saturating_sub(1))
|
|
} else {
|
|
area.bottom().saturating_sub(1)
|
|
};
|
|
self.suspend_context.set_cursor_y(inline_area_bottom);
|
|
}
|
|
|
|
terminal.draw(|frame| {
|
|
draw_fn(frame);
|
|
})
|
|
})?
|
|
}
|
|
|
|
fn pending_viewport_area(&mut self) -> Result<Option<Rect>> {
|
|
let terminal = &mut self.terminal;
|
|
let screen_size = terminal.size()?;
|
|
let last_known_screen_size = terminal.last_known_screen_size;
|
|
if screen_size != last_known_screen_size
|
|
&& let Ok(cursor_pos) = terminal.get_cursor_position()
|
|
{
|
|
let last_known_cursor_pos = terminal.last_known_cursor_pos;
|
|
// If we resized AND the cursor moved, we adjust the viewport area to keep the
|
|
// cursor in the same position. This is a heuristic that seems to work well
|
|
// at least in iTerm2.
|
|
if cursor_pos.y != last_known_cursor_pos.y {
|
|
let offset = Offset {
|
|
x: 0,
|
|
y: cursor_pos.y as i32 - last_known_cursor_pos.y as i32,
|
|
};
|
|
return Ok(Some(terminal.viewport_area.offset(offset)));
|
|
}
|
|
}
|
|
Ok(None)
|
|
}
|
|
}
|