Revert "Merge branch 'master' of https://github.com/chrisduerr/alacritty into cursor-config"cursor-config

Revert merge of bright foreground color branch into cursor-config.

5 files changed, 1 insertions, 30 deletions

diff --git a/alacritty.yml b/alacritty.yml
index d1fb1961..08b663b7 100644
--- a/alacritty.yml
+++ b/alacritty.yml
@@ -107,7 +107,6 @@ colors:
   primary:
     background: '0x000000'
     foreground: '0xeaeaea'
-    bright_foreground: '0xeaeaea'
 
   cursor:
     # If this is `false` the text cursor inverses
diff --git a/alacritty_macos.yml b/alacritty_macos.yml
index 797bd363..56b0dd63 100644
--- a/alacritty_macos.yml
+++ b/alacritty_macos.yml
@@ -87,7 +87,6 @@ colors:
   primary:
     background: '0x000000'
     foreground: '0xeaeaea'
-    bright_foreground: '0xeaeaea'
 
   cursor:
     # If this is `false` the text cursor inverses
diff --git a/src/ansi.rs b/src/ansi.rs
index c63d334e..3bcfff88 100644
--- a/src/ansi.rs
+++ b/src/ansi.rs
@@ -558,14 +558,11 @@ pub enum NamedColor {
     DimCyan,
     /// Dim white
     DimWhite,
-    /// The bright foreground color
-    BrightForeground,
 }
 
 impl NamedColor {
     pub fn to_bright(&self) -> Self {
         match *self {
-            NamedColor::Foreground => NamedColor::BrightForeground,
             NamedColor::Black => NamedColor::BrightBlack,
             NamedColor::Red => NamedColor::BrightRed,
             NamedColor::Green => NamedColor::BrightGreen,
diff --git a/src/config.rs b/src/config.rs
index 68be2a6d..4295c2ce 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -969,24 +969,6 @@ pub struct PrimaryColors {
     pub background: Rgb,
     #[serde(deserialize_with = "rgb_from_hex")]
     pub foreground: Rgb,
-    #[serde(default, deserialize_with = "deserialize_bright_foreground")]
-    pub bright_foreground: Option<Rgb>,
-}
-
-fn deserialize_bright_foreground<'a, D>(deserializer: D) -> ::std::result::Result<Option<Rgb>, D::Error>
-    where D: de::Deserializer<'a>
-{
-    match Option::deserialize(deserializer) {
-        Ok(Some(color)) => {
-            let color: serde_yaml::Value = color;
-            Ok(Some(rgb_from_hex(color).unwrap()))
-        },
-        Ok(None) => Ok(None),
-        Err(err) => {
-            eprintln!("problem with config: {}; Using standard foreground color", err);
-            Ok(None)
-        },
-    }
 }
 
 impl Default for PrimaryColors {
@@ -994,7 +976,6 @@ impl Default for PrimaryColors {
         PrimaryColors {
             background: Rgb { r: 0, g: 0, b: 0 },
             foreground: Rgb { r: 0xea, g: 0xea, b: 0xea },
-            bright_foreground: None,
         }
     }
 }
diff --git a/src/term/color.rs b/src/term/color.rs
index b84f11bd..d25f2f3d 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 = 269;
+pub const COUNT: usize = 268;
 
 /// List of indexed colors
 ///
@@ -13,7 +13,6 @@ pub const COUNT: usize = 269;
 /// 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.
 #[derive(Copy, Clone)]
 pub struct List([Rgb; COUNT]);
 
@@ -51,10 +50,6 @@ impl List {
         self[ansi::NamedColor::BrightMagenta] = colors.bright.magenta;
         self[ansi::NamedColor::BrightCyan]    = colors.bright.cyan;
         self[ansi::NamedColor::BrightWhite]   = colors.bright.white;
-        self[ansi::NamedColor::BrightForeground] = colors
-            .primary
-            .bright_foreground
-            .unwrap_or(colors.primary.foreground);
 
         // Foreground and background
         self[ansi::NamedColor::Foreground] = colors.primary.foreground;