From 98be066b4df0e6a085bf2423ee573a7e835cb029 Mon Sep 17 00:00:00 2001
From: Alexandre Bury <alexandre.bury@gmail.com>
Date: Mon, 12 Jun 2017 23:51:41 -0700
Subject: [PATCH] Don't re-apply current color

---
 src/backend/termion.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/backend/termion.rs b/src/backend/termion.rs
index 5889a02..5b4a029 100644
--- a/src/backend/termion.rs
+++ b/src/backend/termion.rs
@@ -49,12 +49,8 @@ impl Effectable for theme::Effect {
     }
 }
 
-fn apply_colors(fg: &tcolor::Color, bg: &tcolor::Color) {
-    print!("{}{}", tcolor::Fg(fg), tcolor::Bg(bg));
-}
-
 impl Concrete {
-    fn apply_colorstyle(&self, colors: theme::ColorPair) {
+    fn apply_colors(&self, colors: theme::ColorPair) {
         with_color(&colors.front, |c| print!("{}", tcolor::Fg(c)));
         with_color(&colors.back, |c| print!("{}", tcolor::Bg(c)));
     }
@@ -99,13 +95,17 @@ impl backend::Backend for Concrete {
     fn with_color<F: FnOnce()>(&self, color: theme::ColorPair, f: F) {
         let current_style = self.current_style.get();
 
-        self.apply_colorstyle(color);
+        if current_style != color {
+            self.apply_colors(color);
+            self.current_style.set(color);
+        }
 
-        self.current_style.set(color);
         f();
-        self.current_style.set(current_style);
 
-        self.apply_colorstyle(current_style);
+        if current_style != color {
+            self.current_style.set(current_style);
+            self.apply_colors(current_style);
+        }
     }
 
     fn with_effect<F: FnOnce()>(&self, effect: theme::Effect, f: F) {
@@ -125,7 +125,7 @@ impl backend::Backend for Concrete {
     }
 
     fn clear(&self, color: theme::Color) {
-        self.apply_colorstyle(theme::ColorPair {
+        self.apply_colors(theme::ColorPair {
             front: color,
             back: color,
         });