uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix menu scancode. (#586)

Browse Source 
* Fix menu scancode.

* Change the old menu key scancode 118 to 101.

* validate scancodes
This commit is contained in:
László Monda
2018-03-11 22:56:12 +01:00
committed by GitHub
parent e84dbf2c15
commit e8fe0f8d3e
12 changed files with 261 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/uhk-common/package.json
View File

@@ -10,7 +10,10 @@
"url": "git@github.com:UltimateHackingKeyboard/agent.git"
},
"scripts": {
"build": "tsc",
"build": "run-s tsc copy:*",
"tsc": "tsc",
"copy:scancodes": "copyfiles ./src/config-serializer/config-items/scancodes.json dist",
"copy:secondary-roles": "copyfiles ./src/config-serializer/config-items/secondaryRole.json dist",
"test": "jasmine-ts --config=jasmine.json",
"coverage": "nyc jasmine-ts --config=jasmine.json"
},

3
packages/uhk-common/src/config-serializer/config-items/index.ts
View File

@@ -9,3 +9,6 @@ export * from './macro';
export * from './module';
export * from './module-configuration';
export * from './user-configuration';
export const SCANCODES = require('./scancodes.json');
export const SECONDARY_ROLES = require('./secondaryRole.json');

24
packages/uhk-common/src/config-serializer/config-items/key-action/helper.ts
View File

@@ -8,6 +8,7 @@ import { SwitchKeymapAction, UnresolvedSwitchKeymapAction } from './switch-keyma
import { MouseAction } from './mouse-action';
import { PlayMacroAction } from './play-macro-action';
import { NoneAction } from './none-action';
import { isScancodeExists } from '../scancode-checker';
export class Helper {
@@ -26,7 +27,12 @@ export class Helper {
buffer.backtrack();
if (keyActionFirstByte >= KeyActionId.KeystrokeAction && keyActionFirstByte < KeyActionId.LastKeystrokeAction) {
return new KeystrokeAction().fromBinary(buffer);
const keystrokeAction = new KeystrokeAction().fromBinary(buffer);
if (isValidKeystrokeAction(keystrokeAction)) {
return keystrokeAction;
}
return new NoneAction();
}
switch (keyActionFirstByte) {
@@ -68,8 +74,14 @@ export class Helper {
}
switch (keyAction.keyActionType) {
case keyActionType.KeystrokeAction:
return new KeystrokeAction().fromJsonObject(keyAction);
case keyActionType.KeystrokeAction: {
const keystrokeAction = new KeystrokeAction().fromJsonObject(keyAction);
if (isValidKeystrokeAction(keystrokeAction)) {
return keystrokeAction;
}
return new NoneAction();
}
case keyActionType.SwitchLayerAction:
return new SwitchLayerAction().fromJsonObject(keyAction);
case keyActionType.SwitchKeymapAction:
@@ -85,3 +97,9 @@ export class Helper {
}
}
}
function isValidKeystrokeAction(keystrokeAction: KeystrokeAction): boolean {
return keystrokeAction.hasSecondaryRoleAction() ||
keystrokeAction.hasActiveModifier() ||
keystrokeAction.hasScancode() && isScancodeExists(keystrokeAction.scancode);
}

26
packages/uhk-common/src/config-serializer/config-items/scancode-checker.ts Normal file
View File

@@ -0,0 +1,26 @@
import { SCANCODES } from './';
let scancodeMap: Map<number, any>;
export function isScancodeExists(scancode: number): boolean {
if (!scancodeMap) {
fillScancodeMap();
}
return scancodeMap.has(scancode);
}
function fillScancodeMap(): void {
scancodeMap = new Map<number, any>();
for (const scanGroup of SCANCODES) {
for (const child of scanGroup.children) {
if (child.additional && child.additional.scancode) {
scancodeMap.set(child.additional.scancode, child);
}
else {
scancodeMap.set(Number.parseInt(child.id), child);
}
}
}
}

2
packages/uhk-web/src/app/components/popover/tab/keypress/scancodes.json → packages/uhk-common/src/config-serializer/config-items/scancodes.json
View File

@@ -242,7 +242,7 @@
"text": "Delete"
},
{
"id": "118",
"id": "101",
"text": "Menu"
},
{

0
packages/uhk-web/src/app/components/popover/tab/keypress/secondaryRole.json → packages/uhk-common/src/config-serializer/config-items/secondaryRole.json
View File

6
packages/uhk-web/src/app/components/popover/tab/keypress/keypress-tab.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, Input, OnChanges } from '@angular/core';
import { Select2OptionData, Select2TemplateFunction } from 'ng2-select2';
import { KeyAction, KeystrokeAction, KeystrokeType } from 'uhk-common';
import { KeyAction, KeystrokeAction, KeystrokeType, SCANCODES, SECONDARY_ROLES } from 'uhk-common';
import { Tab } from '../tab';
import { MapperService } from '../../../../services/mapper.service';
@@ -35,8 +35,8 @@ export class KeypressTabComponent extends Tab implements OnChanges {
id: '0',
text: 'None'
}];
this.scanCodeGroups = this.scanCodeGroups.concat(require('./scancodes.json'));
this.secondaryRoleGroups = require('./secondaryRole.json');
this.scanCodeGroups = this.scanCodeGroups.concat(SCANCODES);
this.secondaryRoleGroups = SECONDARY_ROLES;
this.leftModifierSelects = Array(this.leftModifiers.length).fill(false);
this.rightModifierSelects = Array(this.rightModifiers.length).fill(false);
this.selectedScancodeOption = this.scanCodeGroups[0];

