diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 02:57:42 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 02:57:42 +0000 |
| commit | a09cd786acd8e51cbdba84bd4c87f41d9751e9a8 (patch) | |
| tree | e7e73d4888535b71674475fe1b1d482b24a594ef /remoting | |
| parent | c49a223326b4d40574aa9fbc2250644e2a8080e0 (diff) | |
| download | chromium_src-a09cd786acd8e51cbdba84bd4c87f41d9751e9a8.zip chromium_src-a09cd786acd8e51cbdba84bd4c87f41d9751e9a8.tar.gz chromium_src-a09cd786acd8e51cbdba84bd4c87f41d9751e9a8.tar.bz2 | |
Fix VK -> XK mapping for VK_LSHIFT -> XK_Shift_L (and _R versions).
Add a few missing entries.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9416046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/event_executor_linux.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/event_executor_linux.cc b/remoting/host/event_executor_linux.cc index 0455925..98ac3c3 100644 --- a/remoting/host/event_executor_linux.cc +++ b/remoting/host/event_executor_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -92,7 +92,7 @@ int VerticalScrollWheelToX11ButtonNumber(int dy) { // host's keyboard layout (see http://crbug.com/74550 ). const int kUsVkeyToKeysym[256] = { // 0x00 - 0x07 - -1, -1, -1, -1, + -1, -1, -1, XK_Cancel, // 0x04 - 0x07 -1, -1, -1, -1, // 0x08 - 0x0B @@ -103,9 +103,9 @@ const int kUsVkeyToKeysym[256] = { // 0x10 - 0x13 XK_Shift_L, XK_Control_L, XK_Alt_L, XK_Pause, // 0x14 - 0x17 - XK_Caps_Lock, XK_Kana_Shift, -1, /* VKEY_JUNJA */ -1, + XK_Caps_Lock, XK_Kana_Shift, -1, XK_Hangul_Jeonja, // 0x18 - 0x1B - /* VKEY_FINAL */ -1, XK_Kanji, -1, XK_Escape, + XK_Hangul_End, XK_Kanji, -1, XK_Escape, // 0x1C - 0x1F XK_Henkan, XK_Muhenkan, /* VKEY_ACCEPT */ -1, XK_Mode_switch, @@ -182,7 +182,7 @@ const int kUsVkeyToKeysym[256] = { -1, -1, -1, -1, // 0xA0 - 0xA3 - XK_Num_Lock, XK_Scroll_Lock, XK_Control_L, XK_Control_R, + XK_Shift_L, XK_Shift_R, XK_Control_L, XK_Control_R, // 0xA4 - 0xA7 XK_Meta_L, XK_Meta_R, XF86XK_Back, XF86XK_Forward, // 0xA8 - 0xAB |