diff options
author | Jesse Luehrs <doy@tozt.net> | 2021-03-12 12:20:06 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2021-03-12 12:20:06 -0500 |
commit | 7c06da9c0f3402efbc3954e9f14b1d039fd38929 (patch) | |
tree | 57d06edf5b1dd15b51c3bb771845ce215b698a53 /src | |
parent | f3498d0afe3bd36cf3e9f553776518fd458a39af (diff) | |
download | textmode-7c06da9c0f3402efbc3954e9f14b1d039fd38929.tar.gz textmode-7c06da9c0f3402efbc3954e9f14b1d039fd38929.zip |
move the guards back onto the main objects
Diffstat (limited to 'src')
-rw-r--r-- | src/blocking/input.rs | 13 | ||||
-rw-r--r-- | src/blocking/output.rs | 18 | ||||
-rw-r--r-- | src/input.rs | 12 | ||||
-rw-r--r-- | src/output.rs | 13 |
4 files changed, 47 insertions, 9 deletions
diff --git a/src/blocking/input.rs b/src/blocking/input.rs index 1381776..b133e7f 100644 --- a/src/blocking/input.rs +++ b/src/blocking/input.rs @@ -50,6 +50,8 @@ impl Drop for RawGuard { } pub struct Input { + raw: Option<RawGuard>, + buf: Vec<u8>, pos: usize, @@ -112,12 +114,15 @@ impl crate::private::Input for Input { #[allow(clippy::new_without_default)] impl Input { - pub fn new() -> Result<(Self, RawGuard)> { - Ok((Self::new_without_raw(), RawGuard::new()?)) + pub fn new() -> Result<Self> { + let mut self_ = Self::new_without_raw(); + self_.raw = Some(RawGuard::new()?); + Ok(self_) } pub fn new_without_raw() -> Self { Self { + raw: None, buf: Vec::with_capacity(4096), pos: 0, parse_utf8: true, @@ -148,6 +153,10 @@ impl Input { self.parse_single = parse; } + pub fn take_raw_guard(&mut self) -> Option<RawGuard> { + self.raw.take() + } + pub fn read_key(&mut self) -> Result<Option<crate::Key>> { self.fill_buf()?; diff --git a/src/blocking/output.rs b/src/blocking/output.rs index 85faac1..83466f8 100644 --- a/src/blocking/output.rs +++ b/src/blocking/output.rs @@ -30,6 +30,8 @@ impl Drop for ScreenGuard { } pub struct Output { + screen: Option<ScreenGuard>, + cur: vt100::Parser, next: vt100::Parser, } @@ -55,8 +57,10 @@ impl crate::private::Output for Output { impl crate::Textmode for Output {} impl Output { - pub fn new() -> Result<(Self, ScreenGuard)> { - Ok((Self::new_without_screen(), ScreenGuard::new()?)) + pub fn new() -> Result<Self> { + let mut self_ = Self::new_without_screen(); + self_.screen = Some(ScreenGuard::new()?); + Ok(self_) } pub fn new_without_screen() -> Self { @@ -69,7 +73,15 @@ impl Output { let cur = vt100::Parser::new(rows, cols, 0); let next = vt100::Parser::new(rows, cols, 0); - Self { cur, next } + Self { + screen: None, + cur, + next, + } + } + + pub fn take_screen_guard(&mut self) -> Option<ScreenGuard> { + self.screen.take() } pub fn refresh(&mut self) -> Result<()> { diff --git a/src/input.rs b/src/input.rs index c881e44..e34187e 100644 --- a/src/input.rs +++ b/src/input.rs @@ -61,6 +61,7 @@ impl Drop for RawGuard { pub struct Input { stdin: blocking::Unblock<std::io::Stdin>, + raw: Option<RawGuard>, buf: Vec<u8>, pos: usize, @@ -124,13 +125,16 @@ impl crate::private::Input for Input { #[allow(clippy::new_without_default)] impl Input { - pub async fn new() -> Result<(Self, RawGuard)> { - Ok((Self::new_without_raw(), RawGuard::new().await?)) + pub async fn new() -> Result<Self> { + let mut self_ = Self::new_without_raw(); + self_.raw = Some(RawGuard::new().await?); + Ok(self_) } pub fn new_without_raw() -> Self { Self { stdin: blocking::Unblock::new(std::io::stdin()), + raw: None, buf: Vec::with_capacity(4096), pos: 0, parse_utf8: true, @@ -161,6 +165,10 @@ impl Input { self.parse_single = parse; } + pub fn take_raw_guard(&mut self) -> Option<RawGuard> { + self.raw.take() + } + pub async fn read_key(&mut self) -> Result<Option<crate::Key>> { self.fill_buf().await?; diff --git a/src/output.rs b/src/output.rs index 28411e1..1e0ed43 100644 --- a/src/output.rs +++ b/src/output.rs @@ -41,6 +41,8 @@ impl Drop for ScreenGuard { pub struct Output { stdout: blocking::Unblock<std::io::Stdout>, + screen: Option<ScreenGuard>, + cur: vt100::Parser, next: vt100::Parser, } @@ -66,8 +68,10 @@ impl crate::private::Output for Output { impl crate::Textmode for Output {} impl Output { - pub async fn new() -> Result<(Self, ScreenGuard)> { - Ok((Self::new_without_screen(), ScreenGuard::new().await?)) + pub async fn new() -> Result<Self> { + let mut self_ = Self::new_without_screen(); + self_.screen = Some(ScreenGuard::new().await?); + Ok(self_) } pub fn new_without_screen() -> Self { @@ -81,11 +85,16 @@ impl Output { let next = vt100::Parser::new(rows, cols, 0); Self { stdout: blocking::Unblock::new(std::io::stdout()), + screen: None, cur, next, } } + pub fn take_screen_guard(&mut self) -> Option<ScreenGuard> { + self.screen.take() + } + pub async fn refresh(&mut self) -> Result<()> { let diff = self.next().screen().state_diff(self.cur().screen()); write_stdout(&mut self.stdout, &diff).await?; |