2
packages/uhk-web/src/app/services/capture.service.ts
View File

@@ -94,7 +94,7 @@ export class CaptureService {
this.mapping.set(88, 27); // X
this.mapping.set(89, 28); // Y
this.mapping.set(90, 29); // Z
this.mapping.set(93, 118); // Menu
this.mapping.set(93, 101); // Menu
this.mapping.set(96, 98); // Num pad 0
this.mapping.set(97, 89); // Num pad 1
this.mapping.set(98, 90); // Num pad 2

4
packages/uhk-web/src/app/services/mapper.service.ts
View File

@@ -190,6 +190,7 @@ export class MapperService {
this.basicScanCodeTextMap.set(98, ['Insert', '0']);
this.basicScanCodeTextMap.set(99, ['Del', '.']);
this.basicScanCodeTextMap.set(100, ['ISO key', '|']);
this.basicScanCodeTextMap.set(101, ['Menu']);
this.basicScanCodeTextMap.set(104, ['F13']);
this.basicScanCodeTextMap.set(105, ['F14']);
this.basicScanCodeTextMap.set(106, ['F15']);
@@ -202,7 +203,6 @@ export class MapperService {
this.basicScanCodeTextMap.set(113, ['F22']);
this.basicScanCodeTextMap.set(114, ['F23']);
this.basicScanCodeTextMap.set(115, ['F24']);
this.basicScanCodeTextMap.set(118, ['Menu']);
this.basicScanCodeTextMap.set(176, ['00']);
this.basicScanCodeTextMap.set(177, ['000']);
@@ -236,7 +236,7 @@ export class MapperService {
this.basicScancodeIcons.set(80, 'icon-kbd__mod--arrow-left');
this.basicScancodeIcons.set(81, 'icon-kbd__mod--arrow-down');
this.basicScancodeIcons.set(82, 'icon-kbd__mod--arrow-up');
this.basicScancodeIcons.set(118, 'icon-kbd__mod--menu');
this.basicScancodeIcons.set(101, 'icon-kbd__mod--menu');
this.mediaScancodeIcons = new Map<number, string>();
this.mediaScancodeIcons.set(138, 'icon-kbd__fn--browser');

14
packages/uhk-web/src/app/services/user-config.json
View File

@@ -495,7 +495,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",
@@ -1501,7 +1501,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",
@@ -2517,7 +2517,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",
@@ -3520,7 +3520,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",
@@ -4533,7 +4533,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",
@@ -5534,7 +5534,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",
@@ -6547,7 +6547,7 @@
{
"keyActionType": "keystroke",
"type": "basic",
"scancode": 118
"scancode": 101
},
{
"keyActionType": "keystroke",