blasthavers/minicrossterm
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix zero terminal sizes being treated as ok in Unix (#680)

Browse Source
This commit is contained in:
Siphalor 2022-06-30 21:34:10 +02:00 committed by GitHub
parent ad0d100304
commit f523c110a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/terminal/sys/unix.rs
View File

@ -40,11 +40,12 @@ pub(crate) fn size() -> Result<(u16, u16)> {
};
if wrap_with_result(unsafe { ioctl(fd, TIOCGWINSZ.into(), &mut size) }).is_ok() {
Ok((size.ws_col, size.ws_row))
} else {
tput_size().ok_or_else(|| std::io::Error::last_os_error().into())
if size.ws_col != 0 && size.ws_row != 0 {
return Ok((size.ws_col, size.ws_row));
}
}
tput_size().ok_or_else(|| std::io::Error::last_os_error().into())
}
pub(crate) fn enable_raw_mode() -> Result<()> {
let mut original_mode = TERMINAL_MODE_PRIOR_RAW_MODE.lock();