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

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

Issue 1284433002: Revise ui::DomKey to unify character and non-character codes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsDead Created 5 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
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_x.h ('k') | ui/events/keycodes/keyboard_code_conversion_xkb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9b0dc90f790cf91238ccd96341b6aebecc6710de..2b1155772f9e0971d50fac57c03ada6523e50c53 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
@@ -900,7 +900,7 @@ uint16 GetCharacterFromXEvent(const XEvent* xev) {
return GetUnicodeCharacterFromXKeySym(keysym);
}
-void GetMeaningFromXEvent(const XEvent* xev, DomKey* key, base::char16* ch) {
+DomKey GetDomKeyFromXEvent(const XEvent* xev) {
XEvent xkeyevent = {0};
const XKeyEvent* xkey = NULL;
if (xev->type == GenericEvent) {
@@ -913,8 +913,8 @@ void GetMeaningFromXEvent(const XEvent* xev, DomKey* key, base::char16* ch) {
}
KeySym keysym = XK_VoidSymbol;
XLookupString(const_cast<XKeyEvent*>(xkey), NULL, 0, &keysym, NULL);
- *ch = GetUnicodeCharacterFromXKeySym(keysym);
- *key = XKeySymToDomKey(keysym, *ch);
+ base::char16 ch = GetUnicodeCharacterFromXKeySym(keysym);
+ return XKeySymToDomKey(keysym, ch);
}
KeyboardCode DefaultKeyboardCodeFromHardwareKeycode(
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_x.h ('k') | ui/events/keycodes/keyboard_code_conversion_xkb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698