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

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

Issue 430463005: linux/cros: Supports XKeyEvent to Unicode conversion independent from user's locale. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed sadrul's review comments. Created 6 years, 4 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
Index: ui/events/keycodes/keyboard_code_conversion_x.cc
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.cc b/ui/events/keycodes/keyboard_code_conversion_x.cc
index efbf1d427e47edd5b6e9071e8a3d9aff1f1d85c7..adfebfd9c27797802c0fc8784a4504f57581d988 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
@@ -19,6 +19,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/x/keysym_to_unicode.h"
#define VKEY_UNSUPPORTED VKEY_UNKNOWN
@@ -476,7 +477,7 @@ KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev) {
// 8. If not found, fallback to find with the hardware code in US layout.
KeySym keysym = NoSymbol;
- XEvent xkeyevent;
+ XEvent xkeyevent = {0};
if (xev->type == GenericEvent) {
// Convert the XI2 key event into a core key event so that we can
// continue to use XLookupString() until crbug.com/367732 is complete.
@@ -841,9 +842,8 @@ const char* CodeFromXEvent(const XEvent* xev) {
}
uint16 GetCharacterFromXEvent(const XEvent* xev) {
- XEvent xkeyevent;
+ XEvent xkeyevent = {0};
const XKeyEvent* xkey = NULL;
- char buf[6];
if (xev->type == GenericEvent) {
// Convert the XI2 key event into a core key event so that we can
// continue to use XLookupString() until crbug.com/367732 is complete.
@@ -852,15 +852,9 @@ uint16 GetCharacterFromXEvent(const XEvent* xev) {
} else {
xkey = &xev->xkey;
}
- int bytes_written =
- XLookupString(const_cast<XKeyEvent*>(xkey), buf, 6, NULL, NULL);
- DCHECK_LE(bytes_written, 6);
-
- if (bytes_written <= 0)
- return 0;
- const base::string16& result = base::WideToUTF16(
- base::SysNativeMBToWide(base::StringPiece(buf, bytes_written)));
- return result.length() == 1 ? result[0] : 0;
+ KeySym keysym = XK_VoidSymbol;
+ XLookupString(const_cast<XKeyEvent*>(xkey), NULL, 0, &keysym, NULL);
+ return GetUnicodeCharacterFromXKeySym(keysym);
}
KeyboardCode DefaultKeyboardCodeFromHardwareKeycode(

Powered by Google App Engine
This is Rietveld 408576698