diff --git a/Cargo.toml b/Cargo.toml
index 0be9051ca43f3defa0886ca84e96d75bcf8bb206..3d1d394fa53b1374f86f3f5080771360d69a3d63 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,3 +11,8 @@ exclude = ["target", "CHANGELOG.md", "image.png", "Cargo.lock"]
[target.'cfg(not(target_os = "redox"))'.dependencies]
libc = "0.2.8"
+
+
+[target.'cfg(target_os = "redox")'.dependencies]
+redox_syscall = "0.1"
+redox_termios = "0.1"
diff --git a/src/input.rs b/src/input.rs
index a9e874dfab911d0dd625275642f9a6ac7f1e81a1..6f6dd171f334023aeb6883cfe696c50da84b4af5 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -27,15 +27,28 @@ impl<R: Read> Iterator for Keys<R> {
}
/// An iterator over input events.
-pub struct Events<R> {
- source: R,
- leftover: Option<u8>,
+pub struct Events<R> {
+ inner: EventsAndRaw<R>
}
impl<R: Read> Iterator for Events<R> {
type Item = Result<Event, io::Error>;
fn next(&mut self) -> Option<Result<Event, io::Error>> {
+ self.inner.next().map(|tuple| tuple.map(|(event, _raw)| event))
+ }
+}
+
+/// An iterator over input events and the bytes that define them.
+pub struct EventsAndRaw<R> {
+ source: R,
+ leftover: Option<u8>,
+}
+
+impl<R: Read> Iterator for EventsAndRaw<R> {
+ type Item = Result<(Event, Vec<u8>), io::Error>;
+
+ fn next(&mut self) -> Option<Result<(Event, Vec<u8>), io::Error>> {
let mut source = &mut self.source;
if let Some(c) = self.leftover {
@@ -53,7 +66,7 @@ impl<R: Read> Iterator for Events<R> {
Ok(0) => return None,
Ok(1) => {
match buf[0] {
- b'\x1B' => Ok(Event::Key(Key::Esc)),
+ b'\x1B' => Ok((Event::Key(Key::Esc), vec![b'\x1B'])),
c => parse_event(c, &mut source.bytes()),
}
}
@@ -75,7 +88,7 @@ impl<R: Read> Iterator for Events<R> {
}
}
-fn parse_event<I>(item: u8, iter: &mut I) -> Result<Event, io::Error>
+fn parse_event<I>(item: u8, iter: &mut I) -> Result<(Event, Vec<u8>), io::Error>
where I: Iterator<Item = Result<u8, io::Error>>
{
let mut buf = vec![item];
@@ -85,7 +98,7 @@ fn parse_event<I>(item: u8, iter: &mut I) -> Result<Event, io::Error>
});
event::parse_event(item, &mut iter)
};
- result.or(Ok(Event::Unsupported(buf)))
+ result.or(Ok(Event::Unsupported(buf.clone()))).map(|e| (e, buf))
}
@@ -113,11 +126,11 @@ pub trait TermRead {
}
}
-impl<R: Read> TermRead for R {
+
+impl<R: Read + TermReadEventsAndRaw> TermRead for R {
fn events(self) -> Events<Self> {
Events {
- source: self,
- leftover: None,
+ inner: self.events_and_raw()
}
}
fn keys(self) -> Keys<Self> {
@@ -145,6 +158,21 @@ impl<R: Read> TermRead for R {
}
}
+/// Extension to `TermRead` trait. A separate trait in order to maintain backwards compatibility.
+pub trait TermReadEventsAndRaw {
+ /// An iterator over input events and the bytes that define them.
+ fn events_and_raw(self) -> EventsAndRaw<Self> where Self: Sized;
+}
+
+impl<R: Read> TermReadEventsAndRaw for R {
+ fn events_and_raw(self) -> EventsAndRaw<Self> {
+ EventsAndRaw {
+ source: self,
+ leftover: None,
+ }
+ }
+}
+
/// A sequence of escape codes to enable terminal mouse support.
const ENTER_MOUSE_SEQUENCE: &'static str = csi!("?1000h\x1b[?1002h\x1b[?1015h\x1b[?1006h");
@@ -241,6 +269,38 @@ mod test {
assert!(i.next().is_none());
}
+ #[test]
+ fn test_events_and_raw() {
+ let input = b"\x1B[\x00bc\x7F\x1B[D\
+ \x1B[M\x00\x22\x24\x1B[<0;2;4;M\x1B[32;2;4M\x1B[<0;2;4;m\x1B[35;2;4Mb";
+ let mut output = Vec::<u8>::new();
+ {
+ let mut i = input.events_and_raw().map(|res| res.unwrap())
+ .inspect(|&(_, ref raw)| { output.extend(raw); }).map(|(event, _)| event);
+
+ assert_eq!(i.next().unwrap(),
+ Event::Unsupported(vec![0x1B, b'[', 0x00]));
+ assert_eq!(i.next().unwrap(), Event::Key(Key::Char('b')));
+ assert_eq!(i.next().unwrap(), Event::Key(Key::Char('c')));
+ assert_eq!(i.next().unwrap(), Event::Key(Key::Backspace));
+ assert_eq!(i.next().unwrap(), Event::Key(Key::Left));
+ assert_eq!(i.next().unwrap(),
+ Event::Mouse(MouseEvent::Press(MouseButton::WheelUp, 2, 4)));
+ assert_eq!(i.next().unwrap(),
+ Event::Mouse(MouseEvent::Press(MouseButton::Left, 2, 4)));
+ assert_eq!(i.next().unwrap(),
+ Event::Mouse(MouseEvent::Press(MouseButton::Left, 2, 4)));
+ assert_eq!(i.next().unwrap(),
+ Event::Mouse(MouseEvent::Release(2, 4)));
+ assert_eq!(i.next().unwrap(),
+ Event::Mouse(MouseEvent::Release(2, 4)));
+ assert_eq!(i.next().unwrap(), Event::Key(Key::Char('b')));
+ assert!(i.next().is_none());
+ }
+
+ assert_eq!(input.iter().map(|b| *b).collect::<Vec<u8>>(), output)
+ }
+
#[test]
fn test_function_keys() {
let mut st = b"\x1BOP\x1BOQ\x1BOR\x1BOS".keys();
diff --git a/src/lib.rs b/src/lib.rs
index 7e286bb4b2fc4077a20823c7c5d5e18ce7eb1604..8dd4d2fac24b00d1157065945d06bbac9324e134 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,6 +17,12 @@ extern crate libc;
#[cfg(not(target_os = "redox"))]
mod termios;
+#[cfg(target_os = "redox")]
+extern crate redox_termios;
+
+#[cfg(target_os = "redox")]
+extern crate syscall;
+
mod async;
pub use async::{AsyncReader, async_stdin};
diff --git a/src/size.rs b/src/size.rs
index 19f377ba803e60afdde851fdc46c341134064b83..3317ce523c466c45d35ccb712e7ee2881d632208 100644
--- a/src/size.rs
+++ b/src/size.rs
@@ -57,16 +57,21 @@ pub fn terminal_size() -> io::Result<(u16, u16)> {
/// Get the size of the terminal.
#[cfg(target_os = "redox")]
pub fn terminal_size() -> io::Result<(u16, u16)> {
- use std::env;
+ use redox_termios;
+ use syscall;
- let width = try!(env::var("COLUMNS").map_err(|x| io::Error::new(io::ErrorKind::NotFound, x)))
- .parse()
- .unwrap_or(0);
- let height = try!(env::var("LINES").map_err(|x| io::Error::new(io::ErrorKind::NotFound, x)))
- .parse()
- .unwrap_or(0);
+ if let Ok(fd) = syscall::dup(1, b"winsize") {
+ let mut winsize = redox_termios::Winsize::default();
+ let res = syscall::read(fd, &mut winsize);
+ let _ = syscall::close(fd);
+ if let Ok(count) = res {
+ if count == winsize.len() {
+ return Ok((winsize.ws_col, winsize.ws_row));
+ }
+ }
+ }
- Ok((width, height))
+ Err(io::Error::new(io::ErrorKind::Other, "Unable to get the terminal size."))
}
#[cfg(test)]
diff --git a/src/tty.rs b/src/tty.rs
index 9788e54f9c90bb0cdaba9ba689c37fbb0c2892f5..90a97e05f89255141ab447a53f3c6be3b5c2f676 100644
--- a/src/tty.rs
+++ b/src/tty.rs
@@ -11,8 +11,15 @@ pub fn is_tty<T: AsRawFd>(stream: &T) -> bool {
/// This will panic.
#[cfg(target_os = "redox")]
-pub fn is_tty<T: AsRawFd>(_stream: &T) -> bool {
- unimplemented!();
+pub fn is_tty<T: AsRawFd>(stream: &T) -> bool {
+ use syscall;
+
+ if let Ok(fd) = syscall::dup(stream.as_raw_fd(), b"termios") {
+ let _ = syscall::close(fd);
+ true
+ } else {
+ false
+ }
}
/// Get the TTY device.