Commit 7401e32f authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

Revert "Chrome OS: Add DOM |code| mappings for new action keys."

This reverts commit a49e194d.

Reason for revert: breaks ChromeOS Assistant key
Bug: b:130291631

Original change's description:
> Chrome OS: Add DOM |code| mappings for new action keys.
> 
> Wilco emits action key codes directly from kernel instead of
> function-key codes. This CL adds new Dom codes or fixes existing Dom
> codes accordingly. They are:
> 
> key code             Dom code
> -----------------------------------------------------
> KEY_SCALE            SHOW_ALL_WINDOWS (new)
> KEY_SWITCHVIDEOMODE  DISPLAY_TOGGLE_INT_EXT (new)
> KEY_ZOOM             ZOOM_TOGGLE (fix evdev/xkb value)
> KEY_ASSISTANT        LAUNCH_ASSISTANT (fix HID value)
> 
> Also removed invalid dom-code values for ZOOM_TOGGLE and
> LAUNCH_ASSISTANT.
> 
> Bug: 949730, 950099
> Change-Id: I3028cdcab82a4f806fc3a84f5b5bd64ffea053ce
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1549725
> Reviewed-by: Wez <wez@chromium.org>
> Commit-Queue: Georges Winkenbach <gwink@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#648388}

TBR=wez@chromium.org,garykac@chromium.org,dtor@chromium.org,gwink@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 949730, 950099
Change-Id: If1e0fc961eff0a08936d535dde4504542fe64058
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562618Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649698}
parent 7414eedc
...@@ -103,6 +103,9 @@ USB_KEYMAP_DECLARATION { ...@@ -103,6 +103,9 @@ USB_KEYMAP_DECLARATION {
USB_KEYMAP(0x000014, 0x0000, 0x0000, 0x0000, 0xffff, "Suspend", SUSPEND), USB_KEYMAP(0x000014, 0x0000, 0x0000, 0x0000, 0xffff, "Suspend", SUSPEND),
USB_KEYMAP(0x000015, 0x0000, 0x0000, 0x0000, 0xffff, "Resume", RESUME), USB_KEYMAP(0x000015, 0x0000, 0x0000, 0x0000, 0xffff, "Resume", RESUME),
USB_KEYMAP(0x000016, 0x0000, 0x0000, 0x0000, 0xffff, "Turbo", TURBO), USB_KEYMAP(0x000016, 0x0000, 0x0000, 0x0000, 0xffff, "Turbo", TURBO),
// AL Context-aware desktop assistant, not in HID specification (yet?)
USB_KEYMAP(0x000017, 0x0247, 0x024f, 0x0000, 0xffff, "LaunchAssistant",
LAUNCH_ASSISTANT),
// ========================================= // =========================================
// USB Usage Page 0x01: Generic Desktop Page // USB Usage Page 0x01: Generic Desktop Page
...@@ -113,9 +116,6 @@ USB_KEYMAP_DECLARATION { ...@@ -113,9 +116,6 @@ USB_KEYMAP_DECLARATION {
// USB evdev XKB Win Mac // USB evdev XKB Win Mac
USB_KEYMAP(0x010082, 0x008e, 0x0096, 0xe05f, 0xffff, "Sleep", SLEEP), // SystemSleep USB_KEYMAP(0x010082, 0x008e, 0x0096, 0xe05f, 0xffff, "Sleep", SLEEP), // SystemSleep
USB_KEYMAP(0x010083, 0x008f, 0x0097, 0xe063, 0xffff, "WakeUp", WAKE_UP), USB_KEYMAP(0x010083, 0x008f, 0x0097, 0xe063, 0xffff, "WakeUp", WAKE_UP),
USB_KEYMAP(0x0100b5, 0x00e3, 0x00eb, 0x0000, 0xffff, NULL,
DISPLAY_TOGGLE_INT_EXT), // System Display Toggle Int/Ext
// ========================================= // =========================================
// USB Usage Page 0x07: Keyboard/Keypad Page // USB Usage Page 0x07: Keyboard/Keypad Page
...@@ -539,9 +539,7 @@ USB_KEYMAP_DECLARATION { ...@@ -539,9 +539,7 @@ USB_KEYMAP_DECLARATION {
USB_KEYMAP(0x0c01ae, 0x0176, 0x017e, 0x0000, 0xffff, NULL, LAUNCH_KEYBOARD_LAYOUT), USB_KEYMAP(0x0c01ae, 0x0176, 0x017e, 0x0000, 0xffff, NULL, LAUNCH_KEYBOARD_LAYOUT),
USB_KEYMAP(0x0c01b1, 0x0245, 0x024d, 0x0000, 0xffff, "LaunchScreenSaver", USB_KEYMAP(0x0c01b1, 0x0245, 0x024d, 0x0000, 0xffff, "LaunchScreenSaver",
LAUNCH_SCREEN_SAVER), // AL Screen Saver LAUNCH_SCREEN_SAVER), // AL Screen Saver
USB_KEYMAP(0x0c01cb, 0x0247, 0x024f, 0x0000, 0xffff, NULL, // USB#0c01b4: Home Directory (AL_FileBrowser) (Explorer)
LAUNCH_ASSISTANT), // AL Context-aware desktop assistant
// USB#0c01b4: Home Directory (AL_FileBrowser) (Explorer)
//USB_KEYMAP(0x0c01b4, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LAUNCH_FILE_BROWSER), //USB_KEYMAP(0x0c01b4, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LAUNCH_FILE_BROWSER),
// USB#0x0c01b7: AL Audio Browser // USB#0x0c01b7: AL Audio Browser
USB_KEYMAP(0x0c01b7, 0x0188, 0x0190, 0x0000, 0xffff, NULL, LAUNCH_AUDIO_BROWSER), USB_KEYMAP(0x0c01b7, 0x0188, 0x0190, 0x0000, 0xffff, NULL, LAUNCH_AUDIO_BROWSER),
...@@ -576,8 +574,8 @@ USB_KEYMAP_DECLARATION { ...@@ -576,8 +574,8 @@ USB_KEYMAP_DECLARATION {
//USB_KEYMAP(0x0c0230, 0x0000, 0x0000, 0x0000, 0xffff, NULL, ZOOM_FULL), //USB_KEYMAP(0x0c0230, 0x0000, 0x0000, 0x0000, 0xffff, NULL, ZOOM_FULL),
// USB#0x0c0231: AC Normal View // USB#0x0c0231: AC Normal View
//USB_KEYMAP(0x0c0231, 0x0000, 0x0000, 0x0000, 0xffff, NULL, ZOOM_NORMAL), //USB_KEYMAP(0x0c0231, 0x0000, 0x0000, 0x0000, 0xffff, NULL, ZOOM_NORMAL),
USB_KEYMAP(0x0c0232, 0x0174, 0x017c, 0x0000, 0xffff, NULL, // USB#0x0c0232: AC View Toggle
ZOOM_TOGGLE), // AC View Toggle USB_KEYMAP(0x0c0232, 0x0000, 0x0000, 0x0000, 0xffff, "ZoomToggle", ZOOM_TOGGLE),
// USB#0x0c0279: AC Redo/Repeat // USB#0x0c0279: AC Redo/Repeat
USB_KEYMAP(0x0c0279, 0x00b6, 0x00be, 0x0000, 0xffff, NULL, REDO), USB_KEYMAP(0x0c0279, 0x00b6, 0x00be, 0x0000, 0xffff, NULL, REDO),
// USB#0x0c0289: AC_Reply // USB#0x0c0289: AC_Reply
...@@ -586,6 +584,4 @@ USB_KEYMAP_DECLARATION { ...@@ -586,6 +584,4 @@ USB_KEYMAP_DECLARATION {
USB_KEYMAP(0x0c028b, 0x00e9, 0x00f1, 0x0000, 0xffff, "MailForward", MAIL_FORWARD), USB_KEYMAP(0x0c028b, 0x00e9, 0x00f1, 0x0000, 0xffff, "MailForward", MAIL_FORWARD),
// USB#0x0c028c: AC_Send // USB#0x0c028c: AC_Send
USB_KEYMAP(0x0c028c, 0x00e7, 0x00ef, 0x0000, 0xffff, "MailSend", MAIL_SEND), USB_KEYMAP(0x0c028c, 0x00e7, 0x00ef, 0x0000, 0xffff, "MailSend", MAIL_SEND),
USB_KEYMAP(0x0c029f, 0x0078, 0x0080, 0x0000, 0xffff, NULL,
SHOW_ALL_WINDOWS), // AC Desktop Show All Windows
}; };
...@@ -24,10 +24,10 @@ namespace { ...@@ -24,10 +24,10 @@ namespace {
// These are in the same order as the columns in keycode_converter_data.inc // These are in the same order as the columns in keycode_converter_data.inc
// as reflected in the USB_KEYMAP() macro below. // as reflected in the USB_KEYMAP() macro below.
const size_t expected_mapped_key_count[] = { const size_t expected_mapped_key_count[] = {
211, // evdev 208, // evdev
211, // xkb 208, // xkb
157, // windows 157, // windows
118, // mac 118, // mac
}; };
const size_t kNativeColumns = base::size(expected_mapped_key_count); const size_t kNativeColumns = base::size(expected_mapped_key_count);
......
...@@ -416,6 +416,10 @@ const struct DomCodeToKeyboardCodeEntry { ...@@ -416,6 +416,10 @@ const struct DomCodeToKeyboardCodeEntry {
// DomCode::SUSPEND 0x000014 Suspend // DomCode::SUSPEND 0x000014 Suspend
// DomCode::RESUME 0x000015 Resume // DomCode::RESUME 0x000015 Resume
// DomCode::TURBO 0x000016 Turbo // DomCode::TURBO 0x000016 Turbo
#if defined(OS_POSIX)
{DomCode::LAUNCH_ASSISTANT,
VKEY_ASSISTANT}, // 0x000017 Launch Assistant
#endif
{DomCode::SLEEP, VKEY_SLEEP}, // 0x010082 Sleep {DomCode::SLEEP, VKEY_SLEEP}, // 0x010082 Sleep
// DomCode::WAKE_UP 0x010083 WakeUp // DomCode::WAKE_UP 0x010083 WakeUp
{DomCode::US_A, VKEY_A}, // 0x070004 KeyA {DomCode::US_A, VKEY_A}, // 0x070004 KeyA
...@@ -600,8 +604,6 @@ const struct DomCodeToKeyboardCodeEntry { ...@@ -600,8 +604,6 @@ const struct DomCodeToKeyboardCodeEntry {
#if defined(OS_POSIX) #if defined(OS_POSIX)
{DomCode::LAUNCH_CONTROL_PANEL, {DomCode::LAUNCH_CONTROL_PANEL,
VKEY_SETTINGS}, // 0x0C019F Launch Assistant VKEY_SETTINGS}, // 0x0C019F Launch Assistant
{DomCode::LAUNCH_ASSISTANT,
VKEY_ASSISTANT}, // 0x0C01CB Launch Assistant
#endif #endif
{DomCode::BROWSER_SEARCH, {DomCode::BROWSER_SEARCH,
VKEY_BROWSER_SEARCH}, // 0x0C0221 BrowserSearch VKEY_BROWSER_SEARCH}, // 0x0C0221 BrowserSearch
......
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