Merge pull request #3680 from Eugeny/electron-13-sogou-fix
IME: handle missing compositionend events for Sogou IME
This commit is contained in:
+11
-1
@@ -98,6 +98,12 @@ export class Terminal extends CoreTerminal implements ITerminal {
|
|||||||
*/
|
*/
|
||||||
private _keyDownHandled: boolean = false;
|
private _keyDownHandled: boolean = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Records whether a keydown event has occured since the last keyup event, i.e. whether a key
|
||||||
|
* is currently "pressed".
|
||||||
|
*/
|
||||||
|
private _keyDownSeen: boolean = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Records whether the keypress event has already been handled and triggered a data event, if so
|
* Records whether the keypress event has already been handled and triggered a data event, if so
|
||||||
* the input event should not trigger a data event but should still print to the textarea so
|
* the input event should not trigger a data event but should still print to the textarea so
|
||||||
@@ -1083,6 +1089,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
|
|||||||
*/
|
*/
|
||||||
protected _keyDown(event: KeyboardEvent): boolean | undefined {
|
protected _keyDown(event: KeyboardEvent): boolean | undefined {
|
||||||
this._keyDownHandled = false;
|
this._keyDownHandled = false;
|
||||||
|
this._keyDownSeen = true;
|
||||||
|
|
||||||
if (this._customKeyEventHandler && this._customKeyEventHandler(event) === false) {
|
if (this._customKeyEventHandler && this._customKeyEventHandler(event) === false) {
|
||||||
return false;
|
return false;
|
||||||
@@ -1168,6 +1175,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected _keyUp(ev: KeyboardEvent): void {
|
protected _keyUp(ev: KeyboardEvent): void {
|
||||||
|
this._keyDownSeen = false;
|
||||||
|
|
||||||
if (this._customKeyEventHandler && this._customKeyEventHandler(ev) === false) {
|
if (this._customKeyEventHandler && this._customKeyEventHandler(ev) === false) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1241,7 +1250,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
|
|||||||
protected _inputEvent(ev: InputEvent): boolean {
|
protected _inputEvent(ev: InputEvent): boolean {
|
||||||
// Only support emoji IMEs when screen reader mode is disabled as the event must bubble up to
|
// Only support emoji IMEs when screen reader mode is disabled as the event must bubble up to
|
||||||
// support reading out character input which can doubling up input characters
|
// support reading out character input which can doubling up input characters
|
||||||
if (ev.data && ev.inputType === 'insertText' && !ev.composed && !this.optionsService.rawOptions.screenReaderMode) {
|
// Based on these event traces: https://github.com/xtermjs/xterm.js/issues/3679
|
||||||
|
if (ev.data && ev.inputType === 'insertText' && (!ev.composed || !this._keyDownSeen) && !this.optionsService.rawOptions.screenReaderMode) {
|
||||||
if (this._keyPressHandled) {
|
if (this._keyPressHandled) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user