From f677d4ba32ea09aa9de2d5efd3407e842995c292 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Wed, 6 Mar 2013 20:25:23 +0100
Subject: Use a ColorPair in DisplayAtoms instead of separate fg/bg colors

---
 src/remote.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/remote.cc')

diff --git a/src/remote.cc b/src/remote.cc
index f82837df..f46a0487 100644
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -70,8 +70,8 @@ public:
 
     void write(const DisplayAtom& atom)
     {
-        write(atom.fg_color);
-        write(atom.bg_color);
+        write(atom.colors.first);
+        write(atom.colors.second);
         write(atom.attribute);
         write(atom.content.content());
     }
@@ -144,8 +144,7 @@ DisplayAtom read<DisplayAtom>(int socket)
     Color bg_color = read<Color>(socket);
     Attribute attribute = read<Attribute>(socket);
     DisplayAtom atom(AtomContent(read<String>(socket)));
-    atom.fg_color = fg_color;
-    atom.bg_color = bg_color;
+    atom.colors = { fg_color, bg_color };
     atom.attribute = attribute;
     return atom;
 }
-- 
cgit v1.2.3