Skip to content
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

Jump to bottom

Add 256 colors support #72

Merged
merged 1 commit into from
Aug 10, 2020
Merged

Add 256 colors support #72

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
17 changes: 17 additions & 0 deletions examples/colors256.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
use console::style;

fn main() {
for i in 0..=255 {
print!("{:03} ", style(i).color256(i));
if i % 16 == 15 {
println!("");
}
}

for i in 0..=255 {
print!("{:03} ", style(i).black().on_color256(i));
if i % 16 == 15 {
println!("");
}
}
}
34 changes: 32 additions & 2 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ pub enum Color {
Magenta,
Cyan,
White,
Color256(u8),
}

impl Color {
Expand All @@ -97,6 +98,15 @@ impl Color {
Color::Magenta => 5,
Color::Cyan => 6,
Color::White => 7,
Color::Color256(x) => x as usize,
}
}

#[inline]
fn is_color256(self) -> bool {
match self {
Color::Color256(_) => true,
_ => false,
}
}
}
Expand Down Expand Up @@ -296,6 +306,10 @@ impl Style {
pub fn white(self) -> Style {
self.fg(Color::White)
}
#[inline]
pub fn color256(self, color: u8) -> Style {
self.fg(Color::Color256(color))
}

#[inline]
pub fn bright(mut self) -> Style {
Expand Down Expand Up @@ -335,6 +349,10 @@ impl Style {
pub fn on_white(self) -> Style {
self.bg(Color::White)
}
#[inline]
pub fn on_color256(self, color: u8) -> Style {
self.bg(Color::Color256(color))
}

#[inline]
pub fn on_bright(mut self) -> Style {
Expand Down Expand Up @@ -478,6 +496,10 @@ impl<D> StyledObject<D> {
pub fn white(self) -> StyledObject<D> {
self.fg(Color::White)
}
#[inline]
pub fn color256(self, color: u8) -> StyledObject<D> {
self.fg(Color::Color256(color))
}

#[inline]
pub fn bright(mut self) -> StyledObject<D> {
Expand Down Expand Up @@ -517,6 +539,10 @@ impl<D> StyledObject<D> {
pub fn on_white(self) -> StyledObject<D> {
self.bg(Color::White)
}
#[inline]
pub fn on_color256(self, color: u8) -> StyledObject<D> {
self.bg(Color::Color256(color))
}

#[inline]
pub fn on_bright(mut self) -> StyledObject<D> {
Expand Down Expand Up @@ -568,15 +594,19 @@ macro_rules! impl_fmt {
})
{
if let Some(fg) = self.style.fg {
if self.style.fg_bright {
if fg.is_color256() {
write!(f, "\x1b[38;5;{}m", fg.ansi_num())?;
} else if self.style.fg_bright {
write!(f, "\x1b[38;5;{}m", fg.ansi_num() + 8)?;
} else {
write!(f, "\x1b[{}m", fg.ansi_num() + 30)?;
}
reset = true;
}
if let Some(bg) = self.style.bg {
if self.style.bg_bright {
if bg.is_color256() {
write!(f, "\x1b[48;5;{}m", bg.ansi_num())?;
} else if self.style.bg_bright {
write!(f, "\x1b[48;5;{}m", bg.ansi_num() + 8)?;
} else {
write!(f, "\x1b[{}m", bg.ansi_num() + 40)?;
Expand Down