boot-tree: single-threaded feed, Duration timestamps, fields over getters, jiff formatting
This commit is contained in:
1 parent
63743d8807
commit
2b1447965a
11 files changed
+714
-757
No files matched your search
+17
-20
@@ -23,34 +23,31 @@ pub struct ForegroundVt {
|
||||
|
||||
impl ForegroundVt {
|
||||
pub fn take() -> Option<Self> {
|
||||
let own = own_vt_number()?;
|
||||
let previous = active_vt().ok()?;
|
||||
if previous != own {
|
||||
let name = ttyname(stdin(), Vec::new()).ok()?;
|
||||
let own: u16 = name
|
||||
.to_str()
|
||||
.ok()?
|
||||
.strip_prefix(VIRTUAL_TERMINAL_PREFIX)?
|
||||
.parse()
|
||||
.ok()
|
||||
.filter(|number| *number > 0)?;
|
||||
let state: VtState =
|
||||
unsafe { ioctl(stdin(), Getter::<VT_GETSTATE, VtState>::new()) }.ok()?;
|
||||
if state.active != own {
|
||||
activate(own).ok()?;
|
||||
}
|
||||
Some(Self { previous })
|
||||
Some(Self {
|
||||
previous: state.active,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
pub fn give_back(self) {
|
||||
impl Drop for ForegroundVt {
|
||||
fn drop(&mut self) {
|
||||
let _ = activate(self.previous);
|
||||
}
|
||||
}
|
||||
|
||||
fn own_vt_number() -> Option<u16> {
|
||||
let name = ttyname(stdin(), Vec::new()).ok()?;
|
||||
name.to_str()
|
||||
.ok()?
|
||||
.strip_prefix(VIRTUAL_TERMINAL_PREFIX)?
|
||||
.parse()
|
||||
.ok()
|
||||
.filter(|number| *number > 0)
|
||||
}
|
||||
|
||||
fn active_vt() -> Result<u16, Errno> {
|
||||
let state: VtState = unsafe { ioctl(stdin(), Getter::<VT_GETSTATE, VtState>::new()) }?;
|
||||
Ok(state.active)
|
||||
}
|
||||
|
||||
fn activate(number: u16) -> Result<(), Errno> {
|
||||
let number = usize::from(number);
|
||||
unsafe { ioctl(stdin(), IntegerSetter::<VT_ACTIVATE>::new_usize(number)) }?;
|
||||
|
||||
Reference in new issue
Block a user