summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 20:35:49 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 20:35:49 +0000
commitce81fbd0639597fc084d27100ca8422900d12e9b (patch)
tree53a62c2ecae84c423269ec856de38cc2ea8f6c74 /ui
parent8ac3d7f37c22968d8a9863e772939fd39b2894af (diff)
downloadchromium_src-ce81fbd0639597fc084d27100ca8422900d12e9b.zip
chromium_src-ce81fbd0639597fc084d27100ca8422900d12e9b.tar.gz
chromium_src-ce81fbd0639597fc084d27100ca8422900d12e9b.tar.bz2
Convert keysym to keycode for modifiers
Set mask after sending modifier keys. Print unknown keysym in hex and add warning for unknown keycode. BUG=106630 TEST=All BrowserKeyEventsTest except for AccessKey will pass Review URL: http://codereview.chromium.org/8836007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/keycodes/keyboard_code_conversion_x.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index eda35b4..d7f8372 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
+#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
namespace ui {
@@ -43,6 +44,7 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
return VKEY_DELETE;
case XK_Tab:
case XK_KP_Tab:
+ case XK_ISO_Left_Tab:
return VKEY_TAB;
case XK_Linefeed:
case XK_Return:
@@ -313,8 +315,7 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
// TODO(sad): some keycodes are still missing.
}
-
- DLOG(WARNING) << "Unknown keycode: " << keysym;
+ DLOG(WARNING) << "Unknown keysym: " << StringPrintf("0x%x", keysym);
return VKEY_UNKNOWN;
}
@@ -616,6 +617,7 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) {
return XK_F1 + (keycode - VKEY_F1);
default:
+ LOG(WARNING) << "Unknown keycode:" << keycode;
return 0;
}
}