+14
-8
@@ -179,6 +179,13 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
// Store if user went browsing history in scrollback
|
// Store if user went browsing history in scrollback
|
||||||
private _userScrolling: boolean;
|
private _userScrolling: boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Records whether the keydown event has already been handled and triggered a data event, if so
|
||||||
|
* the keypress event should not trigger a data event but should still print to the textarea so
|
||||||
|
* screen readers will announce it.
|
||||||
|
*/
|
||||||
|
private _keyDownHandled: boolean = false;
|
||||||
|
|
||||||
private _inputHandler: InputHandler;
|
private _inputHandler: InputHandler;
|
||||||
public linkifier: ILinkifier;
|
public linkifier: ILinkifier;
|
||||||
public viewport: IViewport;
|
public viewport: IViewport;
|
||||||
@@ -1515,6 +1522,8 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
* @param ev The keydown event to be handled.
|
* @param ev The keydown event to be handled.
|
||||||
*/
|
*/
|
||||||
protected _keyDown(event: KeyboardEvent): boolean {
|
protected _keyDown(event: KeyboardEvent): boolean {
|
||||||
|
this._keyDownHandled = false;
|
||||||
|
|
||||||
if (this._customKeyEventHandler && this._customKeyEventHandler(event) === false) {
|
if (this._customKeyEventHandler && this._customKeyEventHandler(event) === false) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -1530,12 +1539,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
|
|
||||||
this.updateCursorStyle(event);
|
this.updateCursorStyle(event);
|
||||||
|
|
||||||
// if (result.key === C0.DC3) { // XOFF
|
|
||||||
// this._writeStopped = true;
|
|
||||||
// } else if (result.key === C0.DC1) { // XON
|
|
||||||
// this._writeStopped = false;
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (result.type === KeyboardResultType.PAGE_DOWN || result.type === KeyboardResultType.PAGE_UP) {
|
if (result.type === KeyboardResultType.PAGE_DOWN || result.type === KeyboardResultType.PAGE_UP) {
|
||||||
const scrollCount = this.rows - 1;
|
const scrollCount = this.rows - 1;
|
||||||
this.scrollLines(result.type === KeyboardResultType.PAGE_UP ? -scrollCount : scrollCount);
|
this.scrollLines(result.type === KeyboardResultType.PAGE_UP ? -scrollCount : scrollCount);
|
||||||
@@ -1559,11 +1562,10 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this._keyDownHandled = true;
|
||||||
this._onKey.fire({ key: result.key, domEvent: event });
|
this._onKey.fire({ key: result.key, domEvent: event });
|
||||||
this.showCursor();
|
this.showCursor();
|
||||||
this._coreService.triggerDataEvent(result.key, true);
|
this._coreService.triggerDataEvent(result.key, true);
|
||||||
|
|
||||||
return this.cancel(event, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private _isThirdLevelShift(browser: IBrowser, ev: IKeyboardEvent): boolean {
|
private _isThirdLevelShift(browser: IBrowser, ev: IKeyboardEvent): boolean {
|
||||||
@@ -1621,6 +1623,10 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
protected _keyPress(ev: KeyboardEvent): boolean {
|
protected _keyPress(ev: KeyboardEvent): boolean {
|
||||||
let key;
|
let key;
|
||||||
|
|
||||||
|
if (this._keyDownHandled) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (this._customKeyEventHandler && this._customKeyEventHandler(ev) === false) {
|
if (this._customKeyEventHandler && this._customKeyEventHandler(ev) === false) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user