diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 19:55:07 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 19:55:07 +0000 |
| commit | 79c44e5f770b32960b66235880e5de1009389561 (patch) | |
| tree | 63e5b0b3340a0e028da84843e22acdadf18760b3 /ui/base/keycodes | |
| parent | 8b987e967d42766f1c0087bbb710e34f084d6aa3 (diff) | |
| download | chromium_src-79c44e5f770b32960b66235880e5de1009389561.zip chromium_src-79c44e5f770b32960b66235880e5de1009389561.tar.gz chromium_src-79c44e5f770b32960b66235880e5de1009389561.tar.bz2 | |
Fix international-backslash key in Canadian French keyboard.
Adding guillemotleft, guillemotright and degree condition into
KeyboardCodeFromXKeysym.
These KeySym is used in Canadian French keyboard.
BUG=175624
TEST=Checked with typing international-backslash key on Canadian French keyboard.
Review URL: https://chromiumcodereview.appspot.com/12211127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/keycodes')
| -rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_x.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc index d571ce8..9d79faf 100644 --- a/ui/base/keycodes/keyboard_code_conversion_x.cc +++ b/ui/base/keycodes/keyboard_code_conversion_x.cc @@ -336,6 +336,11 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) { case XK_KP_F4: return static_cast<KeyboardCode>(VKEY_F1 + (keysym - XK_KP_F1)); + case XK_guillemotleft: + case XK_guillemotright: + case XK_degree: + return VKEY_OEM_102; // international backslash key in 102 keyboard. + // When evdev is in use, /usr/share/X11/xkb/symbols/inet maps F13-18 keys // to the special XF86XK symbols to support Microsoft Ergonomic keyboards: // https://bugs.freedesktop.org/show_bug.cgi?id=5783 @@ -701,6 +706,8 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) { return shift ? XK_braceright : XK_bracketright; case VKEY_OEM_7: return shift ? XK_quotedbl : XK_quoteright; + case VKEY_OEM_102: + return shift ? XK_guillemotleft : XK_guillemotright; case VKEY_F1: case VKEY_F2: |