Skip to content

fix terminal resize crash #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nick1udwig merged 3 commits into from
Aug 7, 2025
Merged

fix terminal resize crash #810

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1b8c45
terminal: dont crash on resize to tiny size
nick1udwig Aug 6, 2025
243720a
terminal: replace more subtraction with saturating_sub
nick1udwig Aug 7, 2025
07619e9
Format Rust code using rustfmt
github-actions[bot] Aug 7, 2025
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
32 changes: 20 additions & 12 deletions hyperdrive/src/terminal/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ impl State {
Print(self.current_line.prompt),
Print(utils::truncate_in_place(
&self.current_line.line,
self.win_cols - self.current_line.prompt_len as u16,
self.win_cols
.saturating_sub(self.current_line.prompt_len as u16),
self.current_line.line_col,
self.current_line.cursor_col,
show_end
Expand All @@ -96,7 +97,8 @@ impl State {
style::Print(&search_prompt),
style::Print(utils::truncate_in_place(
&result_underlined,
self.win_cols - self.current_line.prompt_len as u16,
self.win_cols
.saturating_sub(self.current_line.prompt_len as u16),
self.current_line.line_col,
search_cursor_col,
false,
Expand All @@ -115,7 +117,8 @@ impl State {
style::Print(&search_prompt),
style::Print(utils::truncate_in_place(
&format!("{}: no results", &self.current_line.line),
self.win_cols - self.current_line.prompt_len as u16,
self.win_cols
.saturating_sub(self.current_line.prompt_len as u16),
self.current_line.line_col,
self.current_line.cursor_col,
false,
Expand Down Expand Up @@ -585,7 +588,7 @@ async fn handle_event(
*win_cols = width - 1;
*win_rows = height;
if current_line.cursor_col + current_line.prompt_len as u16 > *win_cols {
current_line.cursor_col = *win_cols - current_line.prompt_len as u16;
current_line.cursor_col = win_cols.saturating_sub(current_line.prompt_len as u16);
// can't do this because of wide graphemes :/
// current_line.line_col = current_line.cursor_col as usize;
}
Expand All @@ -603,7 +606,7 @@ async fn handle_event(
current_line.line_col = current_line.line_col + pasted.graphemes(true).count();
current_line.cursor_col = std::cmp::min(
current_line.cursor_col + utils::display_width(&pasted) as u16,
*win_cols - current_line.prompt_len as u16,
(*win_cols).saturating_sub(current_line.prompt_len as u16),
);
}
Event::Key(key_event) => {
Expand Down Expand Up @@ -816,8 +819,10 @@ async fn handle_key_event(
let width = utils::display_width(&line);
current_line.line_col = line.graphemes(true).count();
current_line.line = line;
current_line.cursor_col =
std::cmp::min(width as u16, *win_cols - current_line.prompt_len as u16);
current_line.cursor_col = std::cmp::min(
width as u16,
(*win_cols).saturating_sub(current_line.prompt_len as u16),
);
}
None => {
// the "no-no" ding
Expand Down Expand Up @@ -848,8 +853,10 @@ async fn handle_key_event(
let width = utils::display_width(&line);
current_line.line_col = line.graphemes(true).count();
current_line.line = line;
current_line.cursor_col =
std::cmp::min(width as u16, *win_cols - current_line.prompt_len as u16);
current_line.cursor_col = std::cmp::min(
width as u16,
(*win_cols).saturating_sub(current_line.prompt_len as u16),
);
}
None => {
// the "no-no" ding
Expand Down Expand Up @@ -887,7 +894,7 @@ async fn handle_key_event(
current_line.line_col = current_line.line.graphemes(true).count();
current_line.cursor_col = std::cmp::min(
utils::display_width(&current_line.line) as u16,
*win_cols - current_line.prompt_len as u16,
(*win_cols).saturating_sub(current_line.prompt_len as u16),
);
}
//
Expand Down Expand Up @@ -940,7 +947,7 @@ async fn handle_key_event(
current_line.line_col = current_line.line.graphemes(true).count();
current_line.cursor_col = std::cmp::min(
utils::display_width(&current_line.line) as u16,
*win_cols - current_line.prompt_len as u16,
(*win_cols).saturating_sub(current_line.prompt_len as u16),
);
}

Expand Down Expand Up @@ -1029,7 +1036,8 @@ async fn handle_key_event(
// at the very end of the current typed line
return Ok(Some(false));
};
if (current_line.cursor_col + current_line.prompt_len as u16) < (*win_cols - 1)
if (current_line.cursor_col + current_line.prompt_len as u16)
< (*win_cols).saturating_sub(1)
{
// simply move cursor and line position right
let width = current_line
Expand Down