diff options
Diffstat (limited to 'ui/base/keycodes')
-rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_x.cc | 14 | ||||
-rw-r--r-- | ui/base/keycodes/keyboard_codes_posix.h | 4 | ||||
-rw-r--r-- | ui/base/keycodes/keyboard_codes_win.h | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc index 32aac637..23511f6 100644 --- a/ui/base/keycodes/keyboard_code_conversion_x.cc +++ b/ui/base/keycodes/keyboard_code_conversion_x.cc @@ -91,6 +91,12 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) { return VKEY_HANJA; case XK_Kanji: return VKEY_KANJI; + case XK_Henkan: + return VKEY_CONVERT; + case XK_Muhenkan: + return VKEY_NONCONVERT; + case XK_Zenkaku_Hankaku: + return VKEY_DBE_DBCSCHAR; case XK_A: case XK_a: return VKEY_A; @@ -512,6 +518,14 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) { return XK_Kana_Lock; case VKEY_HANJA: return XK_Hangul_Hanja; + case VKEY_CONVERT: + return XK_Henkan; + case VKEY_NONCONVERT: + return XK_Muhenkan; + case VKEY_DBE_SBCSCHAR: + return XK_Zenkaku_Hankaku; + case VKEY_DBE_DBCSCHAR: + return XK_Zenkaku_Hankaku; case VKEY_ESCAPE: return XK_Escape; case VKEY_SPACE: diff --git a/ui/base/keycodes/keyboard_codes_posix.h b/ui/base/keycodes/keyboard_codes_posix.h index 023701e..c9757b8 100644 --- a/ui/base/keycodes/keyboard_codes_posix.h +++ b/ui/base/keycodes/keyboard_codes_posix.h @@ -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. @@ -193,6 +193,8 @@ typedef enum { VKEY_OEM_102 = 0xE2, VKEY_PROCESSKEY = 0xE5, VKEY_PACKET = 0xE7, + VKEY_DBE_SBCSCHAR = 0xF3, + VKEY_DBE_DBCSCHAR = 0xF4, VKEY_ATTN = 0xF6, VKEY_CRSEL = 0xF7, VKEY_EXSEL = 0xF8, diff --git a/ui/base/keycodes/keyboard_codes_win.h b/ui/base/keycodes/keyboard_codes_win.h index 362fc5f..060c9c7 100644 --- a/ui/base/keycodes/keyboard_codes_win.h +++ b/ui/base/keycodes/keyboard_codes_win.h @@ -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. @@ -7,6 +7,7 @@ #pragma once #include <windows.h> +#include <ime.h> namespace ui { @@ -169,6 +170,8 @@ typedef enum { VKEY_OEM_102 = VK_OEM_102, VKEY_PROCESSKEY = VK_PROCESSKEY, VKEY_PACKET = VK_PACKET, + VKEY_DBE_SBCSCHAR = VK_DBE_SBCSCHAR, + VKEY_DBE_DBCSCHAR = VK_DBE_DBCSCHAR, VKEY_ATTN = VK_ATTN, VKEY_CRSEL = VK_CRSEL, VKEY_EXSEL = VK_EXSEL, |