Upgrade to xterm.js version 4.4.0

Author: javier-godoy

pom.xml

@@ -9,7 +9,7 @@
     <description>Integration of xterm.js for Vaadin Flow</description>
 
     <properties>
-        <vaadin.version>14.1.5</vaadin.version>
+        <vaadin.version>14.2.2</vaadin.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

src/main/java/com/flowingcode/vaadin/addons/xterm/XTerm.java

@@ -60,7 +60,7 @@
 import lombok.experimental.Delegate;
 
 /** Server-side component for the XTerm component. */
-@NpmPackage(value = "xterm", version = "4.3.0")
+@NpmPackage(value = "xterm", version = "4.4.0")
 @JsModule("./fc-xterm/xterm.js")
 @Tag("fc-xterm")
 @CssImport("xterm/css/xterm.css")

src/main/resources/META-INF/frontend/fc-xterm/clipboard-feature.js

@@ -81,8 +81,8 @@ export class ClipboardFeature extends PolymerElement {
 		this._disposables = [
 
 		//ctrl-C ctrl-V
-		term.addCustomKeyEventHandler(ev=> ev.key=='c' && ev.ctrlKey, null),
-		term.addCustomKeyEventHandler(ev=> ev.key=='v' && ev.ctrlKey, null),
+		term.registerCustomKeyEventHandler(ev=> ev.key=='c' && ev.ctrlKey, null),
+		term.registerCustomKeyEventHandler(ev=> ev.key=='v' && ev.ctrlKey, null),
 
 		//copy selection
 		terminal.onSelectionChange(() => {

src/main/resources/META-INF/frontend/fc-xterm/console-feature.js

@@ -136,25 +136,25 @@ export class LineEditorFeature extends PolymerElement {
 
 		this._disposables = [
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'H'}, cursorHome),	
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='Home', ()=> terminal.write('\x1b[<H')),
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'H'}, cursorHome),	
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='Home', ()=> terminal.write('\x1b[<H')),
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'E'}, cursorEnd),
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='End', ()=> terminal.write('\x1b[<E')),
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'E'}, cursorEnd),
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='End', ()=> terminal.write('\x1b[<E')),
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'L'}, cursorBackwardWrapped),
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='ArrowLeft', ()=> terminal.write('\x1b[<L')),
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'L'}, cursorBackwardWrapped),
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='ArrowLeft', ()=> terminal.write('\x1b[<L')),
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'R'}, cursorForwardWrapped),
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='ArrowRight', ()=> terminal.write('\x1b[<R')),
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'R'}, cursorForwardWrapped),
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='ArrowRight', ()=> terminal.write('\x1b[<R')),
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'B'}, backspace),
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='Backspace', ()=> terminal.write('\x1b[<B')),
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'B'}, backspace),
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='Backspace', ()=> terminal.write('\x1b[<B')),
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'D'}, deleteChar),
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='Delete', ()=> terminal.write('\x1b[<D')),
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'D'}, deleteChar),
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='Delete', ()=> terminal.write('\x1b[<D')),
 
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='Insert', ev=>{
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='Insert', ev=>{
 			let ins = terminal._core._inputHandler._terminal.insertMode;
 			console.log("INS");
 			if (ins) {
@@ -164,27 +164,27 @@ export class LineEditorFeature extends PolymerElement {
 			}
 		}),
 
-		terminal.addCustomKeyEventHandler(ev=> ev.key=='Enter', ev=>{
+		terminal.registerCustomKeyEventHandler(ev=> ev.key=='Enter', ev=>{
 			terminal.write('\x1b[<N\n');
 		}),
 
-		terminal.addCustomKeyEventHandler(ev=> [
+		terminal.registerCustomKeyEventHandler(ev=> [
 			'ArrowUp',
 			'ArrowDown',
 			'F1', 'F2', 'F3', 'F4', 'F7', 'F8', 'F9', 'F10', 'F11',
 		].includes(ev.key), ev=>ev.preventDefault() && false),
 
-		terminal.addCustomKeyEventHandler(ev=> [
+		terminal.registerCustomKeyEventHandler(ev=> [
 			'Escape'
 		].includes(ev.key), () => this.escapeEnabled),
 
-		terminal.addCustomKeyEventHandler(ev=> [
+		terminal.registerCustomKeyEventHandler(ev=> [
 			'F5',
 			'F6',
 			'F12'
 		].includes(ev.key), null),
 
-		terminal.parser.addCsiHandler({prefix: '<', final: 'N'}, linefeed)
+		terminal.parser.registerCsiHandler({prefix: '<', final: 'N'}, linefeed)
 
 		];
 	}

src/main/resources/META-INF/frontend/fc-xterm/insert-fix-feature.js

@@ -25,7 +25,7 @@ export class InsertFixFeature {
 
 		let printHandler = term._core._inputHandler._parser._printHandler;
 		term._core._inputHandler._parser.setPrintHandler((function(data, start, end) {
-			if (this._terminal.insertMode && this._terminal.wraparoundMode && !this._optionsService.options.windowsMode) {
+			if (this._terminal.insertMode && this._terminal._coreService.decPrivateModes.wraparound && !this._optionsService.options.windowsMode) {
 				const buffer = this._bufferService.buffer;
 				const bufferRow = buffer.lines.get(buffer.y + buffer.ybase);
 
@@ -56,7 +56,7 @@ export class InsertFixFeature {
 					for (let y=range.last;y>range.first;y--) {
 						let dst = src;
 						src= buffer.lines.get(y-1);
-						dst.insertCells(0, printedLength, this._terminal.buffer.getNullCell(this._terminal.eraseAttrData()));
+						dst.insertCells(0, printedLength, this._terminal.buffer.getNullCell());
 						dst.copyCellsFrom(src, buffer._cols-printedLength, 0, printedLength);
 						this._dirtyRowService.markDirty(y);
 					}

src/main/resources/META-INF/frontend/fc-xterm/xterm.js

@@ -59,7 +59,7 @@ export class XTerm extends PolymerElement {
 		this.__customKeyEventHandlers = [];
 		this.__customKeyEventHandlers.next = 0;
 
-		term.addCustomKeyEventHandler = (predicate, handler) => {
+		term.registerCustomKeyEventHandler = (predicate, handler) => {
 			let id = ++this.__customKeyEventHandlers.next;
 			if (!handler) handler= ()=>false;
 			this.__customKeyEventHandlers[id] = {predicate, handler};