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

Actually fix selection not working

Browse Source 
by just adding the selection colors to the palette
This commit is contained in:
cpsdqs
2017-09-09 16:20:47 +02:00
parent ff5aa4c12c
commit 0caadb6f41
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html_orig/jssrc/term_screen.js
+16 -7
View File
@@ -332,6 +332,12 @@ class TermScreen {
this.scheduleDraw(); this.scheduleDraw();
} }
getColor (i) {
if (i === -1) return SELECTION_FG
if (i === -2) return SELECTION_BG
return this.colors[i]
}
// schedule a size update in the next tick // schedule a size update in the next tick
scheduleSizeUpdate () { scheduleSizeUpdate () {
clearTimeout(this._scheduledSizeUpdate); clearTimeout(this._scheduledSizeUpdate);
@@ -537,8 +543,7 @@ class TermScreen {
drawCell ({ x, y, charSize, cellWidth, cellHeight, text, fg, bg, attrs }) { drawCell ({ x, y, charSize, cellWidth, cellHeight, text, fg, bg, attrs }) {
const ctx = this.ctx; const ctx = this.ctx;
const inSelection = this.isInSelection(x, y); ctx.fillStyle = this.getColor(bg);
ctx.fillStyle = inSelection ? SELECTION_BG : this.colors[bg];
ctx.fillRect(x * cellWidth, y * cellHeight, ctx.fillRect(x * cellWidth, y * cellHeight,
Math.ceil(cellWidth), Math.ceil(cellHeight)); Math.ceil(cellWidth), Math.ceil(cellHeight));
@@ -554,11 +559,11 @@ class TermScreen {
if (attrs & 1 << 6) strike = true; if (attrs & 1 << 6) strike = true;
if (!blink || this.window.blinkStyleOn) { if (!blink || this.window.blinkStyleOn) {
ctx.fillStyle = inSelection ? SELECTION_FG : this.colors[fg]; ctx.fillStyle = this.getColor(fg);
ctx.fillText(text, (x + 0.5) * cellWidth, (y + 0.5) * cellHeight); ctx.fillText(text, (x + 0.5) * cellWidth, (y + 0.5) * cellHeight);
if (underline || strike) { if (underline || strike) {
ctx.strokeStyle = inSelection ? SELECTION_FG : this.colors[fg]; ctx.strokeStyle = this.getColor(fg);
ctx.lineWidth = 1; ctx.lineWidth = 1;
ctx.lineCap = 'round'; ctx.lineCap = 'round';
ctx.beginPath(); ctx.beginPath();
@@ -620,7 +625,7 @@ class TermScreen {
!this.cursor.hanging; !this.cursor.hanging;
let invertForCursor = isCursor && this.cursor.blinkOn && let invertForCursor = isCursor && this.cursor.blinkOn &&
this.cursor.style === 'block'; this.cursor.style === 'block';
let inSelection = this.isInSelection(x, y); let inSelection = this.isInSelection(x, y)
let text = this.screen[cell]; let text = this.screen[cell];
let fg = invertForCursor ? this.screenBG[cell] : this.screenFG[cell]; let fg = invertForCursor ? this.screenBG[cell] : this.screenFG[cell];
@@ -630,11 +635,15 @@ class TermScreen {
// HACK: ensure cursor is visible // HACK: ensure cursor is visible
if (invertForCursor && fg === bg) bg = fg === 0 ? 7 : 0; if (invertForCursor && fg === bg) bg = fg === 0 ? 7 : 0;
if (inSelection) {
fg = -1
bg = -2
}
let cellDidChange = text !== this.drawnScreen[cell] || let cellDidChange = text !== this.drawnScreen[cell] ||
fg !== this.drawnScreenFG[cell] || fg !== this.drawnScreenFG[cell] ||
bg !== this.drawnScreenBG[cell] || bg !== this.drawnScreenBG[cell] ||
attrs !== this.drawnScreenAttrs[cell] || attrs !== this.drawnScreenAttrs[cell];
inSelection;
let font = attrs & FONT_MASK; let font = attrs & FONT_MASK;
if (!fontGroups.has(font)) fontGroups.set(font, []); if (!fontGroups.has(font)) fontGroups.set(font, []);