summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-31 01:48:16 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-31 01:48:16 +0000
commit351f98f4ca2af4f9d3ceb48bb15c62279004b48f (patch)
treed6364c1fdc8320274ca694e4e24f803354914567 /ui
parent92f5408cc55cda3217eed2dd6a9d44e5b8999a8f (diff)
downloadchromium_src-351f98f4ca2af4f9d3ceb48bb15c62279004b48f.zip
chromium_src-351f98f4ca2af4f9d3ceb48bb15c62279004b48f.tar.gz
chromium_src-351f98f4ca2af4f9d3ceb48bb15c62279004b48f.tar.bz2
Make '=' and function keys on a keypad work.
BUG=139407 TEST=None Review URL: https://chromiumcodereview.appspot.com/10832055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/keycodes/keyboard_code_conversion_x.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index aecee1d..82df83f 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc
@@ -64,10 +64,10 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
case XK_KP_End:
return VKEY_END;
case XK_Page_Up:
- case XK_KP_Page_Up:
+ case XK_KP_Page_Up: // aka XK_KP_Prior
return VKEY_PRIOR;
case XK_Page_Down:
- case XK_KP_Page_Down:
+ case XK_KP_Page_Down: // aka XK_KP_Next
return VKEY_NEXT;
case XK_Left:
case XK_KP_Left:
@@ -235,6 +235,7 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
return VKEY_DECIMAL;
case XK_KP_Divide:
return VKEY_DIVIDE;
+ case XK_KP_Equal:
case XK_equal:
case XK_plus:
return VKEY_OEM_PLUS;
@@ -329,6 +330,11 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
case XK_F23:
case XK_F24:
return static_cast<KeyboardCode>(VKEY_F1 + (keysym - XK_F1));
+ case XK_KP_F1:
+ case XK_KP_F2:
+ case XK_KP_F3:
+ case XK_KP_F4:
+ return static_cast<KeyboardCode>(VKEY_F1 + (keysym - XK_KP_F1));
#if defined(TOOLKIT_GTK)
case XF86XK_Refresh: