diff options
author | Christian Duerr <contact@christianduerr.com> | 2018-01-16 20:17:40 +0100 |
---|---|---|
committer | Christian Duerr <contact@christianduerr.com> | 2018-01-22 01:25:12 +0100 |
commit | 319f3e29bf6a2dd1da45a967eb1d3a039ff29b7d (patch) | |
tree | 49a125f9d4320073019732d9b3e11430e1ae3cd7 | |
parent | add63a6fa84ac0d0f61dc2c056b85df84c6494a4 (diff) | |
download | alacritty-319f3e29bf6a2dd1da45a967eb1d3a039ff29b7d.tar.gz alacritty-319f3e29bf6a2dd1da45a967eb1d3a039ff29b7d.zip |
Revert addition of bold background
There was no evidence for the existence of a bold background in the
termite config or the escape sequence specifications, so the bold
background has been removed again.
The changes to the documentation have not been reverted.
-rw-r--r-- | src/ansi.rs | 2 | ||||
-rw-r--r-- | src/config.rs | 7 | ||||
-rw-r--r-- | src/term/color.rs | 8 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/ansi.rs b/src/ansi.rs index 696d0caf..c63d334e 100644 --- a/src/ansi.rs +++ b/src/ansi.rs @@ -560,8 +560,6 @@ pub enum NamedColor { DimWhite, /// The bright foreground color BrightForeground, - /// The bright background color - BrightBackground, } impl NamedColor { diff --git a/src/config.rs b/src/config.rs index 97fe7798..07a491c7 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1017,13 +1017,11 @@ pub struct PrimaryColors { pub background: Rgb, #[serde(deserialize_with = "rgb_from_hex")] pub foreground: Rgb, - #[serde(default, deserialize_with = "deserialize_bright_primary")] - pub bright_background: Option<Rgb>, - #[serde(default, deserialize_with = "deserialize_bright_primary")] + #[serde(default, deserialize_with = "deserialize_bright_foreground")] pub bright_foreground: Option<Rgb>, } -fn deserialize_bright_primary<'a, D>(deserializer: D) -> ::std::result::Result<Option<Rgb>, D::Error> +fn deserialize_bright_foreground<'a, D>(deserializer: D) -> ::std::result::Result<Option<Rgb>, D::Error> where D: de::Deserializer<'a> { match Option::deserialize(deserializer) { @@ -1044,7 +1042,6 @@ impl Default for PrimaryColors { PrimaryColors { background: Rgb { r: 0, g: 0, b: 0 }, foreground: Rgb { r: 0xea, g: 0xea, b: 0xea }, - bright_background: None, bright_foreground: None, } } diff --git a/src/term/color.rs b/src/term/color.rs index 90634f36..b84f11bd 100644 --- a/src/term/color.rs +++ b/src/term/color.rs @@ -4,7 +4,7 @@ use std::fmt; use {Rgb, ansi}; use config::Colors; -pub const COUNT: usize = 270; +pub const COUNT: usize = 269; /// List of indexed colors /// @@ -13,7 +13,7 @@ pub const COUNT: usize = 270; /// the configured foreground color, item 257 is the configured background /// color, item 258 is the cursor foreground color, item 259 is the cursor /// background color. Following that are 8 positions for dim colors. -/// Item 268 is the bright foreground color and 269 is the bright background. +/// Item 268 is the bright foreground color. #[derive(Copy, Clone)] pub struct List([Rgb; COUNT]); @@ -55,10 +55,6 @@ impl List { .primary .bright_foreground .unwrap_or(colors.primary.foreground); - self[ansi::NamedColor::BrightBackground] = colors - .primary - .bright_background - .unwrap_or(colors.primary.background); // Foreground and background self[ansi::NamedColor::Foreground] = colors.primary.foreground; |