mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Charles Kerr <charles@charleskerr.com>
330 lines
7.9 KiB
C++
330 lines
7.9 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/strings/string_number_conversions.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 {
|
|
|
|
// Return key code represented by |str|.
|
|
ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
|
|
bool* shifted) {
|
|
std::string str = base::ToLowerASCII(s);
|
|
if (str == "ctrl" || str == "control") {
|
|
return ui::VKEY_CONTROL;
|
|
} else if (str == "super" || str == "cmd" || str == "command" ||
|
|
str == "meta") {
|
|
return ui::VKEY_COMMAND;
|
|
} else if (str == "commandorcontrol" || str == "cmdorctrl") {
|
|
#if defined(OS_MAC)
|
|
return ui::VKEY_COMMAND;
|
|
#else
|
|
return ui::VKEY_CONTROL;
|
|
#endif
|
|
} else if (str == "alt" || str == "option") {
|
|
return ui::VKEY_MENU;
|
|
} else if (str == "shift") {
|
|
return ui::VKEY_SHIFT;
|
|
} else if (str == "altgr") {
|
|
return ui::VKEY_ALTGR;
|
|
} else if (str == "plus") {
|
|
*shifted = true;
|
|
return ui::VKEY_OEM_PLUS;
|
|
} else if (str == "capslock") {
|
|
return ui::VKEY_CAPITAL;
|
|
} else if (str == "numlock") {
|
|
return ui::VKEY_NUMLOCK;
|
|
} else if (str == "scrolllock") {
|
|
return ui::VKEY_SCROLL;
|
|
} else if (str == "tab") {
|
|
return ui::VKEY_TAB;
|
|
} else if (str == "num0") {
|
|
return ui::VKEY_NUMPAD0;
|
|
} else if (str == "num1") {
|
|
return ui::VKEY_NUMPAD1;
|
|
} else if (str == "num2") {
|
|
return ui::VKEY_NUMPAD2;
|
|
} else if (str == "num3") {
|
|
return ui::VKEY_NUMPAD3;
|
|
} else if (str == "num4") {
|
|
return ui::VKEY_NUMPAD4;
|
|
} else if (str == "num5") {
|
|
return ui::VKEY_NUMPAD5;
|
|
} else if (str == "num6") {
|
|
return ui::VKEY_NUMPAD6;
|
|
} else if (str == "num7") {
|
|
return ui::VKEY_NUMPAD7;
|
|
} else if (str == "num8") {
|
|
return ui::VKEY_NUMPAD8;
|
|
} else if (str == "num9") {
|
|
return ui::VKEY_NUMPAD9;
|
|
} else if (str == "numadd") {
|
|
return ui::VKEY_ADD;
|
|
} else if (str == "nummult") {
|
|
return ui::VKEY_MULTIPLY;
|
|
} else if (str == "numdec") {
|
|
return ui::VKEY_DECIMAL;
|
|
} else if (str == "numsub") {
|
|
return ui::VKEY_SUBTRACT;
|
|
} else if (str == "numdiv") {
|
|
return ui::VKEY_DIVIDE;
|
|
} else if (str == "space") {
|
|
return ui::VKEY_SPACE;
|
|
} else if (str == "backspace") {
|
|
return ui::VKEY_BACK;
|
|
} else if (str == "delete") {
|
|
return ui::VKEY_DELETE;
|
|
} else if (str == "insert") {
|
|
return ui::VKEY_INSERT;
|
|
} else if (str == "enter" || str == "return") {
|
|
return ui::VKEY_RETURN;
|
|
} else if (str == "up") {
|
|
return ui::VKEY_UP;
|
|
} else if (str == "down") {
|
|
return ui::VKEY_DOWN;
|
|
} else if (str == "left") {
|
|
return ui::VKEY_LEFT;
|
|
} else if (str == "right") {
|
|
return ui::VKEY_RIGHT;
|
|
} else if (str == "home") {
|
|
return ui::VKEY_HOME;
|
|
} else if (str == "end") {
|
|
return ui::VKEY_END;
|
|
} else if (str == "pageup") {
|
|
return ui::VKEY_PRIOR;
|
|
} else if (str == "pagedown") {
|
|
return ui::VKEY_NEXT;
|
|
} else if (str == "esc" || str == "escape") {
|
|
return ui::VKEY_ESCAPE;
|
|
} else if (str == "volumemute") {
|
|
return ui::VKEY_VOLUME_MUTE;
|
|
} else if (str == "volumeup") {
|
|
return ui::VKEY_VOLUME_UP;
|
|
} else if (str == "volumedown") {
|
|
return ui::VKEY_VOLUME_DOWN;
|
|
} else if (str == "medianexttrack") {
|
|
return ui::VKEY_MEDIA_NEXT_TRACK;
|
|
} else if (str == "mediaprevioustrack") {
|
|
return ui::VKEY_MEDIA_PREV_TRACK;
|
|
} else if (str == "mediastop") {
|
|
return ui::VKEY_MEDIA_STOP;
|
|
} else if (str == "mediaplaypause") {
|
|
return ui::VKEY_MEDIA_PLAY_PAUSE;
|
|
} else if (str == "printscreen") {
|
|
return ui::VKEY_SNAPSHOT;
|
|
} else if (str.size() > 1 && str[0] == 'f') {
|
|
// F1 - F24.
|
|
int n;
|
|
if (base::StringToInt(str.c_str() + 1, &n) && n > 0 && n < 25) {
|
|
return static_cast<ui::KeyboardCode>(ui::VKEY_F1 + n - 1);
|
|
} else {
|
|
LOG(WARNING) << str << "is not available on keyboard";
|
|
return ui::VKEY_UNKNOWN;
|
|
}
|
|
} else {
|
|
if (str.size() > 2)
|
|
LOG(WARNING) << "Invalid accelerator token: " << str;
|
|
return ui::VKEY_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ui::KeyboardCode KeyboardCodeFromCharCode(char16_t c, bool* shifted) {
|
|
c = base::ToLowerASCII(c);
|
|
*shifted = false;
|
|
switch (c) {
|
|
case 0x08:
|
|
return ui::VKEY_BACK;
|
|
case 0x7F:
|
|
return ui::VKEY_DELETE;
|
|
case 0x09:
|
|
return ui::VKEY_TAB;
|
|
case 0x0D:
|
|
return ui::VKEY_RETURN;
|
|
case 0x1B:
|
|
return ui::VKEY_ESCAPE;
|
|
case ' ':
|
|
return ui::VKEY_SPACE;
|
|
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 ')':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '0':
|
|
return ui::VKEY_0;
|
|
case '!':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '1':
|
|
return ui::VKEY_1;
|
|
case '@':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '2':
|
|
return ui::VKEY_2;
|
|
case '#':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '3':
|
|
return ui::VKEY_3;
|
|
case '$':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '4':
|
|
return ui::VKEY_4;
|
|
case '%':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '5':
|
|
return ui::VKEY_5;
|
|
case '^':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '6':
|
|
return ui::VKEY_6;
|
|
case '&':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '7':
|
|
return ui::VKEY_7;
|
|
case '*':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '8':
|
|
return ui::VKEY_8;
|
|
case '(':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '9':
|
|
return ui::VKEY_9;
|
|
|
|
case ':':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case ';':
|
|
return ui::VKEY_OEM_1;
|
|
case '+':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '=':
|
|
return ui::VKEY_OEM_PLUS;
|
|
case '<':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case ',':
|
|
return ui::VKEY_OEM_COMMA;
|
|
case '_':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '-':
|
|
return ui::VKEY_OEM_MINUS;
|
|
case '>':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '.':
|
|
return ui::VKEY_OEM_PERIOD;
|
|
case '?':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '/':
|
|
return ui::VKEY_OEM_2;
|
|
case '~':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '`':
|
|
return ui::VKEY_OEM_3;
|
|
case '{':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '[':
|
|
return ui::VKEY_OEM_4;
|
|
case '|':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '\\':
|
|
return ui::VKEY_OEM_5;
|
|
case '}':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case ']':
|
|
return ui::VKEY_OEM_6;
|
|
case '"':
|
|
*shifted = true;
|
|
FALLTHROUGH;
|
|
case '\'':
|
|
return ui::VKEY_OEM_7;
|
|
|
|
default:
|
|
return ui::VKEY_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted) {
|
|
if (str.size() == 1)
|
|
return KeyboardCodeFromCharCode(str[0], shifted);
|
|
else
|
|
return KeyboardCodeFromKeyIdentifier(str, shifted);
|
|
}
|
|
|
|
} // namespace electron
|