---

yaml
---
r: 62909
b: refs/heads/snap-stage3
c: b570536
h: refs/heads/master
i:
  62907: efd8624
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 11f31b96848c7d04f79e6aaa2c789857bb224526
+refs/heads/snap-stage3: b570536b38d3172deabb471f407993a1aa2d4a0d
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/std.rc

@@ -118,8 +118,6 @@ pub mod flate;
 #[cfg(unicode)]
 mod unicode;
 
-#[path="terminfo/terminfo.rs"]
-pub mod terminfo;
 
 // Compiler support modules
 

branches/snap-stage3/src/libextra/term.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -15,13 +15,9 @@
 use core::prelude::*;
 
 use core::io;
+use core::option;
 use core::os;
 
-use terminfo::*;
-use terminfo::searcher::open;
-use terminfo::parser::compiled::parse;
-use terminfo::parm::{expand, Number};
-
 // FIXME (#2807): Windows support.
 
 pub static color_black: u8 = 0u8;
@@ -43,90 +39,43 @@ pub static color_bright_magenta: u8 = 13u8;
 pub static color_bright_cyan: u8 = 14u8;
 pub static color_bright_white: u8 = 15u8;
 
-#[cfg(not(target_os = "win32"))]
-pub struct Terminal {
-    color_supported: bool,
-    priv out: @io::Writer,
-    priv ti: ~TermInfo
-}
+pub fn esc(writer: @io::Writer) { writer.write([0x1bu8, '[' as u8]); }
 
-#[cfg(target_os = "win32")]
-pub struct Terminal {
-    color_supported: bool,
-    priv out: @io::Writer,
+/// Reset the foreground and background colors to default
+pub fn reset(writer: @io::Writer) {
+    esc(writer);
+    writer.write(['0' as u8, 'm' as u8]);
 }
 
-#[cfg(not(target_os = "win32"))]
-pub impl Terminal {
-    pub fn new(out: @io::Writer) -> Result<Terminal, ~str> {
-        let term = os::getenv("TERM");
-        if term.is_none() {
-            return Err(~"TERM environment variable undefined");
-        }
-
-        let entry = open(term.unwrap());
-        if entry.is_err() {
-            return Err(entry.get_err());
-        }
-
-        let ti = parse(entry.get(), false);
-        if ti.is_err() {
-            return Err(entry.get_err());
-        }
-
-        let mut inf = ti.get();
-        let cs = *inf.numbers.find_or_insert(~"colors", 0) >= 16
-            && inf.strings.find(&~"setaf").is_some()
-            && inf.strings.find_equiv(&("setab")).is_some();
-
-        return Ok(Terminal {out: out, ti: inf, color_supported: cs});
-    }
-    fn fg(&self, color: u8) {
-        if self.color_supported {
-            let s = expand(*self.ti.strings.find_equiv(&("setaf")).unwrap(),
-                           [Number(color as int)], [], []);
-            if s.is_ok() {
-                self.out.write(s.get());
-            } else {
-                warn!(s.get_err());
+/// Returns true if the terminal supports color
+pub fn color_supported() -> bool {
+    let supported_terms = ~[~"xterm-color", ~"xterm",
+                           ~"screen-bce", ~"xterm-256color"];
+    return match os::getenv("TERM") {
+          option::Some(ref env) => {
+            for supported_terms.each |term| {
+                if *term == *env { return true; }
             }
-        }
-    }
-    fn bg(&self, color: u8) {
-        if self.color_supported {
-            let s = expand(*self.ti.strings.find_equiv(&("setab")).unwrap(),
-                           [Number(color as int)], [], []);
-            if s.is_ok() {
-                self.out.write(s.get());
-            } else {
-                warn!(s.get_err());
-            }
-        }
-    }
-    fn reset(&self) {
-        if self.color_supported {
-            let s = expand(*self.ti.strings.find_equiv(&("op")).unwrap(), [], [], []);
-            if s.is_ok() {
-                self.out.write(s.get());
-            } else {
-                warn!(s.get_err());
-            }
-        }
-    }
+            false
+          }
+          option::None => false
+        };
 }
 
-#[cfg(target_os = "win32")]
-pub impl Terminal {
-    pub fn new(out: @io::Writer) -> Result<Terminal, ~str> {
-        return Ok(Terminal {out: out, color_supported: false});
-    }
-
-    fn fg(&self, color: u8) {
-    }
+pub fn set_color(writer: @io::Writer, first_char: u8, color: u8) {
+    assert!((color < 16u8));
+    esc(writer);
+    let mut color = color;
+    if color >= 8u8 { writer.write(['1' as u8, ';' as u8]); color -= 8u8; }
+    writer.write([first_char, ('0' as u8) + color, 'm' as u8]);
+}
 
-    fn bg(&self, color: u8) {
-    }
+/// Set the foreground color
+pub fn fg(writer: @io::Writer, color: u8) {
+    return set_color(writer, '3' as u8, color);
+}
 
-    fn reset(&self) {
-    }
+/// Set the background color
+pub fn bg(writer: @io::Writer, color: u8) {
+    return set_color(writer, '4' as u8, color);
 }