github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-30 16:35:16 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adopt fstat in screen.rs

Browse Source
This commit is contained in:
Peter Ammon 2024-07-27 15:51:38 -07:00
parent 3dc3aed991
commit 89794ccfdb
No known key found for this signature in database
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/screen.rs
View File

@ -14,6 +14,7 @@ use std::ffi::{CStr, CString};
use std::io::Write;
use std::sync::atomic::{AtomicU32, Ordering};
use std::sync::Mutex;
use std::time::SystemTime;
use libc::{ONLCR, STDERR_FILENO, STDOUT_FILENO};
@ -34,6 +35,7 @@ use crate::output::Outputter;
use crate::termsize::{termsize_last, Termsize};
use crate::wchar::prelude::*;
use crate::wcstringutil::string_prefixes_string;
use crate::wutil::fstat;
#[derive(Clone, Default)]
pub struct HighlightedChar {
@ -199,10 +201,10 @@ pub struct Screen {
/// is used when resizing the window larger: if the cursor jumps to the line above, we need to
/// remember to clear the subsequent lines.
actual_lines_before_reset: usize,
/// These status buffers are used to check if any output has occurred other than from fish's
/// Modification times to check if any output has occurred other than from fish's
/// main loop, in which case we need to redraw.
prev_buff_1: libc::stat,
prev_buff_2: libc::stat,
mtime_stdout: Option<SystemTime>,
mtime_stderr: Option<SystemTime>,
}
impl Screen {
@ -218,8 +220,8 @@ impl Screen {
need_clear_lines: Default::default(),
need_clear_screen: Default::default(),
actual_lines_before_reset: Default::default(),
prev_buff_1: unsafe { std::mem::zeroed() },
prev_buff_2: unsafe { std::mem::zeroed() },
mtime_stdout: Default::default(),
mtime_stderr: Default::default(),
}
}
@ -499,10 +501,7 @@ impl Screen {
/// Stat stdout and stderr and save result as the current timestamp.
/// This is used to avoid reacting to changes that we ourselves made to the screen.
pub fn save_status(&mut self) {
unsafe {
libc::fstat(STDOUT_FILENO, &mut self.prev_buff_1);
libc::fstat(STDERR_FILENO, &mut self.prev_buff_2);
}
(self.mtime_stdout, self.mtime_stderr) = mtime_stdout_stderr();
}
/// Return whether we believe the cursor is wrapped onto the last line, and that line is
@ -587,22 +586,9 @@ impl Screen {
return;
}
let mut post_buff_1: libc::stat = unsafe { std::mem::zeroed() };
let mut post_buff_2: libc::stat = unsafe { std::mem::zeroed() };
unsafe { libc::fstat(STDOUT_FILENO, &mut post_buff_1) };
unsafe { libc::fstat(STDERR_FILENO, &mut post_buff_2) };
// Yes these differ in one `_`. I hate it.
#[cfg(not(target_os = "netbsd"))]
let changed = self.prev_buff_1.st_mtime != post_buff_1.st_mtime
|| self.prev_buff_1.st_mtime_nsec != post_buff_1.st_mtime_nsec
|| self.prev_buff_2.st_mtime != post_buff_2.st_mtime
|| self.prev_buff_2.st_mtime_nsec != post_buff_2.st_mtime_nsec;
#[cfg(target_os = "netbsd")]
let changed = self.prev_buff_1.st_mtime != post_buff_1.st_mtime
|| self.prev_buff_1.st_mtimensec != post_buff_1.st_mtimensec
|| self.prev_buff_2.st_mtime != post_buff_2.st_mtime
|| self.prev_buff_2.st_mtimensec != post_buff_2.st_mtimensec;
let mtime_out = fstat(STDOUT_FILENO).and_then(|md| md.modified()).ok();
let mtime_err = fstat(STDERR_FILENO).and_then(|md| md.modified()).ok();
let changed = self.mtime_stdout != mtime_out || self.mtime_stderr != mtime_err;
if changed {
// Ok, someone has been messing with our screen. We will want to repaint. However, we do not
@ -1071,6 +1057,13 @@ impl Screen {
}
}
/// Helper to get the mtime of stdout and stderr.
pub fn mtime_stdout_stderr() -> (Option<SystemTime>, Option<SystemTime>) {
let mtime_out = fstat(STDOUT_FILENO).and_then(|md| md.modified()).ok();
let mtime_err = fstat(STDERR_FILENO).and_then(|md| md.modified()).ok();
(mtime_out, mtime_err)
}
/// Issues an immediate clr_eos.
pub fn screen_force_clear_to_end() {
Outputter::stdoutput()