valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tui: catch get_cursor_position errors (#2870)

Browse Source 
still seeing errors with reading back the cursor position in some cases;
adding catches everywhere we might run into this.
This commit is contained in:
Jeremy Rose
2025-09-02 14:32:42 -07:00
committed by GitHub
parent 13e5b567f5
commit 60fdfc5f14
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
codex-rs/tui/src/tui.rs
View File

@@ -403,7 +403,10 @@ impl Tui {
) -> Result<Option<PreparedResumeAction>> { ) -> Result<Option<PreparedResumeAction>> {
match action { match action {
ResumeAction::RealignInline => { ResumeAction::RealignInline => {
let cursor_pos = self.terminal.get_cursor_position()?; let cursor_pos = self
.terminal
.get_cursor_position()
.unwrap_or(self.terminal.last_known_cursor_pos);
Ok(Some(PreparedResumeAction::RealignViewport( Ok(Some(PreparedResumeAction::RealignViewport(
ratatui::layout::Rect::new(0, cursor_pos.y, 0, 0), ratatui::layout::Rect::new(0, cursor_pos.y, 0, 0),
))) )))
@@ -496,8 +499,9 @@ impl Tui {
let terminal = &mut self.terminal; let terminal = &mut self.terminal;
let screen_size = terminal.size()?; let screen_size = terminal.size()?;
let last_known_screen_size = terminal.last_known_screen_size; let last_known_screen_size = terminal.last_known_screen_size;
if screen_size != last_known_screen_size { if screen_size != last_known_screen_size
let cursor_pos = terminal.get_cursor_position()?; && let Ok(cursor_pos) = terminal.get_cursor_position()
{
let last_known_cursor_pos = terminal.last_known_cursor_pos; let last_known_cursor_pos = terminal.last_known_cursor_pos;
if cursor_pos.y != last_known_cursor_pos.y { if cursor_pos.y != last_known_cursor_pos.y {
let cursor_delta = cursor_pos.y as i32 - last_known_cursor_pos.y as i32; let cursor_delta = cursor_pos.y as i32 - last_known_cursor_pos.y as i32;