c2939ef9af
* chore: bump chromium to 128.0.6558.0 32-x-y * chore: bump chromium in DEPS to 127.0.6526.0 * chore: update network_service_allow_remote_certificate_verification_logic.patch manually apply patch due to minor upstream shear Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5598454 * chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch No manual changes; patch applied with fuzz 1 * chore: update refactor_expose_file_system_access_blocklist.patch No manual changes; patch applied with fuzz 2 * chore: update revert_heap_add_checks_position_info.patch No manual changes; patch applied with fuzz 1 * chore: e patches all * chore: bump chromium in DEPS to 127.0.6527.0 * chore: update patches * chore: bump chromium in DEPS to 127.0.6529.0 * chore: bump chromium in DEPS to 127.0.6531.0 * chore: update patches * 5596349: Remove PDF OCR toggle from settings. https://chromium-review.googlesource.com/c/chromium/src/+/5596349 * 5585932: [video-pip] Add minimize button to video picture-in-picture window https://chromium-review.googlesource.com/c/chromium/src/+/5585932 * 5604487: Reland "[api] Deprecate v8::FunctionCallbackInfo::Holder() for real" https://chromium-review.googlesource.com/c/v8/v8/+/5604487 * 5581721: [DEPS] Update clang-format location https://chromium-review.googlesource.com/c/chromium/src/+/5581721 * 5597904: [Windows] Remove ConvertToLongPath from Sandbox Utilities. https://chromium-review.googlesource.com/c/chromium/src/+/5597904 ResolveNTFunctionPtr was removed in this CL. * fix: visibility state specs on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/5605407 * Revert "fix: visibility state specs on macOS" This reverts commit 1eee30a33dfafeec86cdd09526a07b01abca2ed6. * temp: disable occlusion checker on macOS * chore: bump chromium in DEPS to 128.0.6535.0 * chore: update patches * [Extensions] Move some scriptings files out of the API directory. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5606682 * fix[node]: do not use soon-to-be-deprecated V8 API * fix: update api_remove_allcan_read_write.patch * chore: update patches * chore: update patches * chore: fix lf mismatch in api_remove_allcan_read_write.patch * chore: update patches * chore: bump chromium in DEPS to 128.0.6538.0 * chore: update v8 patches * chore: update patches * ui/gl/features.gni: Set use_egl=true unconditionally. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5569748 Refs https://issues.chromium.org/issues/344606399 * chore: bump chromium in DEPS to 128.0.6540.0 * chore: bump chromium in DEPS to 128.0.6541.0 * chore: update patches * chore: fix nan read/write patch * chore: bump chromium in DEPS to 128.0.6543.0 * 5626254: Use sandbox_type instead of process_type | https://chromium-review.googlesource.com/c/chromium/src/+/5626254 * chore: update patches * rework nan patches * 5621488: Apply consistent naming conventions to zoom values | https://chromium-review.googlesource.com/c/chromium/src/+/5621488 * chore: bump chromium in DEPS to 128.0.6544.0 * 5605693: Remove files from third_party/ninja | https://chromium-review.googlesource.com/c/chromium/src/+/5605693 * chore: update patches * chore: maybe fix nan patch, part 3 * chore: delete nan patch * chore: re-add nan patch (attempt 2) * chore: add test patch * fixup! add test patch * chore: bump chromium in DEPS to 128.0.6549.0 * chore: bump chromium in DEPS to 128.0.6551.0 * 5637699: Add command line to ASAN Additional Info section | https://chromium-review.googlesource.com/c/chromium/src/+/5637699 * chore: update patches * chore: bump chromium in DEPS to 128.0.6553.0 * chore: bump chromium in DEPS to 128.0.6555.0 * fix: add property query interceptors * chore: bump chromium in DEPS to 128.0.6557.0 * 5583182: Automatic Fullscreen: Prototype Permissions API query support | https://chromium-review.googlesource.com/c/chromium/src/+/5583182 * 5613297: Move render input router and related dependencies to //components/input | https://chromium-review.googlesource.com/c/chromium/src/+/5613297 * chore: update patches * test: skip methodswithdata-test.js nan test * chore: bump chromium in DEPS to 128.0.6558.0 * chore: update patches * build: reference correct ninja cipd ref Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5605693 * update libcxx filenames * refactor: CursorManager moved to //components/input Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5613297 * refactor: spanify mojo Read/WriteData methods Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5619291 * refactor: remove constexpr from KeyboardCodeFromKeyIdentifier Ref: unknown Added TODO to investigate after * chore: update patches * refactor: improve type safety of a11y ids Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5614590 * chore: disable tls node tests that don't apply given boringssl tls configuration Ref: https://boringssl-review.googlesource.com/c/boringssl/+/68487 * chore: add patch to fix nan v8 incompat with NamedPropertyHandlerConfiguration and IndexedPropertyHandlerConfiguration Ref: https://chromium-review.googlesource.com/c/v8/v8/+/5630388 * fix: limit subspan length per feedback * Fix incorrect CalculateInsetsInDIP check * 5645742: Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al"" https://chromium-review.googlesource.com/c/chromium/src/+/5645742 * chore: more Windows logging * 5617471: Add NPU blocking to chromium blocklist https://chromium-review.googlesource.com/c/chromium/src/+/5617471 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Alice Zhao <alice@makenotion.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: cleanup .patches after trop --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
287 lines
8.5 KiB
C++
287 lines
8.5 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <string>
|
|
|
|
#include "base/containers/fixed_flat_map.h"
|
|
#include "base/strings/string_util.h"
|
|
#include "shell/common/keyboard_util.h"
|
|
#include "third_party/blink/public/common/input/web_input_event.h"
|
|
#include "ui/events/event_constants.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
using CodeAndShiftedChar = std::pair<ui::KeyboardCode, std::optional<char16_t>>;
|
|
|
|
// TODO: Why does making this constexpr fail
|
|
CodeAndShiftedChar KeyboardCodeFromKeyIdentifier(const std::string_view str) {
|
|
#if BUILDFLAG(IS_MAC)
|
|
constexpr auto CommandOrControl = ui::VKEY_COMMAND;
|
|
#else
|
|
constexpr auto CommandOrControl = ui::VKEY_CONTROL;
|
|
#endif
|
|
|
|
constexpr auto Lookup =
|
|
base::MakeFixedFlatMap<std::string_view, CodeAndShiftedChar>({
|
|
{"alt", {ui::VKEY_MENU, {}}},
|
|
{"altgr", {ui::VKEY_ALTGR, {}}},
|
|
{"backspace", {ui::VKEY_BACK, {}}},
|
|
{"capslock", {ui::VKEY_CAPITAL, {}}},
|
|
{"cmd", {ui::VKEY_COMMAND, {}}},
|
|
{"cmdorctrl", {CommandOrControl, {}}},
|
|
{"command", {ui::VKEY_COMMAND, {}}},
|
|
{"commandorcontrol", {CommandOrControl, {}}},
|
|
{"control", {ui::VKEY_CONTROL, {}}},
|
|
{"ctrl", {ui::VKEY_CONTROL, {}}},
|
|
{"delete", {ui::VKEY_DELETE, {}}},
|
|
{"down", {ui::VKEY_DOWN, {}}},
|
|
{"end", {ui::VKEY_END, {}}},
|
|
{"enter", {ui::VKEY_RETURN, {}}},
|
|
{"esc", {ui::VKEY_ESCAPE, {}}},
|
|
{"escape", {ui::VKEY_ESCAPE, {}}},
|
|
{"f1", {ui::VKEY_F1, {}}},
|
|
{"f10", {ui::VKEY_F10, {}}},
|
|
{"f11", {ui::VKEY_F11, {}}},
|
|
{"f12", {ui::VKEY_F12, {}}},
|
|
{"f13", {ui::VKEY_F13, {}}},
|
|
{"f14", {ui::VKEY_F14, {}}},
|
|
{"f15", {ui::VKEY_F15, {}}},
|
|
{"f16", {ui::VKEY_F16, {}}},
|
|
{"f17", {ui::VKEY_F17, {}}},
|
|
{"f18", {ui::VKEY_F18, {}}},
|
|
{"f19", {ui::VKEY_F19, {}}},
|
|
{"f2", {ui::VKEY_F2, {}}},
|
|
{"f20", {ui::VKEY_F20, {}}},
|
|
{"f21", {ui::VKEY_F21, {}}},
|
|
{"f22", {ui::VKEY_F22, {}}},
|
|
{"f23", {ui::VKEY_F23, {}}},
|
|
{"f24", {ui::VKEY_F24, {}}},
|
|
{"f3", {ui::VKEY_F3, {}}},
|
|
{"f4", {ui::VKEY_F4, {}}},
|
|
{"f5", {ui::VKEY_F5, {}}},
|
|
{"f6", {ui::VKEY_F6, {}}},
|
|
{"f7", {ui::VKEY_F7, {}}},
|
|
{"f8", {ui::VKEY_F8, {}}},
|
|
{"f9", {ui::VKEY_F9, {}}},
|
|
{"home", {ui::VKEY_HOME, {}}},
|
|
{"insert", {ui::VKEY_INSERT, {}}},
|
|
{"left", {ui::VKEY_LEFT, {}}},
|
|
{"medianexttrack", {ui::VKEY_MEDIA_NEXT_TRACK, {}}},
|
|
{"mediaplaypause", {ui::VKEY_MEDIA_PLAY_PAUSE, {}}},
|
|
{"mediaprevioustrack", {ui::VKEY_MEDIA_PREV_TRACK, {}}},
|
|
{"mediastop", {ui::VKEY_MEDIA_STOP, {}}},
|
|
{"meta", {ui::VKEY_COMMAND, {}}},
|
|
{"num0", {ui::VKEY_NUMPAD0, {}}},
|
|
{"num1", {ui::VKEY_NUMPAD1, {}}},
|
|
{"num2", {ui::VKEY_NUMPAD2, {}}},
|
|
{"num3", {ui::VKEY_NUMPAD3, {}}},
|
|
{"num4", {ui::VKEY_NUMPAD4, {}}},
|
|
{"num5", {ui::VKEY_NUMPAD5, {}}},
|
|
{"num6", {ui::VKEY_NUMPAD6, {}}},
|
|
{"num7", {ui::VKEY_NUMPAD7, {}}},
|
|
{"num8", {ui::VKEY_NUMPAD8, {}}},
|
|
{"num9", {ui::VKEY_NUMPAD9, {}}},
|
|
{"numadd", {ui::VKEY_ADD, {}}},
|
|
{"numdec", {ui::VKEY_DECIMAL, {}}},
|
|
{"numdiv", {ui::VKEY_DIVIDE, {}}},
|
|
{"numlock", {ui::VKEY_NUMLOCK, {}}},
|
|
{"nummult", {ui::VKEY_MULTIPLY, {}}},
|
|
{"numsub", {ui::VKEY_SUBTRACT, {}}},
|
|
{"option", {ui::VKEY_MENU, {}}},
|
|
{"pagedown", {ui::VKEY_NEXT, {}}},
|
|
{"pageup", {ui::VKEY_PRIOR, {}}},
|
|
{"plus", {ui::VKEY_OEM_PLUS, '+'}},
|
|
{"printscreen", {ui::VKEY_SNAPSHOT, {}}},
|
|
{"return", {ui::VKEY_RETURN, {}}},
|
|
{"right", {ui::VKEY_RIGHT, {}}},
|
|
{"scrolllock", {ui::VKEY_SCROLL, {}}},
|
|
{"shift", {ui::VKEY_SHIFT, {}}},
|
|
{"space", {ui::VKEY_SPACE, {}}},
|
|
{"super", {ui::VKEY_COMMAND, {}}},
|
|
{"tab", {ui::VKEY_TAB, {}}},
|
|
{"up", {ui::VKEY_UP, {}}},
|
|
{"volumedown", {ui::VKEY_VOLUME_DOWN, {}}},
|
|
{"volumemute", {ui::VKEY_VOLUME_MUTE, {}}},
|
|
{"volumeup", {ui::VKEY_VOLUME_UP, {}}},
|
|
});
|
|
|
|
if (auto* const iter = Lookup.find(str); iter != Lookup.end())
|
|
return iter->second;
|
|
|
|
return {ui::VKEY_UNKNOWN, {}};
|
|
}
|
|
|
|
constexpr CodeAndShiftedChar KeyboardCodeFromCharCode(char16_t c) {
|
|
switch (c) {
|
|
case ' ':
|
|
return {ui::VKEY_SPACE, {}};
|
|
case '!':
|
|
return {ui::VKEY_1, '!'};
|
|
case '"':
|
|
return {ui::VKEY_OEM_7, '"'};
|
|
case '#':
|
|
return {ui::VKEY_3, '#'};
|
|
case '$':
|
|
return {ui::VKEY_4, '$'};
|
|
case '%':
|
|
return {ui::VKEY_5, '%'};
|
|
case '&':
|
|
return {ui::VKEY_7, '&'};
|
|
case '(':
|
|
return {ui::VKEY_9, '('};
|
|
case ')':
|
|
return {ui::VKEY_0, ')'};
|
|
case '*':
|
|
return {ui::VKEY_8, '*'};
|
|
case '+':
|
|
return {ui::VKEY_OEM_PLUS, '+'};
|
|
case ',':
|
|
return {ui::VKEY_OEM_COMMA, {}};
|
|
case '-':
|
|
return {ui::VKEY_OEM_MINUS, {}};
|
|
case '.':
|
|
return {ui::VKEY_OEM_PERIOD, {}};
|
|
case '/':
|
|
return {ui::VKEY_OEM_2, {}};
|
|
case '0':
|
|
return {ui::VKEY_0, {}};
|
|
case '1':
|
|
return {ui::VKEY_1, {}};
|
|
case '2':
|
|
return {ui::VKEY_2, {}};
|
|
case '3':
|
|
return {ui::VKEY_3, {}};
|
|
case '4':
|
|
return {ui::VKEY_4, {}};
|
|
case '5':
|
|
return {ui::VKEY_5, {}};
|
|
case '6':
|
|
return {ui::VKEY_6, {}};
|
|
case '7':
|
|
return {ui::VKEY_7, {}};
|
|
case '8':
|
|
return {ui::VKEY_8, {}};
|
|
case '9':
|
|
return {ui::VKEY_9, {}};
|
|
case ':':
|
|
return {ui::VKEY_OEM_1, ':'};
|
|
case ';':
|
|
return {ui::VKEY_OEM_1, {}};
|
|
case '<':
|
|
return {ui::VKEY_OEM_COMMA, '<'};
|
|
case '=':
|
|
return {ui::VKEY_OEM_PLUS, {}};
|
|
case '>':
|
|
return {ui::VKEY_OEM_PERIOD, '>'};
|
|
case '?':
|
|
return {ui::VKEY_OEM_2, '?'};
|
|
case '@':
|
|
return {ui::VKEY_2, '@'};
|
|
case '[':
|
|
return {ui::VKEY_OEM_4, {}};
|
|
case '\'':
|
|
return {ui::VKEY_OEM_7, {}};
|
|
case '\\':
|
|
return {ui::VKEY_OEM_5, {}};
|
|
case ']':
|
|
return {ui::VKEY_OEM_6, {}};
|
|
case '^':
|
|
return {ui::VKEY_6, '^'};
|
|
case '_':
|
|
return {ui::VKEY_OEM_MINUS, '_'};
|
|
case '`':
|
|
return {ui::VKEY_OEM_3, {}};
|
|
case 'a':
|
|
return {ui::VKEY_A, {}};
|
|
case 'b':
|
|
return {ui::VKEY_B, {}};
|
|
case 'c':
|
|
return {ui::VKEY_C, {}};
|
|
case 'd':
|
|
return {ui::VKEY_D, {}};
|
|
case 'e':
|
|
return {ui::VKEY_E, {}};
|
|
case 'f':
|
|
return {ui::VKEY_F, {}};
|
|
case 'g':
|
|
return {ui::VKEY_G, {}};
|
|
case 'h':
|
|
return {ui::VKEY_H, {}};
|
|
case 'i':
|
|
return {ui::VKEY_I, {}};
|
|
case 'j':
|
|
return {ui::VKEY_J, {}};
|
|
case 'k':
|
|
return {ui::VKEY_K, {}};
|
|
case 'l':
|
|
return {ui::VKEY_L, {}};
|
|
case 'm':
|
|
return {ui::VKEY_M, {}};
|
|
case 'n':
|
|
return {ui::VKEY_N, {}};
|
|
case 'o':
|
|
return {ui::VKEY_O, {}};
|
|
case 'p':
|
|
return {ui::VKEY_P, {}};
|
|
case 'q':
|
|
return {ui::VKEY_Q, {}};
|
|
case 'r':
|
|
return {ui::VKEY_R, {}};
|
|
case 's':
|
|
return {ui::VKEY_S, {}};
|
|
case 't':
|
|
return {ui::VKEY_T, {}};
|
|
case 'u':
|
|
return {ui::VKEY_U, {}};
|
|
case 'v':
|
|
return {ui::VKEY_V, {}};
|
|
case 'w':
|
|
return {ui::VKEY_W, {}};
|
|
case 'x':
|
|
return {ui::VKEY_X, {}};
|
|
case 'y':
|
|
return {ui::VKEY_Y, {}};
|
|
case 'z':
|
|
return {ui::VKEY_Z, {}};
|
|
case '{':
|
|
return {ui::VKEY_OEM_4, '{'};
|
|
case '|':
|
|
return {ui::VKEY_OEM_5, '|'};
|
|
case '}':
|
|
return {ui::VKEY_OEM_6, '}'};
|
|
case '~':
|
|
return {ui::VKEY_OEM_3, '~'};
|
|
case 0x08:
|
|
return {ui::VKEY_BACK, {}};
|
|
case 0x09:
|
|
return {ui::VKEY_TAB, {}};
|
|
case 0x0D:
|
|
return {ui::VKEY_RETURN, {}};
|
|
case 0x1B:
|
|
return {ui::VKEY_ESCAPE, {}};
|
|
case 0x7F:
|
|
return {ui::VKEY_DELETE, {}};
|
|
default:
|
|
return {ui::VKEY_UNKNOWN, {}};
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ui::KeyboardCode KeyboardCodeFromStr(const std::string_view str,
|
|
std::optional<char16_t>* shifted_char) {
|
|
auto const [code, shifted] =
|
|
str.size() == 1 ? KeyboardCodeFromCharCode(base::ToLowerASCII(str[0]))
|
|
: KeyboardCodeFromKeyIdentifier(base::ToLowerASCII(str));
|
|
|
|
if (code == ui::VKEY_UNKNOWN)
|
|
LOG(WARNING) << "Invalid accelerator token: " << str;
|
|
|
|
*shifted_char = shifted;
|
|
return code;
|
|
}
|
|
|
|
} // namespace electron
|