erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-27 18:57:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

refactor(web): use constants instead of hard coded values

Browse source 
And some other refactorings.

Test-bot: skip
This commit is contained in:
Eberhard Beilharz 2025-12-11 17:52:14 +01:00
parent d1ddff8b56
commit dbb05e3fcc
No known key found for this signature in database
GPG key ID: E9140597606020D3
3 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
web/src/app/browser/src/hardwareEventKeyboard.ts
View file

@ -14,6 +14,12 @@ type KeyboardState = {
baseLayout: string
}
const DOM_KEY_LOCATION = {
STANDARD: 0,
LEFT: 1,
RIGHT: 2,
};
// Important: the following two lines should not cause a compile error if left uncommented.
// let dummy1: KeyboardProcessor;
// let dummy2: KeyboardState = dummy1;
@ -51,9 +57,9 @@ export function _GetEventKeyCode(e: KeyboardEvent) {
* @param {KeyboardEvent} e Event object
* @param {KeyboardState} keyboardState Keyboard state object
* @param {DeviceSpec} device Device object
* @return {KeyEvent} KeymanWeb KeyEvent object, or null
* for duplicate/spurious events or if
* there is no key code.
*
* @return {KeyEvent} KeymanWeb KeyEvent object, or null for duplicate/spurious
* events or if there is no key code.
*/
export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: KeyboardState, device: DeviceSpec): KeyEvent {
if(e.cancelBubble === true) {
@ -104,17 +110,21 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
*/
let curModState = 0x0000;
curModState |= (e.getModifierState("Shift") ? 0x10 : 0);
curModState |= (e.getModifierState("Shift") ? ModifierKeyConstants.K_SHIFTFLAG : 0);
if(e.getModifierState("Control")) {
curModState |= ((e.location != 0 && ctrlEvent) ?
(e.location == 1 ? ModifierKeyConstants.LCTRLFLAG : ModifierKeyConstants.RCTRLFLAG) : // Condition 1
prevModState & 0x0003 /* LCTRLFLAG | RCTRLFLAG */); // Condition 2
curModState |= ((e.location != DOM_KEY_LOCATION.STANDARD && ctrlEvent)
? (e.location == DOM_KEY_LOCATION.LEFT
? ModifierKeyConstants.LCTRLFLAG
: ModifierKeyConstants.RCTRLFLAG) // Condition 1
: prevModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)); // Condition 2
}
if(e.getModifierState("Alt")) {
curModState |= ((e.location != 0 && altEvent) ?
(e.location == 1 ? ModifierKeyConstants.LALTFLAG : ModifierKeyConstants.RALTFLAG) : // Condition 1
prevModState & 0x000C /* LALTFLAG | RALTFLAG */); // Condition 2
curModState |= ((e.location != DOM_KEY_LOCATION.STANDARD && altEvent)
? (e.location == DOM_KEY_LOCATION.LEFT
? ModifierKeyConstants.LALTFLAG
: ModifierKeyConstants.RALTFLAG) // Condition 1
: prevModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG)); // Condition 2
}
// Stage 2 - detect state key information. It can be looked up per keypress with no issue.
@ -143,7 +153,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
curModState &= ~ altGrMask;
}
// Perform basic filtering for Windows-based ALT_GR emulation on European keyboards.
if(curModState & ModifierKeyConstants.RALTFLAG) {
if((curModState & ModifierKeyConstants.RALTFLAG) != 0) {
curModState &= ~ModifierKeyConstants.LCTRLFLAG;
}
@ -151,7 +161,7 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
const modifierBitmasks = Codes.modifierBitmasks;
const activeKeyboard = keyboardState.activeKeyboard;
let Lmodifiers: number;
if(activeKeyboard && activeKeyboard.isChiral) {
if(activeKeyboard?.isChiral) {
Lmodifiers = curModState & modifierBitmasks.CHIRAL;
// Note for future - embedding a kill switch here would facilitate disabling AltGr / Right-alt simulation.
@ -162,9 +172,9 @@ export function preprocessKeyboardEvent(e: KeyboardEvent, keyboardState: Keyboar
} else {
// No need to sim AltGr here; we don't need chiral ALTs.
Lmodifiers =
(curModState & 0x10) | // SHIFT
((curModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)) ? 0x20 : 0) |
((curModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG)) ? 0x40 : 0);
(curModState & ModifierKeyConstants.K_SHIFTFLAG) |
((curModState & (ModifierKeyConstants.LCTRLFLAG | ModifierKeyConstants.RCTRLFLAG)) != 0 ? ModifierKeyConstants.K_CTRLFLAG : 0) |
((curModState & (ModifierKeyConstants.LALTFLAG | ModifierKeyConstants.RALTFLAG)) != 0 ? ModifierKeyConstants.K_ALTFLAG : 0);
}

19
web/src/engine/src/main/headless/inputProcessor.ts
View file

@ -170,24 +170,21 @@ export class InputProcessor {
const formFactor = keyEvent.device.formFactor;
const fromOSK = keyEvent.isSynthetic;
// The default OSK layout for desktop devices does not include nextlayer info, relying on modifier detection here.
// The default OSK layout for desktop devices does not include nextlayer info, relying on
// modifier detection here.
// It's the OSK equivalent to doModifierPress on 'desktop' form factors.
if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && fromOSK) {
if((formFactor == DeviceSpec.FormFactor.Desktop || !this.activeKeyboard || (this.activeKeyboard instanceof JSKeyboard && this.activeKeyboard.usesDesktopLayoutOnDevice(keyEvent.device))) && fromOSK && this.keyboardProcessor.selectLayer(keyEvent)) {
// If it's a desktop OSK style and this triggers a layer change,
// a modifier key was clicked. No output expected, so it's safe to instantly exit.
if(this.keyboardProcessor.selectLayer(keyEvent)) {
return new ProcessorAction();
}
return new ProcessorAction();
}
// Will handle keystroke-based non-layer change modifier & state keys, mapping them through the physical keyboard's version
// of state management. `doModifierPress` must always run.
if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !fromOSK)) {
// Will handle keystroke-based non-layer change modifier & state keys, mapping them through
// the physical keyboard's version of state management. `doModifierPress` must always run.
if (this.keyboardProcessor.doModifierPress(keyEvent, textStore, !fromOSK) && !fromOSK) {
// If run on a desktop platform, we know that modifier & state key presses may not
// produce output, so we may make an immediate return safely.
if(!fromOSK) {
return new ProcessorAction();
}
return new ProcessorAction();
}
// If suggestions exist AND space is pressed, accept the suggestion and do not process the keystroke.

8
web/src/test/auto/headless/engine/core-processor/coreKeyboardProcessor.tests.ts
View file

@ -30,12 +30,10 @@ describe('CoreKeyboardProcessor', function () {
const item = new KM_Core.instance.km_core_context_item();
if (isMarker) {
item.marker = c as number;
} else if (typeof c == 'number') {
item.character = c;
} else {
if (typeof (c) == 'number') {
item.character = c;
} else {
item.character = c.codePointAt(0);
}
item.character = c.codePointAt(0);
}
contextItems.push_back(item);
};