First cut at integrating keyboard mappers

microsoft · Mar 20, 2017 · d102396 · d102396
1 parent 8dc5a60
commit d102396
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 667 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "https-proxy-agent": "0.3.6",
     "iconv-lite": "0.4.15",
     "minimist": "1.2.0",
-    "native-keymap": "0.4.0",
+    "native-keymap": "1.1.0",
     "node-pty": "0.6.2",
     "semver": "4.3.6",
     "v8-profiler": "jrieken/v8-profiler#vscode",

diff --git a/src/typings/native-keymap.d.ts b/src/typings/native-keymap.d.ts
@@ -5,15 +5,40 @@
 
 declare module 'native-keymap' {
 
-	export interface INativeKeyMap {
-		key_code: string;
+	export interface IWindowsKeyMapping {
+		vkey: string;
 		value: string;
 		withShift: string;
 		withAltGr: string;
 		withShiftAltGr: string;
 	}
+	export interface IWindowsKeyboardMapping {
+		[code: string]: IWindowsKeyMapping;
+	}
+	export interface ILinuxKeyMapping {
+		value: string;
+		withShift: string;
+		withAltGr: string;
+		withShiftAltGr: string;
+	}
+	export interface ILinuxKeyboardMapping {
+		[code: string]: ILinuxKeyMapping;
+	}
+	export interface IMacKeyMapping {
+		value: string;
+		withShift: string;
+		withAltGr: string;
+		withShiftAltGr: string;
+		valueIsDeadKey: boolean;
+		withShiftIsDeadKey: boolean;
+		withAltGrIsDeadKey: boolean;
+		withShiftAltGrIsDeadKey: boolean;
+	}
+	export interface IMacKeyboardMapping {
+		[code: string]: IMacKeyMapping;
+	}
 
-	export function getKeyMap(): INativeKeyMap[];
+	export function getKeyMap(): IWindowsKeyboardMapping | ILinuxKeyboardMapping | IMacKeyboardMapping;
 
 	export interface IWindowsKeyboardLayoutInfo {
 		name: string;

diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
@@ -148,23 +148,15 @@ let KEY_CODE_MAP: { [keyCode: number]: KeyCode } = {};
 	}
 })();
 
-export function lookupKeyCode(e: KeyboardEvent): KeyCode {
-	return KEY_CODE_MAP[e.keyCode] || KeyCode.Unknown;
-}
-
-let extractKeyCode = function extractKeyCode(e: KeyboardEvent): KeyCode {
+function extractKeyCode(e: KeyboardEvent): KeyCode {
 	if (e.charCode) {
 		// "keypress" events mostly
 		let char = String.fromCharCode(e.charCode).toUpperCase();
 		return KeyCodeUtils.fromString(char);
 	}
-	return lookupKeyCode(e);
+	return KEY_CODE_MAP[e.keyCode] || KeyCode.Unknown;
 };
 
-export function setExtractKeyCode(newExtractKeyCode: (e: KeyboardEvent) => KeyCode): void {
-	extractKeyCode = newExtractKeyCode;
-}
-
 export interface IKeyboardEvent {
 	readonly browserEvent: KeyboardEvent;
 	readonly target: HTMLElement;

diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -14,7 +14,7 @@ import { UILabelProvider, AriaLabelProvider, UserSettingsLabelProvider, Electron
 import { IKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 
-export interface IKeyMapping {
+export interface IMacLinuxKeyMapping {
 	value: string;
 	withShift: string;
 	withAltGr: string;
@@ -26,8 +26,8 @@ export interface IKeyMapping {
 	withShiftAltGrIsDeadKey?: boolean;
 }
 
-export interface IKeyboardMapping {
-	[code: string]: IKeyMapping;
+export interface IMacLinuxKeyboardMapping {
+	[code: string]: IMacLinuxKeyMapping;
 }
 
 const LOG = false;
@@ -160,7 +160,7 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper {
 	private readonly _hwToDispatch: string[] = [];
 	private readonly _kbToHw: number[][] = [];
 
-	constructor(rawMappings: IKeyboardMapping, OS: OperatingSystem) {
+	constructor(rawMappings: IMacLinuxKeyboardMapping, OS: OperatingSystem) {
 
 		this._OS = OS;
 

diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -14,16 +14,16 @@ import { IHTMLContentElement } from 'vs/base/common/htmlContent';
 import { IKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 
-export interface IKeyMapping {
+export interface IWindowsKeyMapping {
 	vkey: string;
 	value: string;
 	withShift: string;
 	withAltGr: string;
 	withShiftAltGr: string;
 }
 
-export interface IKeyboardMapping {
-	[code: string]: IKeyMapping;
+export interface IWindowsKeyboardMapping {
+	[code: string]: IWindowsKeyMapping;
 }
 
 const LOG = false;
@@ -182,7 +182,7 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
 	private readonly _kbToLabel: string[] = [];
 	private readonly _kbExists: boolean[];
 
-	constructor(rawMappings: IKeyboardMapping) {
+	constructor(rawMappings: IWindowsKeyboardMapping) {
 		this._hwToKb = [];
 		this._kbToLabel = [];
 		this._kbExists = [];