Add window size

This commit is contained in:
Jeremy Soller
2017-07-23 11:10:34 -06:00
parent 36a34e70b2
commit f03eaa8c24
4 changed files with 109 additions and 1 deletions
+1
View File
@@ -16,6 +16,7 @@ mod resource;
mod scheme;
mod slave;
mod termios;
mod winsize;
use scheme::PtyScheme;
+2
View File
@@ -6,6 +6,7 @@ use syscall::error::Result;
pub struct Pty {
pub id: usize,
pub termios: Termios,
pub winsize: Winsize,
pub miso: VecDeque<Vec<u8>>,
pub mosi: VecDeque<u8>,
}
@@ -15,6 +16,7 @@ impl Pty {
let mut pty = Pty {
id: id,
termios: Termios::default(),
winsize: Winsize::default(),
miso: VecDeque::new(),
mosi: VecDeque::new()
};
+4 -1
View File
@@ -13,6 +13,7 @@ use pty::Pty;
use resource::Resource;
use slave::PtySlave;
use termios::PtyTermios;
use winsize::PtyWinsize;
pub struct PtyScheme {
next_id: usize,
@@ -57,13 +58,15 @@ impl SchemeMut for PtyScheme {
}
fn dup(&mut self, old_id: usize, buf: &[u8]) -> Result<usize> {
let handle = {
let handle: Box<Resource> = {
let old_handle = self.handles.get(&old_id).ok_or(Error::new(EBADF))?;
if buf.is_empty() {
old_handle.boxed_clone()
} else if buf == b"termios" {
Box::new(PtyTermios::new(old_handle.pty(), old_handle.flags()))
} else if buf == b"winsize" {
Box::new(PtyWinsize::new(old_handle.pty(), old_handle.flags()))
} else {
return Err(Error::new(EINVAL));
}
+102
View File
@@ -0,0 +1,102 @@
use std::cell::RefCell;
use std::ops::{Deref, DerefMut};
use std::rc::Weak;
use syscall::error::{Error, Result, EBADF, EINVAL, EPIPE};
use syscall::flag::{F_GETFL, F_SETFL, O_ACCMODE};
use pty::Pty;
use resource::Resource;
/// Read side of a pipe
#[derive(Clone)]
pub struct PtyWinsize {
pty: Weak<RefCell<Pty>>,
flags: usize,
}
impl PtyWinsize {
pub fn new(pty: Weak<RefCell<Pty>>, flags: usize) -> Self {
PtyWinsize {
pty: pty,
flags: flags,
}
}
}
impl Resource for PtyWinsize {
fn boxed_clone(&self) -> Box<Resource> {
Box::new(self.clone())
}
fn pty(&self) -> Weak<RefCell<Pty>> {
self.pty.clone()
}
fn flags(&self) -> usize {
self.flags
}
fn path(&self, buf: &mut [u8]) -> Result<usize> {
if let Some(pty_lock) = self.pty.upgrade() {
pty_lock.borrow_mut().path(buf)
} else {
Err(Error::new(EPIPE))
}
}
fn read(&self, buf: &mut [u8]) -> Result<usize> {
if let Some(pty_lock) = self.pty.upgrade() {
let pty = pty_lock.borrow();
let winsize: &[u8] = pty.winsize.deref();
let mut i = 0;
while i < buf.len() && i < winsize.len() {
buf[i] = winsize[i];
i += 1;
}
Ok(i)
} else {
Ok(0)
}
}
fn write(&self, buf: &[u8]) -> Result<usize> {
if let Some(pty_lock) = self.pty.upgrade() {
let mut pty = pty_lock.borrow_mut();
let winsize: &mut [u8] = pty.winsize.deref_mut();
let mut i = 0;
while i < buf.len() && i < winsize.len() {
winsize[i] = buf[i];
i += 1;
}
Ok(i)
} else {
Err(Error::new(EPIPE))
}
}
fn sync(&self) -> Result<usize> {
Ok(0)
}
fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize> {
match cmd {
F_GETFL => Ok(self.flags),
F_SETFL => {
self.flags = (self.flags & O_ACCMODE) | (arg & ! O_ACCMODE);
Ok(0)
},
_ => Err(Error::new(EINVAL))
}
}
fn fevent(&self) -> Result<()> {
Err(Error::new(EBADF))
}
fn fevent_count(&self) -> Option<usize> {
None
}
}