From 3515c0b220e90539b21f9b158b09f88e4400807d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Mon, 14 Jan 2019 00:46:04 +0100
Subject: [PATCH] DOM renderer with RGB support

---
 .../dom/DomRendererRowFactory.test.ts         |  6 +-
 src/renderer/dom/DomRendererRowFactory.ts     | 60 +++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/renderer/dom/DomRendererRowFactory.test.ts b/src/renderer/dom/DomRendererRowFactory.test.ts
index c80cea27..6a69a4ba 100644
--- a/src/renderer/dom/DomRendererRowFactory.test.ts
+++ b/src/renderer/dom/DomRendererRowFactory.test.ts
@@ -113,7 +113,7 @@ describe('DomRendererRowFactory', () => {
         lineData.setCell(0, cell);
         const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
         assert.equal(getFragmentHtml(fragment),
-          '<span class="xterm-fg-1 xterm-bg-2">a</span>'
+          '<span class="xterm-bg-2 xterm-fg-1">a</span>'
         );
       });
 
@@ -124,7 +124,7 @@ describe('DomRendererRowFactory', () => {
         lineData.setCell(0, cell);
         const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
         assert.equal(getFragmentHtml(fragment),
-          '<span class="xterm-fg-1 xterm-bg-257">a</span>'
+          '<span class="xterm-bg-257 xterm-fg-1">a</span>'
         );
       });
 
@@ -134,7 +134,7 @@ describe('DomRendererRowFactory', () => {
         lineData.setCell(0, cell);
         const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
         assert.equal(getFragmentHtml(fragment),
-          '<span class="xterm-fg-257 xterm-bg-1">a</span>'
+          '<span class="xterm-bg-1 xterm-fg-257">a</span>'
         );
       });
 
diff --git a/src/renderer/dom/DomRendererRowFactory.ts b/src/renderer/dom/DomRendererRowFactory.ts
index 41091a63..7ef26e1f 100644
--- a/src/renderer/dom/DomRendererRowFactory.ts
+++ b/src/renderer/dom/DomRendererRowFactory.ts
@@ -4,9 +4,8 @@
  */
 
 import {  NULL_CELL_CODE, WHITESPACE_CELL_CHAR } from '../../Buffer';
-import { FLAGS } from '../Types';
 import { IBufferLine } from '../../Types';
-import { DEFAULT_COLOR, INVERTED_DEFAULT_COLOR } from '../atlas/Types';
+import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
 import { CellData } from '../../BufferLine';
 
 export const BOLD_CLASS = 'xterm-bold';
@@ -53,10 +52,6 @@ export class DomRendererRowFactory {
         charElement.style.width = `${cellWidth * width}px`;
       }
 
-      const flags = this._cell.getOldFlags();
-      let bg = this._cell.getOldBgColor();
-      let fg = this._cell.getOldFgColor();
-
       if (isCursorRow && x === cursorX) {
         charElement.classList.add(CURSOR_CLASS);
 
@@ -73,39 +68,44 @@ export class DomRendererRowFactory {
         }
       }
 
-      // If inverse flag is on, the foreground should become the background.
-      if (flags & FLAGS.INVERSE) {
-        const temp = bg;
-        bg = fg;
-        fg = temp;
-        if (fg === DEFAULT_COLOR) {
-          fg = INVERTED_DEFAULT_COLOR;
-        }
-        if (bg === DEFAULT_COLOR) {
-          bg = INVERTED_DEFAULT_COLOR;
-        }
-      }
-
-      if (flags & FLAGS.BOLD) {
-        // Convert the FG color to the bold variant. This should not happen when
-        // the fg is the inverse default color as there is no bold variant.
-        if (fg < 8) {
-          fg += 8;
-        }
+      if (this._cell.isBold()) {
         charElement.classList.add(BOLD_CLASS);
       }
 
-      if (flags & FLAGS.ITALIC) {
+      if (this._cell.isItalic()) {
         charElement.classList.add(ITALIC_CLASS);
       }
 
       charElement.textContent = this._cell.chars || WHITESPACE_CELL_CHAR;
-      if (fg !== DEFAULT_COLOR) {
-        charElement.classList.add(`xterm-fg-${fg}`);
+
+      const swapColor = !!this._cell.isInverse();
+
+      // fg
+      if (this._cell.isFgRGB()) {
+        let style = charElement.getAttribute('style') || '';
+        style += `${swapColor ? 'background-' : ''}color: rgb(${(this._cell.getFgColor(true) as number[]).join(',')});`;
+        charElement.setAttribute('style', style);
+      } else if (this._cell.isFgPalette()) {
+        let fg = this._cell.getFgColor() as number;
+        if (this._cell.isBold() && fg < 8 && !swapColor) {
+          fg += 8;
+        }
+        charElement.classList.add(`xterm-${swapColor ? 'b' : 'f'}g-${fg}`);
+      } else if (swapColor) {
+        charElement.classList.add(`xterm-bg-${INVERTED_DEFAULT_COLOR}`);
       }
-      if (bg !== DEFAULT_COLOR) {
-        charElement.classList.add(`xterm-bg-${bg}`);
+
+      // bg
+      if (this._cell.isBgRGB()) {
+        let style = charElement.getAttribute('style') || '';
+        style += `${swapColor ? '' : 'background-'}color: rgb(${(this._cell.getBgColor(true) as number[]).join(',')});`;
+        charElement.setAttribute('style', style);
+      } else if (this._cell.isBgPalette()) {
+        charElement.classList.add(`xterm-${swapColor ? 'f' : 'b'}g-${this._cell.getBgColor()}`);
+      } else if (swapColor) {
+        charElement.classList.add(`xterm-fg-${INVERTED_DEFAULT_COLOR}`);
       }
+
       fragment.appendChild(charElement);
     }
     return fragment;