add support for ncurses 6.1 terminfo files

fixes Stebalien#81

Author: Stebalien

Cargo.toml

@@ -17,6 +17,9 @@ categories = ["command-line-interface"]
 travis-ci = { repository = "Stebalien/term" }
 appveyor = { repository = "Stebalien/term" }
 
+[dependencies]
+byteorder = "1.2.1"
+
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["wincon", "handleapi", "fileapi"] }
 

src/lib.rs

@@ -63,6 +63,8 @@
 #![deny(missing_docs)]
 #![cfg_attr(test, deny(warnings))]
 
+extern crate byteorder;
+
 use std::io::prelude::*;
 
 pub use terminfo::TerminfoTerminal;
@@ -118,7 +120,7 @@ pub fn stderr() -> Option<Box<StderrTerminal>> {
 #[allow(missing_docs)]
 pub mod color {
     /// Number for a terminal color
-    pub type Color = u16;
+    pub type Color = u32;
 
     pub const BLACK: Color = 0;
     pub const RED: Color = 1;

src/terminfo/mod.rs

@@ -61,7 +61,7 @@ pub struct TermInfo {
     /// Map of capability name to boolean value
     pub bools: HashMap<&'static str, bool>,
     /// Map of capability name to numeric value
-    pub numbers: HashMap<&'static str, u16>,
+    pub numbers: HashMap<&'static str, u32>,
     /// Map of capability name to raw (unexpanded) string
     pub strings: HashMap<&'static str, Vec<u8>>,
 }
@@ -107,7 +107,7 @@ impl TermInfo {
             strings.insert("setab", b"\x1B[4%p1%dm".to_vec());
 
             let mut numbers = HashMap::new();
-            numbers.insert("colors", 8u16);
+            numbers.insert("colors", 8);
 
             Ok(TermInfo {
                 names: vec![name.to_owned()],
@@ -181,7 +181,7 @@ impl TermInfo {
 pub enum Error {
     /// The "magic" number at the start of the file was wrong.
     ///
-    /// It should be `0x11A`
+    /// It should be `0x11A` (16bit numbers) or `0x21e` (32bit numbers)
     BadMagic(u16),
     /// The names in the file were not valid UTF-8.
     ///
@@ -278,7 +278,7 @@ fn cap_for_attr(attr: Attr) -> &'static str {
 /// parsed Terminfo database record.
 #[derive(Clone, Debug)]
 pub struct TerminfoTerminal<T> {
-    num_colors: u16,
+    num_colors: u32,
     out: T,
     ti: TermInfo,
 }
@@ -371,7 +371,7 @@ impl<T: Write> TerminfoTerminal<T> {
         TerminfoTerminal {
             out: out,
             ti: terminfo,
-            num_colors: nc,
+            num_colors: nc as u32,
         }
     }
 

src/terminfo/parser/compiled.rs

@@ -14,6 +14,8 @@ use std::collections::HashMap;
 use std::io::prelude::*;
 use std::io;
 
+use byteorder::{LittleEndian, ReadBytesExt};
+
 use terminfo::Error::*;
 use terminfo::TermInfo;
 use Result;
@@ -23,16 +25,12 @@ pub use terminfo::parser::names::*;
 // These are the orders ncurses uses in its compiled format (as of 5.9). Not
 // sure if portable.
 
-fn read_le_u16(r: &mut io::Read) -> io::Result<u16> {
-    let mut b = [0; 2];
-    let mut amt = 0;
-    while amt < b.len() {
-        match try!(r.read(&mut b[amt..])) {
-            0 => return Err(io::Error::new(io::ErrorKind::Other, "end of file")),
-            n => amt += n,
-        }
-    }
-    Ok((b[0] as u16) | ((b[1] as u16) << 8))
+fn read_le_u16(r: &mut io::Read) -> io::Result<u32> {
+    return r.read_u16::<LittleEndian>().map(|i| i as u32)
+}
+
+fn read_le_u32(r: &mut io::Read) -> io::Result<u32> {
+    return r.read_u32::<LittleEndian>()
 }
 
 fn read_byte(r: &mut io::Read) -> io::Result<u8> {
@@ -52,10 +50,13 @@ pub fn parse(file: &mut io::Read, longnames: bool) -> Result<TermInfo> {
     };
 
     // Check magic number
-    let magic = try!(read_le_u16(file));
-    if magic != 0x011A {
-        return Err(BadMagic(magic).into());
-    }
+    let magic = try!(file.read_u16::<LittleEndian>());
+
+    let read_number = match magic {
+        0x011A => read_le_u16,
+        0x021e => read_le_u32,
+        _ => return Err(BadMagic(magic).into()),
+    };
 
     // According to the spec, these fields must be >= -1 where -1 means that the
     // feature is not
@@ -121,8 +122,8 @@ pub fn parse(file: &mut io::Read, longnames: bool) -> Result<TermInfo> {
         try!(read_byte(file)); // compensate for padding
     }
 
-    let numbers_map: HashMap<&str, u16> = try! {
-        (0..numbers_count).filter_map(|i| match read_le_u16(file) {
+    let numbers_map: HashMap<&str, u32> = try! {
+        (0..numbers_count).filter_map(|i| match read_number(file) {
             Ok(0xFFFF) => None,
             Ok(n) => Some(Ok((nnames[i], n))),
             Err(e) => Some(Err(e))
@@ -131,7 +132,7 @@ pub fn parse(file: &mut io::Read, longnames: bool) -> Result<TermInfo> {
 
     let string_map: HashMap<&str, Vec<u8>> = if string_offsets_count > 0 {
         let string_offsets: Vec<u16> = try!((0..string_offsets_count)
-                                                .map(|_| read_le_u16(file))
+                                                .map(|_| file.read_u16::<LittleEndian>())
                                                 .collect());
 
         let mut string_table = Vec::new();