espterm
/
espterm-front-end
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove most references to screen in parser

Browse Source
pull/1/head
cpsdqs 7 years ago
parent 180ab41299
commit 90a1676084
Signed by untrusted user: cpsdqs
GPG Key ID: 3F59586BB7448DD1
2 changed files with 151 additions and 142 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      js/term/screen.js
  2. 262
      js/term/screen_parser.js

31
js/term/screen.js
Unescape View File

@ -688,6 +688,10 @@ module.exports = class TermScreen extends EventEmitter {
this.emit('button-labels', update.labels) this.emit('button-labels', update.labels)
break break
case 'backdrop':
this.backgroundImage = update.image
break
case 'bell': case 'bell':
this.beep() this.beep()
break break
@ -697,7 +701,32 @@ module.exports = class TermScreen extends EventEmitter {
break break
case 'content': case 'content':
update.tempDoNotCommitUpstream() const { frameX, frameY, frameWidth, frameHeight, cells } = update
if (this._debug && this.window.debug) {
this._debug.pushFrame([frameX, frameY, frameWidth, frameHeight])
}
for (let cell = 0; cell < cells.length; cell++) {
let data = cells[cell]
let cellXInFrame = cell % frameWidth
let cellYInFrame = Math.floor(cell / frameWidth)
let index = (frameY + cellYInFrame) * this.window.width + frameX + cellXInFrame
this.screen[index] = data[0]
this.screenFG[index] = data[1]
this.screenBG[index] = data[2]
this.screenAttrs[index] = data[3]
}
this.renderer.scheduleDraw('load', 16)
this.conn.emit('load')
this.emit('load')
break
case 'full-load-complete':
this.emit('TEMP:hide-load-failed-msg')
break break
default: default:

262
js/term/screen_parser.js
Unescape View File

@ -63,20 +63,10 @@ module.exports = class ScreenParser {
} }
}) })
// true if TermScreen#load was called at least once // true if full content was loaded
this.contentLoaded = false this.contentLoaded = false
} }
/**
* Hide the warning message about failed data load
*/
hideLoadFailedMsg () {
if (!this.contentLoaded) {
this.screen.emit('TEMP:hide-load-failed-msg')
this.contentLoaded = true
}
}
parseUpdate (str) { parseUpdate (str) {
// console.log(`update ${str}`) // console.log(`update ${str}`)
// current index // current index
@ -142,11 +132,6 @@ module.exports = class ScreenParser {
else if (cursorStyle === 1) cursorStyle = 'line' else if (cursorStyle === 1) cursorStyle = 'line'
else cursorStyle = 'bar' else cursorStyle = 'bar'
if (this.screen.cursor.blinking !== cursorBlinking) {
this.screen.cursor.blinking = cursorBlinking
this.screen.renderer.resetCursorBlink()
}
const showButtons = !!(attributes & OPT_SHOW_BUTTONS) const showButtons = !!(attributes & OPT_SHOW_BUTTONS)
const showConfigLinks = !!(attributes & OPT_SHOW_CONFIG_LINKS) const showConfigLinks = !!(attributes & OPT_SHOW_CONFIG_LINKS)
@ -232,145 +217,140 @@ module.exports = class ScreenParser {
}) })
} else if (topic === TOPIC_CONTENT) { } else if (topic === TOPIC_CONTENT) {
// set screen content // set screen content
let _ci = ci const frameY = du(strArray[ci++])
const frameX = du(strArray[ci++])
let tempDoNotCommitUpstream = () => { const frameHeight = du(strArray[ci++])
let ci = _ci const frameWidth = du(strArray[ci++])
const frameY = du(strArray[ci++])
const frameX = du(strArray[ci++]) // content
const frameHeight = du(strArray[ci++]) let fg = 7
const frameWidth = du(strArray[ci++]) let bg = 0
let attrs = 0
if (this.screen._debug && this.screen.window.debug) { let cell = 0 // cell index
this.screen._debug.pushFrame([frameX, frameY, frameWidth, frameHeight]) let lastChar = ' '
let frameLength = frameWidth * frameHeight
const MASK_LINE_ATTR = ATTR_UNDERLINE | ATTR_OVERLINE | ATTR_STRIKE
const MASK_BLINK = ATTR_BLINK
const cells = []
let pushCell = () => {
let hasFG = attrs & ATTR_FG
let hasBG = attrs & ATTR_BG
let cellFG = fg
let cellBG = bg
let cellAttrs = attrs
// use 0,0 if no fg/bg. this is to match back-end implementation
// and allow leaving out fg/bg setting for cells with none
if (!hasFG) cellFG = 0
if (!hasBG) cellBG = 0
// Remove blink attribute if it wouldn't have any effect
if ((cellAttrs & MASK_BLINK) &&
((lastChar === ' ' && ((cellAttrs & MASK_LINE_ATTR) === 0)) || // no line styles
(fg === bg && hasFG && hasBG) // invisible text
)
) {
cellAttrs ^= MASK_BLINK
} }
// content // TODO: reimplement
let fg = 7 /*
let bg = 0 // update blinking cells counter if blink state changed
let attrs = 0 if ((this.screen.screenAttrs[cell] & MASK_BLINK) !== (cellAttrs & MASK_BLINK)) {
let cell = 0 // cell index if (cellAttrs & MASK_BLINK) this.screen.blinkingCellCount++
let lastChar = ' ' else this.screen.blinkingCellCount--
let frameLength = frameWidth * frameHeight
const MASK_LINE_ATTR = ATTR_UNDERLINE | ATTR_OVERLINE | ATTR_STRIKE
const MASK_BLINK = ATTR_BLINK
let pushCell = () => {
// Remove blink attribute if it wouldn't have any effect
let myAttrs = attrs
let hasFG = attrs & ATTR_FG
let hasBG = attrs & ATTR_BG
let cellFG = fg
let cellBG = bg
// use 0,0 if no fg/bg. this is to match back-end implementation
// and allow leaving out fg/bg setting for cells with none
if (!hasFG) cellFG = 0
if (!hasBG) cellBG = 0
if ((myAttrs & MASK_BLINK) !== 0 &&
((lastChar === ' ' && ((myAttrs & MASK_LINE_ATTR) === 0)) || // no line styles
(fg === bg && hasFG && hasBG) // invisible text
)
) {
myAttrs ^= MASK_BLINK
}
// update blinking cells counter if blink state changed
if ((this.screen.screenAttrs[cell] & MASK_BLINK) !== (myAttrs & MASK_BLINK)) {
if (myAttrs & MASK_BLINK) this.screen.blinkingCellCount++
else this.screen.blinkingCellCount--
}
let cellXInFrame = cell % frameWidth
let cellYInFrame = Math.floor(cell / frameWidth)
let index = (frameY + cellYInFrame) * this.screen.window.width + frameX + cellXInFrame
// 8 dark system colors turn bright when bold
if ((myAttrs & ATTR_BOLD) && !(myAttrs & ATTR_FAINT) && hasFG && cellFG < 8) {
cellFG += 8
}
this.screen.screen[index] = lastChar
this.screen.screenFG[index] = cellFG
this.screen.screenBG[index] = cellBG
this.screen.screenAttrs[index] = myAttrs
} }
*/
while (ci < strArray.length && cell < frameLength) { // 8 dark system colors turn bright when bold
let character = strArray[ci++] if ((cellAttrs & ATTR_BOLD) && !(cellAttrs & ATTR_FAINT) && hasFG && cellFG < 8) {
let charCode = character.codePointAt(0) cellFG += 8
let data, count
switch (charCode) {
case SEQ_REPEAT:
count = du(strArray[ci++])
for (let j = 0; j < count; j++) {
pushCell()
if (++cell > frameLength) break
}
break
case SEQ_SKIP:
cell += du(strArray[ci++])
break
case SEQ_SET_COLORS:
data = du(strArray[ci++])
fg = data & 0xFF
bg = (data >> 8) & 0xFF
break
case SEQ_SET_ATTRS:
data = du(strArray[ci++])
attrs = data & 0xFFFF
break
case SEQ_SET_ATTR_0:
attrs = 0
break
case SEQ_SET_FG:
data = du(strArray[ci++])
if (data & 0x10000) {
data &= 0xFFF
data |= (du(strArray[ci++]) & 0xFFF) << 12
data += 256
}
fg = data
break
case SEQ_SET_BG:
data = du(strArray[ci++])
if (data & 0x10000) {
data &= 0xFFF
data |= (du(strArray[ci++]) & 0xFFF) << 12
data += 256
}
bg = data
break
default:
if (charCode < 32) character = '\ufffd'
lastChar = character
pushCell()
cell++
}
} }
if (this.screen.window.debug) console.log(`Blinky cells: ${this.screen.blinkingCellCount}`) cells.push([lastChar, cellFG, cellBG, cellAttrs])
}
while (ci < strArray.length && cell < frameLength) {
let character = strArray[ci++]
let charCode = character.codePointAt(0)
this.screen.renderer.scheduleDraw('load', 16) let data, count
this.screen.conn.emit('load') switch (charCode) {
case SEQ_REPEAT:
count = du(strArray[ci++])
for (let j = 0; j < count; j++) {
pushCell()
if (++cell > frameLength) break
}
break
case SEQ_SKIP:
cell += du(strArray[ci++])
break
case SEQ_SET_COLORS:
data = du(strArray[ci++])
fg = data & 0xFF
bg = (data >> 8) & 0xFF
break
case SEQ_SET_ATTRS:
data = du(strArray[ci++])
attrs = data & 0xFFFF
break
case SEQ_SET_ATTR_0:
attrs = 0
break
case SEQ_SET_FG:
data = du(strArray[ci++])
if (data & 0x10000) {
data &= 0xFFF
data |= (du(strArray[ci++]) & 0xFFF) << 12
data += 256
}
fg = data
break
case SEQ_SET_BG:
data = du(strArray[ci++])
if (data & 0x10000) {
data &= 0xFFF
data |= (du(strArray[ci++]) & 0xFFF) << 12
data += 256
}
bg = data
break
default:
if (charCode < 32) character = '\ufffd'
lastChar = character
pushCell()
cell++
}
} }
// TODO (see above)
// if (this.screen.window.debug) console.log(`Blinky cells: ${this.screen.blinkingCellCount}`)
updates.push({ updates.push({
topic: 'content', topic: 'content',
tempDoNotCommitUpstream frameX,
frameY,
frameWidth,
frameHeight,
cells
}) })
} }
if ((topics & 0x3B) !== 0) this.hideLoadFailedMsg() if (topics & 0x3B && !this.contentLoaded) {
updates.push({ topic: 'full-load-complete' })
this.contentLoaded = true
}
} }
return updates return updates

Write Preview
Loading…
Cancel
Save