eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3983 from silamon/fixdemo

Browse Source 
Fix demo
This commit is contained in:
Daniel Imms
2022-08-03 04:26:02 -07:00
committed by GitHub
parent 9261780a1d 04eb6a4160
commit 830f8f3231
1 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/client.ts
+36 -24
View File
@@ -82,7 +82,7 @@ interface IDemoAddon<T extends AddonType> {
never; never;
} }
const addons: { [T in AddonType]: IDemoAddon<T>} = { const addons: { [T in AddonType]: IDemoAddon<T> } = {
attach: { name: 'attach', ctor: AttachAddon, canChange: false }, attach: { name: 'attach', ctor: AttachAddon, canChange: false },
canvas: { name: 'canvas', ctor: CanvasAddon, canChange: true }, canvas: { name: 'canvas', ctor: CanvasAddon, canChange: true },
fit: { name: 'fit', ctor: FitAddon, canChange: false }, fit: { name: 'fit', ctor: FitAddon, canChange: false },
@@ -230,18 +230,23 @@ function createTerminal(): void {
const rows = size.rows; const rows = size.rows;
const url = '/terminals/' + pid + '/size?cols=' + cols + '&rows=' + rows; const url = '/terminals/' + pid + '/size?cols=' + cols + '&rows=' + rows;
fetch(url, {method: 'POST'}); fetch(url, { method: 'POST' });
}); });
protocol = (location.protocol === 'https:') ? 'wss://' : 'ws://'; protocol = (location.protocol === 'https:') ? 'wss://' : 'ws://';
socketURL = protocol + location.hostname + ((location.port) ? (':' + location.port) : '') + '/terminals/'; socketURL = protocol + location.hostname + ((location.port) ? (':' + location.port) : '') + '/terminals/';
term.open(terminalContainer); term.open(terminalContainer);
addons.fit.instance!.fit(); addons.fit.instance!.fit();
typedTerm.loadAddon(addons.webgl.instance); try {
setTimeout(() => { typedTerm.loadAddon(addons.webgl.instance);
addTextureAtlas(addons.webgl.instance.textureAtlas); setTimeout(() => {
addons.webgl.instance.onChangeTextureAtlas(e => addTextureAtlas(e)); addTextureAtlas(addons.webgl.instance.textureAtlas);
}, 0); addons.webgl.instance.onChangeTextureAtlas(e => addTextureAtlas(e));
}, 0);
}
catch {
addons.webgl.instance = undefined;
}
term.focus(); term.focus();
addDomListener(paddingElement, 'change', setPadding); addDomListener(paddingElement, 'change', setPadding);
@@ -270,7 +275,7 @@ function createTerminal(): void {
// Set terminal size again to set the specific dimensions on the demo // Set terminal size again to set the specific dimensions on the demo
updateTerminalSize(); updateTerminalSize();
fetch('/terminals?cols=' + term.cols + '&rows=' + term.rows, {method: 'POST'}).then((res) => { fetch('/terminals?cols=' + term.cols + '&rows=' + term.rows, { method: 'POST' }).then((res) => {
res.text().then((processId) => { res.text().then((processId) => {
pid = processId; pid = processId;
socketURL += processId; socketURL += processId;
@@ -315,7 +320,7 @@ function runFakeTerminal(): void {
if (ev.keyCode === 13) { if (ev.keyCode === 13) {
term.prompt(); term.prompt();
} else if (ev.keyCode === 8) { } else if (ev.keyCode === 8) {
// Do not delete the prompt // Do not delete the prompt
if (term._core.buffer.x > 2) { if (term._core.buffer.x > 2) {
term.write('\b \b'); term.write('\b \b');
} }
@@ -501,13 +506,20 @@ function initAddons(term: TerminalType): void {
addDomListener(checkbox, 'change', () => { addDomListener(checkbox, 'change', () => {
if (checkbox.checked) { if (checkbox.checked) {
addon.instance = new addon.ctor(); addon.instance = new addon.ctor();
term.loadAddon(addon.instance); try {
if (name === 'webgl') { term.loadAddon(addon.instance);
(addon.instance as WebglAddon).onChangeTextureAtlas(e => addTextureAtlas(e)); if (name === 'webgl') {
} else if (name === 'unicode11') { (addon.instance as WebglAddon).onChangeTextureAtlas(e => addTextureAtlas(e));
term.unicode.activeVersion = '11'; } else if (name === 'unicode11') {
} else if (name === 'search') { term.unicode.activeVersion = '11';
addon.instance.onDidChangeResults(e => updateFindResults(e)); } else if (name === 'search') {
addon.instance.onDidChangeResults(e => updateFindResults(e));
}
}
catch {
addon.instance = undefined;
checkbox.checked = false;
checkbox.disabled = true;
} }
} else { } else {
if (name === 'webgl') { if (name === 'webgl') {
@@ -806,13 +818,13 @@ function addDecoration() {
function addOverviewRuler() { function addOverviewRuler() {
term.options['overviewRulerWidth'] = 15; term.options['overviewRulerWidth'] = 15;
term.registerDecoration({marker: term.registerMarker(1), overviewRulerOptions: { color: '#ef2929' }}); term.registerDecoration({ marker: term.registerMarker(1), overviewRulerOptions: { color: '#ef2929' } });
term.registerDecoration({marker: term.registerMarker(3), overviewRulerOptions: { color: '#8ae234' }}); term.registerDecoration({ marker: term.registerMarker(3), overviewRulerOptions: { color: '#8ae234' } });
term.registerDecoration({marker: term.registerMarker(5), overviewRulerOptions: { color: '#729fcf' }}); term.registerDecoration({ marker: term.registerMarker(5), overviewRulerOptions: { color: '#729fcf' } });
term.registerDecoration({marker: term.registerMarker(7), overviewRulerOptions: { color: '#ef2929', position: 'left' }}); term.registerDecoration({ marker: term.registerMarker(7), overviewRulerOptions: { color: '#ef2929', position: 'left' } });
term.registerDecoration({marker: term.registerMarker(7), overviewRulerOptions: { color: '#8ae234', position: 'center' }}); term.registerDecoration({ marker: term.registerMarker(7), overviewRulerOptions: { color: '#8ae234', position: 'center' } });
term.registerDecoration({marker: term.registerMarker(7), overviewRulerOptions: { color: '#729fcf', position: 'right' }}); term.registerDecoration({ marker: term.registerMarker(7), overviewRulerOptions: { color: '#729fcf', position: 'right' } });
term.registerDecoration({marker: term.registerMarker(10), overviewRulerOptions: { color: '#8ae234', position: 'center' }}); term.registerDecoration({ marker: term.registerMarker(10), overviewRulerOptions: { color: '#8ae234', position: 'center' } });
term.registerDecoration({marker: term.registerMarker(10), overviewRulerOptions: { color: '#ffffff80', position: 'full' }}); term.registerDecoration({ marker: term.registerMarker(10), overviewRulerOptions: { color: '#ffffff80', position: 'full' } });
} }