From 6eebc781ed069660d819f258e2eae8f7e9d68df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 10 Sep 2017 20:32:04 +0200
Subject: [PATCH] enhance draw debuggin + do not blink if no cells are blinky

---
 jssrc/appcommon.js   |  9 ++++++
 jssrc/term_screen.js | 71 ++++++++++++++++++++++++++++++++------------
 pages/term.php       |  1 +
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/jssrc/appcommon.js b/jssrc/appcommon.js
index 3fbf120..473974d 100644
--- a/jssrc/appcommon.js
+++ b/jssrc/appcommon.js
@@ -119,3 +119,12 @@ $._loader = function (vis) {
 function showPage () {
   $('#content').addClass('load')
 }
+
+// Auto reveal pages other than the terminal (sets window.noAutoShow)
+$.ready(function () {
+  if (window.noAutoShow !== true) {
+    setTimeout(function () {
+      showPage()
+    }, 1)
+  }
+})
diff --git a/jssrc/term_screen.js b/jssrc/term_screen.js
index 7ade0c8..1416b5f 100644
--- a/jssrc/term_screen.js
+++ b/jssrc/term_screen.js
@@ -143,11 +143,13 @@ class TermScreen {
       set (target, key, value, receiver) {
         target[key] = value
         self.scheduleSizeUpdate()
-        self.scheduleDraw('proxy')
+        self.scheduleDraw(`proxy:${key}=${value}`)
         return true
       }
     })
 
+    this.blinkingCellCount = 0
+
     this.screen = []
     this.screenFG = []
     this.screenBG = []
@@ -522,6 +524,8 @@ class TermScreen {
     clearInterval(this.window.blinkInterval)
     let intervals = 0
     this.window.blinkInterval = setInterval(() => {
+      if (this.blinkingCellCount <= 0) return
+
       intervals++
       if (intervals >= 4 && this.window.blinkStyleOn) {
         this.window.blinkStyleOn = false
@@ -898,9 +902,11 @@ class TermScreen {
     let i = 0
 
     // window size
-    this.window.height = parse2B(str, i)
-    this.window.width = parse2B(str, i + 2)
-    this.updateSize()
+    const newHeight = parse2B(str, i)
+    const newWidth = parse2B(str, i + 2)
+    const resized = (this.window.height !== newHeight) || (this.window.width !== newWidth)
+    this.window.height = newHeight
+    this.window.width = newWidth
     i += 4
 
     // cursor position
@@ -975,20 +981,51 @@ class TermScreen {
     let lastChar = ' '
     let screenLength = this.window.width * this.window.height
 
-    this.screen = new Array(screenLength).fill(' ')
-    this.screenFG = new Array(screenLength).fill(' ')
-    this.screenBG = new Array(screenLength).fill(' ')
-    this.screenAttrs = new Array(screenLength).fill(' ')
+    if (resized) {
+      this.updateSize()
+      this.blinkingCellCount = 0
+      this.screen = new Array(screenLength).fill(' ')
+      this.screenFG = new Array(screenLength).fill(' ')
+      this.screenBG = new Array(screenLength).fill(' ')
+      this.screenAttrs = new Array(screenLength).fill(' ')
+    }
 
     let strArray = typeof Array.from !== 'undefined'
       ? Array.from(str)
       : str.split('')
 
+    const MASK_LINE_ATTR = 0xC8
+    const MASK_BLINK = 1 << 4
+
+    let setCellContent = () => {
+      // Remove blink attribute if it wouldn't have any effect
+      let myAttrs = attrs
+      if ((myAttrs & MASK_BLINK) !== 0 &&
+        ((lastChar === ' ' && ((myAttrs & MASK_LINE_ATTR) === 0)) || // no line styles
+          fg === bg // invisible text
+        )
+      ) {
+        myAttrs ^= MASK_BLINK
+      }
+      // update blinking cells counter if blink state changed
+      if ((this.screenAttrs[cell] & MASK_BLINK) !== (myAttrs & MASK_BLINK)) {
+        if (myAttrs & MASK_BLINK) this.blinkingCellCount++
+        else this.blinkingCellCount--
+      }
+
+      this.screen[cell] = lastChar
+      this.screenFG[cell] = fg
+      this.screenBG[cell] = bg
+      this.screenAttrs[cell] = myAttrs
+    }
+
+    let blinkAttr = 0
     while (i < strArray.length && cell < screenLength) {
       let character = strArray[i++]
       let charCode = character.codePointAt(0)
 
       let data
+      // noinspection FallThroughInSwitchStatementJS
       switch (charCode) {
         case SEQ_SET_COLOR_ATTR:
           data = parse3B(strArray[i] + strArray[i + 1] + strArray[i + 2])
@@ -996,6 +1033,7 @@ class TermScreen {
           fg = data & 0xF
           bg = data >> 4 & 0xF
           attrs = data >> 8 & 0xFF
+          blinkAttr = attrs & MASK_BLINK
           break
 
         case SEQ_SET_COLOR:
@@ -1009,33 +1047,28 @@ class TermScreen {
           data = parse2B(strArray[i] + strArray[i + 1])
           i += 2
           attrs = data & 0xFF
+          blinkAttr = attrs & MASK_BLINK
           break
 
         case SEQ_REPEAT:
           let count = parse2B(strArray[i] + strArray[i + 1])
           i += 2
           for (let j = 0; j < count; j++) {
-            this.screen[cell] = lastChar
-            this.screenFG[cell] = fg
-            this.screenBG[cell] = bg
-            this.screenAttrs[cell] = attrs
-
+            setCellContent(cell)
             if (++cell > screenLength) break
           }
           break
 
         default:
-          // safety replacement
           if (charCode < 32) character = '\ufffd'
-          // unique cell character
-          this.screen[cell] = lastChar = character
-          this.screenFG[cell] = fg
-          this.screenBG[cell] = bg
-          this.screenAttrs[cell] = attrs
+          lastChar = character
+          setCellContent(cell)
           cell++
       }
     }
 
+    if (this.window.debug) console.log(`Blinky cells = ${this.blinkingCellCount}`)
+
     this.scheduleDraw('load', 16)
     this.emit('load')
   }
diff --git a/pages/term.php b/pages/term.php
index 77d7edd..1277528 100644
--- a/pages/term.php
+++ b/pages/term.php
@@ -71,6 +71,7 @@
 
 <script>
 	try {
+		window.noAutoShow = true;
 		termInit('%j:labels_seq%', +'%theme%');
 	} catch(e) {
 		console.error(e);