Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1058)

Unified Diff: ui/base/keycodes/keyboard_code_conversion_x.cc

Issue 10832055: Make '=' and function keys on a keypad work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/keycodes/keyboard_code_conversion_x.cc
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index aecee1dba3d7eabd6cf278fab8847d027b18cb96..82df83fd658d488ed585e8e0775e1d5af9332a37 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:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698