Skip to content

F
Front-End
Unverified Commit 63e096b4 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub
Browse files
Options

Update keyboard maps (#40697) 

This updates the keyboard maps to use updated HID codes for game controller buttons (from Chrome), and to encode that GLFW "super" keys are what we call "meta" keys (i.e. Windows key or Command key).
parent 8e14fc7f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 230 deletions
dev/tools/gen_keycodes/data/key_data.json
View file @ 63e096b4
......@@ -4703,7 +4703,9 @@
],
"english": "Meta Left",
"chromium": "metaLeft",
"glfw": null
"glfw": [
"LEFT_SUPER"
]
},
"scanCodes": {
"android": [
......@@ -4719,7 +4721,9 @@
"android": [
117
],
"glfw": null
"glfw": [
343
]
}
},
"controlRight": {
......@@ -4823,7 +4827,9 @@
],
"english": "Meta Right",
"chromium": "metaRight",
"glfw": null
"glfw": [
"RIGHT_SUPER"
]
},
"scanCodes": {
"android": [
......@@ -4839,7 +4845,9 @@
"android": [
118
],
"glfw": null
"glfw": [
347
]
}
},
"info": {
......@@ -6377,7 +6385,7 @@
256,
288
],
"usb": 341761,
"usb": 392961,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6405,7 +6413,7 @@
257,
289
],
"usb": 341762,
"usb": 392962,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6433,7 +6441,7 @@
258,
290
],
"usb": 341763,
"usb": 392963,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6461,7 +6469,7 @@
259,
291
],
"usb": 341764,
"usb": 392964,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6489,7 +6497,7 @@
260,
292
],
"usb": 341765,
"usb": 392965,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6517,7 +6525,7 @@
261,
293
],
"usb": 341766,
"usb": 392966,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6545,7 +6553,7 @@
262,
294
],
"usb": 341767,
"usb": 392967,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6573,7 +6581,7 @@
263,
295
],
"usb": 341768,
"usb": 392968,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6601,7 +6609,7 @@
264,
296
],
"usb": 341769,
"usb": 392969,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6629,7 +6637,7 @@
265,
297
],
"usb": 341770,
"usb": 392970,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6657,7 +6665,7 @@
266,
298
],
"usb": 341771,
"usb": 392971,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6685,7 +6693,7 @@
267,
299
],
"usb": 341772,
"usb": 392972,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6713,7 +6721,7 @@
268,
300
],
"usb": 341773,
"usb": 392973,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6741,7 +6749,7 @@
269,
301
],
"usb": 341774,
"usb": 392974,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6769,7 +6777,7 @@
270,
302
],
"usb": 341775,
"usb": 392975,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6797,7 +6805,7 @@
271,
303
],
"usb": 341776,
"usb": 392976,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6824,7 +6832,7 @@
"android": [
304
],
"usb": 341777,
"usb": 392977,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6851,7 +6859,7 @@
"android": [
305
],
"usb": 341778,
"usb": 392978,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6878,7 +6886,7 @@
"android": [
306
],
"usb": 341779,
"usb": 392979,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6905,7 +6913,7 @@
"android": [
310
],
"usb": 341780,
"usb": 392980,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6932,7 +6940,7 @@
"android": [
312
],
"usb": 341781,
"usb": 392981,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6959,7 +6967,7 @@
"android": [
316
],
"usb": 341782,
"usb": 392982,
"linux": null,
"xkb": null,
"windows": null,
......@@ -6986,7 +6994,7 @@
"android": [
311
],
"usb": 341783,
"usb": 392983,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7013,7 +7021,7 @@
"android": [
313
],
"usb": 341784,
"usb": 392984,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7040,7 +7048,7 @@
"android": [
314
],
"usb": 341785,
"usb": 392985,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7067,7 +7075,7 @@
"android": [
315
],
"usb": 341786,
"usb": 392986,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7094,7 +7102,7 @@
"android": [
317
],
"usb": 341787,
"usb": 392987,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7121,7 +7129,7 @@
"android": [
318
],
"usb": 341788,
"usb": 392988,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7148,7 +7156,7 @@
"android": [
307
],
"usb": 341789,
"usb": 392989,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7175,7 +7183,7 @@
"android": [
308
],
"usb": 341790,
"usb": 392990,
"linux": null,
"xkb": null,
"windows": null,
......@@ -7202,7 +7210,7 @@
"android": [
309
],
"usb": 341791,
"usb": 392991,
"linux": null,
"xkb": null,
"windows": null,
......
dev/tools/gen_keycodes/data/key_name_to_glfw_name.json
View file @ 63e096b4
......@@ -11,10 +11,10 @@
"bracketLeft": ["LEFT_BRACKET"],
"bracketRight": ["RIGHT_BRACKET"],
"capsLock": ["CAPS_LOCK"],
"comma": ["COMMA"],
"contextMenu": ["MENU"],
"controlLeft": ["LEFT_CONTROL"],
"controlRight": ["RIGHT_CONTROL"],
"contextMenu": ["MENU"],
"comma": ["COMMA"],
"delete": ["DELETE"],
"digit0": ["0"],
"digit1": ["1"],
......@@ -82,6 +82,8 @@
"keyX": ["X"],
"keyY": ["Y"],
"keyZ": ["Z"],
"metaLeft": ["LEFT_SUPER"],
"metaRight": ["RIGHT_SUPER"],
"minus": ["MINUS"],
"numLock": ["NUM_LOCK"],
"numpad0": ["KP_0"],
......@@ -94,23 +96,23 @@
"numpad7": ["KP_7"],
"numpad8": ["KP_8"],
"numpad9": ["KP_9"],
"numpadAdd": ["KP_ADD"],
"numpadDecimal": ["KP_DECIMAL"],
"numpadDivide": ["KP_DIVIDE"],
"numpadMultiply": ["KP_MULTIPLY"],
"numpadSubtract": ["NUMPAD_SUBTRACT"],
"numpadAdd": ["KP_ADD"],
"numpadEnter": ["KP_ENTER"],
"numpadEqual": ["KP_EQUAL"],
"numpadMultiply": ["KP_MULTIPLY"],
"numpadSubtract": ["NUMPAD_SUBTRACT"],
"pageDown": ["PAGE_DOWN"],
"pageUp": ["PAGE_UP"],
"pause": ["PAUSE"],
"period": ["PERIOD"],
"printScreen": ["PRINT_SCREEN"],
"quote": ["APOSTROPHE"],
"period": ["PERIOD"],
"semicolon": ["SEMICOLON"],
"slash": ["SLASH"],
"space": ["SPACE"],
"shiftLeft": ["LEFT_SHIFT"],
"shiftRight": ["RIGHT_SHIFT"],
"slash": ["SLASH"],
"space": ["SPACE"],
"tab": ["TAB"]
}
dev/tools/gen_keycodes/lib/key_data.dart
View file @ 63e096b4
......@@ -27,7 +27,7 @@ class KeyData {
String androidKeyCodeHeader,
String androidNameMap,
String glfwKeyCodeHeader,
String glfwNameMap
String glfwNameMap,
) : assert(chromiumHidCodes != null),
assert(androidKeyboardLayout != null),
assert(androidKeyCodeHeader != null),
......
packages/flutter/lib/src/services/keyboard_maps.dart
View file @ 63e096b4
......@@ -688,37 +688,37 @@ const Map<int, LogicalKeyboardKey> kFuchsiaToLogicalKey = <int, LogicalKeyboardK
0x1000c028c: LogicalKeyboardKey.mailSend,
0x1000c029d: LogicalKeyboardKey.keyboardLayoutSelect,
0x1000c029f: LogicalKeyboardKey.showAllWindows,
0x100053701: LogicalKeyboardKey.gameButton1,
0x100053702: LogicalKeyboardKey.gameButton2,
0x100053703: LogicalKeyboardKey.gameButton3,
0x100053704: LogicalKeyboardKey.gameButton4,
0x100053705: LogicalKeyboardKey.gameButton5,
0x100053706: LogicalKeyboardKey.gameButton6,
0x100053707: LogicalKeyboardKey.gameButton7,
0x100053708: LogicalKeyboardKey.gameButton8,
0x100053709: LogicalKeyboardKey.gameButton9,
0x10005370a: LogicalKeyboardKey.gameButton10,
0x10005370b: LogicalKeyboardKey.gameButton11,
0x10005370c: LogicalKeyboardKey.gameButton12,
0x10005370d: LogicalKeyboardKey.gameButton13,
0x10005370e: LogicalKeyboardKey.gameButton14,
0x10005370f: LogicalKeyboardKey.gameButton15,
0x100053710: LogicalKeyboardKey.gameButton16,
0x100053711: LogicalKeyboardKey.gameButtonA,
0x100053712: LogicalKeyboardKey.gameButtonB,
0x100053713: LogicalKeyboardKey.gameButtonC,
0x100053714: LogicalKeyboardKey.gameButtonLeft1,
0x100053715: LogicalKeyboardKey.gameButtonLeft2,
0x100053716: LogicalKeyboardKey.gameButtonMode,
0x100053717: LogicalKeyboardKey.gameButtonRight1,
0x100053718: LogicalKeyboardKey.gameButtonRight2,
0x100053719: LogicalKeyboardKey.gameButtonSelect,
0x10005371a: LogicalKeyboardKey.gameButtonStart,
0x10005371b: LogicalKeyboardKey.gameButtonThumbLeft,
0x10005371c: LogicalKeyboardKey.gameButtonThumbRight,
0x10005371d: LogicalKeyboardKey.gameButtonX,
0x10005371e: LogicalKeyboardKey.gameButtonY,
0x10005371f: LogicalKeyboardKey.gameButtonZ,
0x10005ff01: LogicalKeyboardKey.gameButton1,
0x10005ff02: LogicalKeyboardKey.gameButton2,
0x10005ff03: LogicalKeyboardKey.gameButton3,
0x10005ff04: LogicalKeyboardKey.gameButton4,
0x10005ff05: LogicalKeyboardKey.gameButton5,
0x10005ff06: LogicalKeyboardKey.gameButton6,
0x10005ff07: LogicalKeyboardKey.gameButton7,
0x10005ff08: LogicalKeyboardKey.gameButton8,
0x10005ff09: LogicalKeyboardKey.gameButton9,
0x10005ff0a: LogicalKeyboardKey.gameButton10,
0x10005ff0b: LogicalKeyboardKey.gameButton11,
0x10005ff0c: LogicalKeyboardKey.gameButton12,
0x10005ff0d: LogicalKeyboardKey.gameButton13,
0x10005ff0e: LogicalKeyboardKey.gameButton14,
0x10005ff0f: LogicalKeyboardKey.gameButton15,
0x10005ff10: LogicalKeyboardKey.gameButton16,
0x10005ff11: LogicalKeyboardKey.gameButtonA,
0x10005ff12: LogicalKeyboardKey.gameButtonB,
0x10005ff13: LogicalKeyboardKey.gameButtonC,
0x10005ff14: LogicalKeyboardKey.gameButtonLeft1,
0x10005ff15: LogicalKeyboardKey.gameButtonLeft2,
0x10005ff16: LogicalKeyboardKey.gameButtonMode,
0x10005ff17: LogicalKeyboardKey.gameButtonRight1,
0x10005ff18: LogicalKeyboardKey.gameButtonRight2,
0x10005ff19: LogicalKeyboardKey.gameButtonSelect,
0x10005ff1a: LogicalKeyboardKey.gameButtonStart,
0x10005ff1b: LogicalKeyboardKey.gameButtonThumbLeft,
0x10005ff1c: LogicalKeyboardKey.gameButtonThumbRight,
0x10005ff1d: LogicalKeyboardKey.gameButtonX,
0x10005ff1e: LogicalKeyboardKey.gameButtonY,
0x10005ff1f: LogicalKeyboardKey.gameButtonZ,
};
/// Maps Fuchsia-specific USB HID Usage IDs to the matching
......@@ -958,37 +958,37 @@ const Map<int, PhysicalKeyboardKey> kFuchsiaToPhysicalKey = <int, PhysicalKeyboa
0x000c028c: PhysicalKeyboardKey.mailSend,
0x000c029d: PhysicalKeyboardKey.keyboardLayoutSelect,
0x000c029f: PhysicalKeyboardKey.showAllWindows,
0x00053701: PhysicalKeyboardKey.gameButton1,
0x00053702: PhysicalKeyboardKey.gameButton2,
0x00053703: PhysicalKeyboardKey.gameButton3,
0x00053704: PhysicalKeyboardKey.gameButton4,
0x00053705: PhysicalKeyboardKey.gameButton5,
0x00053706: PhysicalKeyboardKey.gameButton6,
0x00053707: PhysicalKeyboardKey.gameButton7,
0x00053708: PhysicalKeyboardKey.gameButton8,
0x00053709: PhysicalKeyboardKey.gameButton9,
0x0005370a: PhysicalKeyboardKey.gameButton10,
0x0005370b: PhysicalKeyboardKey.gameButton11,
0x0005370c: PhysicalKeyboardKey.gameButton12,
0x0005370d: PhysicalKeyboardKey.gameButton13,
0x0005370e: PhysicalKeyboardKey.gameButton14,
0x0005370f: PhysicalKeyboardKey.gameButton15,
0x00053710: PhysicalKeyboardKey.gameButton16,
0x00053711: PhysicalKeyboardKey.gameButtonA,
0x00053712: PhysicalKeyboardKey.gameButtonB,
0x00053713: PhysicalKeyboardKey.gameButtonC,
0x00053714: PhysicalKeyboardKey.gameButtonLeft1,
0x00053715: PhysicalKeyboardKey.gameButtonLeft2,
0x00053716: PhysicalKeyboardKey.gameButtonMode,
0x00053717: PhysicalKeyboardKey.gameButtonRight1,
0x00053718: PhysicalKeyboardKey.gameButtonRight2,
0x00053719: PhysicalKeyboardKey.gameButtonSelect,
0x0005371a: PhysicalKeyboardKey.gameButtonStart,
0x0005371b: PhysicalKeyboardKey.gameButtonThumbLeft,
0x0005371c: PhysicalKeyboardKey.gameButtonThumbRight,
0x0005371d: PhysicalKeyboardKey.gameButtonX,
0x0005371e: PhysicalKeyboardKey.gameButtonY,
0x0005371f: PhysicalKeyboardKey.gameButtonZ,
0x0005ff01: PhysicalKeyboardKey.gameButton1,
0x0005ff02: PhysicalKeyboardKey.gameButton2,
0x0005ff03: PhysicalKeyboardKey.gameButton3,
0x0005ff04: PhysicalKeyboardKey.gameButton4,
0x0005ff05: PhysicalKeyboardKey.gameButton5,
0x0005ff06: PhysicalKeyboardKey.gameButton6,
0x0005ff07: PhysicalKeyboardKey.gameButton7,
0x0005ff08: PhysicalKeyboardKey.gameButton8,
0x0005ff09: PhysicalKeyboardKey.gameButton9,
0x0005ff0a: PhysicalKeyboardKey.gameButton10,
0x0005ff0b: PhysicalKeyboardKey.gameButton11,
0x0005ff0c: PhysicalKeyboardKey.gameButton12,
0x0005ff0d: PhysicalKeyboardKey.gameButton13,
0x0005ff0e: PhysicalKeyboardKey.gameButton14,
0x0005ff0f: PhysicalKeyboardKey.gameButton15,
0x0005ff10: PhysicalKeyboardKey.gameButton16,
0x0005ff11: PhysicalKeyboardKey.gameButtonA,
0x0005ff12: PhysicalKeyboardKey.gameButtonB,
0x0005ff13: PhysicalKeyboardKey.gameButtonC,
0x0005ff14: PhysicalKeyboardKey.gameButtonLeft1,
0x0005ff15: PhysicalKeyboardKey.gameButtonLeft2,
0x0005ff16: PhysicalKeyboardKey.gameButtonMode,
0x0005ff17: PhysicalKeyboardKey.gameButtonRight1,
0x0005ff18: PhysicalKeyboardKey.gameButtonRight2,
0x0005ff19: PhysicalKeyboardKey.gameButtonSelect,
0x0005ff1a: PhysicalKeyboardKey.gameButtonStart,
0x0005ff1b: PhysicalKeyboardKey.gameButtonThumbLeft,
0x0005ff1c: PhysicalKeyboardKey.gameButtonThumbRight,
0x0005ff1d: PhysicalKeyboardKey.gameButtonX,
0x0005ff1e: PhysicalKeyboardKey.gameButtonY,
0x0005ff1f: PhysicalKeyboardKey.gameButtonZ,
};
/// Maps macOS-specific key code values representing [PhysicalKeyboardKey].
......@@ -1249,9 +1249,11 @@ const Map<int, LogicalKeyboardKey> kGlfwToLogicalKey = <int, LogicalKeyboardKey>
341: LogicalKeyboardKey.controlLeft,
340: LogicalKeyboardKey.shiftLeft,
342: LogicalKeyboardKey.altLeft,
343: LogicalKeyboardKey.metaLeft,
345: LogicalKeyboardKey.controlRight,
344: LogicalKeyboardKey.shiftRight,
346: LogicalKeyboardKey.altRight,
347: LogicalKeyboardKey.metaRight,
};
/// A map of GLFW key codes which have printable representations, but appear
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab