Skip to content

Support ANSI colors in msys terminals. See #2807 #11031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Support ANSI colors in msys terminals. See #2807 #11031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 13 additions & 45 deletions src/libextra/term.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

use std::io::{Decorator, Writer};

#[cfg(not(target_os = "win32"))] use std::os;
#[cfg(not(target_os = "win32"))] use terminfo::*;
#[cfg(not(target_os = "win32"))] use terminfo::searcher::open;
#[cfg(not(target_os = "win32"))] use terminfo::parser::compiled::parse;
#[cfg(not(target_os = "win32"))] use terminfo::parm::{expand, Number, Variables};
use std::os;
use terminfo::*;
use terminfo::searcher::open;
use terminfo::parser::compiled::{parse, msys_terminfo};
use terminfo::parm::{expand, Number, Variables};

// FIXME (#2807): Windows support.

Expand Down Expand Up @@ -74,7 +74,6 @@ pub mod attr {
}
}

#[cfg(not(target_os = "win32"))]
fn cap_for_attr(attr: attr::Attr) -> &'static str {
match attr {
attr::Bold => "bold",
Expand All @@ -93,29 +92,24 @@ fn cap_for_attr(attr: attr::Attr) -> &'static str {
}
}

#[cfg(not(target_os = "win32"))]
pub struct Terminal<T> {
priv num_colors: u16,
priv out: T,
priv ti: ~TermInfo
}

#[cfg(target_os = "win32")]
pub struct Terminal<T> {
priv num_colors: u16,
priv out: T,
}

#[cfg(not(target_os = "win32"))]
impl<T: Writer> Terminal<T> {
pub fn new(out: T) -> Result<Terminal<T>, ~str> {
let term = os::getenv("TERM");
if term.is_none() {
return Err(~"TERM environment variable undefined");
}
let term = match os::getenv("TERM") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I get this correctly, when stdout is redirected to a file, we'll still output escape codes? Strictly speaking, there should be a check whether the stdout is a TTY.
Unfortunately the Writer trait does not have an isatty() method, so you can't check. I wonder if Terminal should work with std::io::stdio::StdWriter instead...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No this isn't the case because there's an extra check in here: https://github.com/mozilla/rust/blob/master/src/libsyntax/diagnostic.rs#L205

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I missed that bit.

Some(t) => t,
None => return Err(~"TERM environment variable undefined")
};

let entry = open(term.unwrap());
let entry = open(term);
if entry.is_err() {
if "cygwin" == term { // msys terminal
return Ok(Terminal {out: out, ti: msys_terminfo(), num_colors: 8});
}
return Err(entry.unwrap_err());
}

Expand Down Expand Up @@ -241,32 +235,6 @@ impl<T: Writer> Terminal<T> {
}
}

#[cfg(target_os = "win32")]
impl<T: Writer> Terminal<T> {
pub fn new(out: T) -> Result<Terminal<T>, ~str> {
return Ok(Terminal {out: out, num_colors: 0});
}

pub fn fg(&mut self, _color: color::Color) -> bool {
false
}

pub fn bg(&mut self, _color: color::Color) -> bool {
false
}

pub fn attr(&mut self, _attr: attr::Attr) -> bool {
false
}

pub fn supports_attr(&self, _attr: attr::Attr) -> bool {
false
}

pub fn reset(&self) {
}
}

impl<T: Writer> Decorator<T> for Terminal<T> {
fn inner(self) -> T {
self.out
Expand Down
15 changes: 15 additions & 0 deletions src/libextra/terminfo/parser/compiled.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,21 @@ pub fn parse(file: &mut io::Reader,
Ok(~TermInfo {names: term_names, bools: bools_map, numbers: numbers_map, strings: string_map })
}

/// Create a dummy TermInfo struct for msys terminals
pub fn msys_terminfo() -> ~TermInfo {
let mut strings = HashMap::new();
strings.insert(~"sgr0", bytes!("\x1b[0m").to_owned());
strings.insert(~"bold", bytes!("\x1b[1m;").to_owned());
strings.insert(~"setaf", bytes!("\x1b[3%p1%dm").to_owned());
strings.insert(~"setab", bytes!("\x1b[4%p1%dm").to_owned());
~TermInfo {
names: ~[~"cygwin"], // msys is a fork of an older cygwin version
bools: HashMap::new(),
numbers: HashMap::new(),
strings: strings
}
}

#[cfg(test)]
mod test {
use super::*;
Expand Down