From 6b58997ec1bf0aac6b47a69a10d7a87e209e144b Mon Sep 17 00:00:00 2001
From: nuintun <nuintun@gmail.com>
Date: Wed, 2 Dec 2015 12:20:06 +0800
Subject: [PATCH] update files

---
 canvas.html                 |  2 +-
 static/js/terminal/index.js | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/canvas.html b/canvas.html
index 9fb8420..a4c02dc 100644
--- a/canvas.html
+++ b/canvas.html
@@ -94,7 +94,7 @@
       ].forEach(function (line){ xterm.write(line + '\r\n'); });
 
       xterm.write('\033[41;32m红底绿字\033[0m');
-      xterm.toString('html');
+      console.log(xterm.toString('html'));
     </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/static/js/terminal/index.js b/static/js/terminal/index.js
index ac6d5f7..eeaf2ed 100644
--- a/static/js/terminal/index.js
+++ b/static/js/terminal/index.js
@@ -1031,6 +1031,7 @@ AnsiTerminal.prototype.toString = function (type){
 
   if (type === 'html') {
     var styleBuffer;
+    var attrCache = null;
     var stylesBuffer = this.stylesBuffer || [];
 
     stylesBuffer = stylesBuffer.slice(0, rows);
@@ -1039,9 +1040,12 @@ AnsiTerminal.prototype.toString = function (type){
       stylesBuffer[i] = stylesBuffer[i] || [];
       cols = this.screen.buffer[i].cells.length;
 
+      s += '<div>';
+
       for (j = 0; j < cols; ++j) {
         node = this.screen.buffer[i].cells[j];
         styleBuffer = stylesBuffer[i][j] || styles(node);
+        attrCache = j === 0 ? null : attrCache;
 
         if (styleBuffer.value !== node.value || styleBuffer.attr !== node.attr) {
           stylesBuffer[i][j] = styles(node);
@@ -1050,9 +1054,28 @@ AnsiTerminal.prototype.toString = function (type){
         }
 
         if (node.value) {
-          console.log(node.value, ': ', stylesBuffer[i][j]);
+          if (attrCache !== null && node.attr === attrCache) {
+            s += node.value;
+
+          } else {
+            if (attrCache === null) {
+              s += '<span>';
+            } else {
+              s += node.value;
+
+              if (j === cols - 1) {
+                s += '</span>';
+              } else {
+                s += '</span><span>';
+              }
+            }
+
+            attrCache = node.attr;
+          }
         }
       }
+
+      s += '</div>';
     }
 
     this.stylesBuffer = stylesBuffer;