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

Unified Diff: ui/events/x/events_x.cc

Issue 243143002: linux-aura: Supports Compose key with XIM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments. Created 6 years, 8 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/x/events_x.cc
diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc
index 7a3ff70e6aae0cbb5281e377e1e8ae5244dee7e7..d449a5fd839ce70062646ef10a614b9c09a4d787 100644
--- a/ui/events/x/events_x.cc
+++ b/ui/events/x/events_x.cc
@@ -150,7 +150,8 @@ int GetEventFlagsFromXState(unsigned int state) {
int GetEventFlagsFromXKeyEvent(XEvent* xevent) {
return GetEventFlagsFromXState(xevent->xkey.state) |
- (IsKeypadKey(XLookupKeysym(&xevent->xkey, 0)) ? ui::EF_NUMPAD_KEY : 0);
+ (IsKeypadKey(XLookupKeysym(&xevent->xkey, 0)) ? ui::EF_NUMPAD_KEY : 0) |
+ (ui::IsXKeyEventFabricatedByIme(xevent) ? ui::EF_IME_FABRICATED_KEY : 0);
}
// Get the event flag for the button in XButtonEvent. During a ButtonPress

Powered by Google App Engine
This is Rietveld 408576698