From 5a4caea0c227f69d754acd182d0aa7db3f39804d Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 16 Oct 2014 23:21:31 -0400
Subject: try to minimize our bandwidth a bit

---
 termcast_server/index.html  | 50 +++++++++++++++++++++----------------------
 termcast_server/termcast.py | 52 ++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 51 deletions(-)

(limited to 'termcast_server')

diff --git a/termcast_server/index.html b/termcast_server/index.html
index fe08035..f8ad94d 100644
--- a/termcast_server/index.html
+++ b/termcast_server/index.html
@@ -309,32 +309,32 @@ socket.onmessage = function (e) {
             term += '<tr>';
             row.forEach(function (cell) {
                 term += '<td';
-                if (cell.fgcolor != null || cell.bgcolor != null || cell.italic || cell.underline) {
+                if (cell.f != null || cell.b != null || cell.i || cell.u) {
                     term += ' style="';
-                    if (cell.fgcolor != null) {
-                        var fgcolor = cell.fgcolor;
-                        if (cell.bold && fgcolor < 8) {
+                    if (cell.f != null) {
+                        var fgcolor = cell.f;
+                        if (cell.o && fgcolor < 8) {
                             fgcolor += 8;
                         }
                         term += 'color: ' + colors[fgcolor] + ';';
                     }
-                    if (cell.bgcolor != null) {
-                        term += 'background-color: ' + colors[cell.bgcolor] + ';';
+                    if (cell.b != null) {
+                        term += 'background-color: ' + colors[cell.b] + ';';
                     }
-                    if (cell.italic) {
+                    if (cell.i) {
                         term += 'font-style: italic;';
                     }
-                    if (cell.underline) {
+                    if (cell.u) {
                         term += 'text-decoration: underline;';
                     }
                     term += '"';
                 }
                 term += '>';
-                if (cell.contents == " " || cell.contents == "") {
+                if (cell.c == " " || cell.c == "") {
                     term += "&nbsp;";
                 }
                 else {
-                    term += cell.contents;
+                    term += cell.c;
                 }
                 term += '</td>';
             });
@@ -349,23 +349,23 @@ socket.onmessage = function (e) {
         data.updates.forEach(function (update) {
             var tr = termtable.children[update.row];
             var td = tr.children[update.col];
-            if (update.cell.hasOwnProperty('contents')) {
-                var contents = update.cell.contents;
+            if (update.cell.hasOwnProperty('c')) {
+                var contents = update.cell.c;
                 if (contents == " " || contents == "") {
                     contents = "&nbsp;";
                 }
                 td.innerHTML = contents;
             }
-            if (update.cell.hasOwnProperty('fgcolor')) {
-                var inverse = update.cell.inverse;
-                var fgcolor = update.cell.fgcolor;
-                var bgcolor = update.cell.bgcolor;
+            if (update.cell.hasOwnProperty('f')) {
+                var inverse = update.cell.n;
+                var fgcolor = update.cell.f;
+                var bgcolor = update.cell.b;
                 var style = inverse ? 'background-color' : 'color';
                 if (inverse && fgcolor == bgcolor) {
                     td.style.setProperty(style, '#d3d3d3');
                 }
                 else if (fgcolor != null) {
-                    if (update.cell.bold && fgcolor < 8) {
+                    if (update.cell.o && fgcolor < 8) {
                         fgcolor += 8;
                     }
                     td.style.setProperty(style, colors[fgcolor]);
@@ -374,10 +374,10 @@ socket.onmessage = function (e) {
                     td.style.removeProperty(style);
                 }
             }
-            if (update.cell.hasOwnProperty('bgcolor')) {
-                var inverse = update.cell.inverse;
-                var fgcolor = update.cell.fgcolor;
-                var bgcolor = update.cell.bgcolor;
+            if (update.cell.hasOwnProperty('b')) {
+                var inverse = update.cell.n;
+                var fgcolor = update.cell.f;
+                var bgcolor = update.cell.b;
                 var style = inverse ? 'color' : 'background-color';
                 if (inverse && bgcolor == fgcolor) {
                     td.style.setProperty(style, 'black');
@@ -389,16 +389,16 @@ socket.onmessage = function (e) {
                     td.style.removeProperty(style);
                 }
             }
-            if (update.cell.hasOwnProperty('italic')) {
-                if (update.cell.italic) {
+            if (update.cell.hasOwnProperty('i')) {
+                if (update.cell.i) {
                     td.style.setProperty('font-style', 'italic');
                 }
                 else {
                     td.style.removeProperty('font-style');
                 }
             }
-            if (update.cell.hasOwnProperty('underline')) {
-                if (update.cell.underline) {
+            if (update.cell.hasOwnProperty('u')) {
+                if (update.cell.u) {
                     td.style.setProperty('text-decoration', 'underline');
                 }
                 else {
diff --git a/termcast_server/termcast.py b/termcast_server/termcast.py
index 58fa2ab..909c352 100644
--- a/termcast_server/termcast.py
+++ b/termcast_server/termcast.py
@@ -70,13 +70,13 @@ class Handler(object):
             for j in range(0, self.cols):
                 cell = self.vt.cell(i, j)
                 term[i].append({
-                    "contents": cell.contents(),
-                    "fgcolor": cell.fgcolor().color(),
-                    "bgcolor": cell.bgcolor().color(),
-                    "bold": cell.bold(),
-                    "italic": cell.italic(),
-                    "underline": cell.underline(),
-                    "inverse": cell.inverse(),
+                    "c": cell.contents(),
+                    "f": cell.fgcolor().color(),
+                    "b": cell.bgcolor().color(),
+                    "o": cell.bold(),
+                    "i": cell.italic(),
+                    "u": cell.underline(),
+                    "n": cell.inverse(),
                 })
 
         return term
@@ -89,13 +89,13 @@ class Handler(object):
                 cell_changes = self._diff_cell(
                     screen[i][j],
                     {
-                        "contents": cell.contents(),
-                        "fgcolor": cell.fgcolor().color(),
-                        "bgcolor": cell.bgcolor().color(),
-                        "bold": cell.bold(),
-                        "italic": cell.italic(),
-                        "underline": cell.underline(),
-                        "inverse": cell.inverse(),
+                        "c": cell.contents(),
+                        "f": cell.fgcolor().color(),
+                        "b": cell.bgcolor().color(),
+                        "o": cell.bold(),
+                        "i": cell.italic(),
+                        "u": cell.underline(),
+                        "n": cell.inverse(),
                     }
                 )
 
@@ -114,21 +114,21 @@ class Handler(object):
             if cur_cell[key] != prev_cell[key]:
                 cell_changes[key] = cur_cell[key]
 
-        if "fgcolor" in cell_changes:
-            cell_changes["bgcolor"] = cur_cell["bgcolor"]
-            cell_changes["bold"] = cur_cell["bold"]
-            cell_changes["inverse"] = cur_cell["inverse"]
+        if "f" in cell_changes:
+            cell_changes["b"] = cur_cell["b"]
+            cell_changes["o"] = cur_cell["o"]
+            cell_changes["n"] = cur_cell["n"]
 
-        if "bgcolor" in cell_changes:
-            cell_changes["fgcolor"] = cur_cell["fgcolor"]
-            cell_changes["inverse"] = cur_cell["inverse"]
+        if "b" in cell_changes:
+            cell_changes["f"] = cur_cell["f"]
+            cell_changes["n"] = cur_cell["n"]
 
-        if "bold" in cell_changes:
-            cell_changes["fgcolor"] = cur_cell["fgcolor"]
+        if "o" in cell_changes:
+            cell_changes["f"] = cur_cell["f"]
 
-        if "inverse" in cell_changes:
-            cell_changes["fgcolor"] = cur_cell["fgcolor"]
-            cell_changes["bgcolor"] = cur_cell["bgcolor"]
+        if "n" in cell_changes:
+            cell_changes["f"] = cur_cell["f"]
+            cell_changes["b"] = cur_cell["b"]
 
         return cell_changes
 
-- 
cgit v1.2.3