Skip to content

IME: handle missing compositionend events for Sogou IME #3680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tyriar merged 2 commits into from
Mar 17, 2022
Merged

IME: handle missing compositionend events for Sogou IME #3680

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f025c0c
ime: handle missing compositionend events for Sogou IME
Eugeny Mar 12, 2022
d60431f
Merge branch 'master' into electron-13-sogou-fix
Tyriar Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/browser/Terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ export class Terminal extends CoreTerminal implements ITerminal {
*/
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
* the input event should not trigger a data event but should still print to the textarea so
Expand Down Expand Up @@ -1083,6 +1089,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
*/
protected _keyDown(event: KeyboardEvent): boolean | undefined {
this._keyDownHandled = false;
this._keyDownSeen = true;

if (this._customKeyEventHandler && this._customKeyEventHandler(event) === false) {
return false;
Expand Down Expand Up @@ -1168,6 +1175,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
}

protected _keyUp(ev: KeyboardEvent): void {
this._keyDownSeen = false;

if (this._customKeyEventHandler && this._customKeyEventHandler(ev) === false) {
return;
}
Expand Down Expand Up @@ -1241,7 +1250,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
protected _inputEvent(ev: InputEvent): boolean {
// 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
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) {
return false;
}
Expand Down