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

Unified Diff: branches/1916/src/ui/events/x/events_x.cc

Issue 253183002: Revert 266967 "Merge 266651 "linux-aura: Supports Compose key wi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « branches/1916/src/ui/events/event_constants.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: branches/1916/src/ui/events/x/events_x.cc
===================================================================
--- branches/1916/src/ui/events/x/events_x.cc (revision 266977)
+++ branches/1916/src/ui/events/x/events_x.cc (working copy)
@@ -148,31 +148,6 @@
return flags;
}
-int GetEventFlagsFromXKeyEvent(XEvent* xevent) {
- DCHECK(xevent->type == KeyPress || xevent->type == KeyRelease);
-
-#if defined(OS_CHROMEOS)
- const int ime_fabricated_flag = 0;
-#else
- // XIM fabricates key events for the character compositions by XK_Multi_key.
- // For example, when a user hits XK_Multi_key, XK_apostrophe, and XK_e in
- // order to input "é", then XIM generates a key event with keycode=0 and
- // state=0 for the composition, and the sequence of X11 key events will be
- // XK_Multi_key, XK_apostrophe, **NoSymbol**, and XK_e.
- //
- // We have to send these fabricated key events to XIM so it can correctly
- // handle the character compositions.
- const bool fabricated_by_xim =
- xevent->xkey.keycode == 0 && xevent->xkey.state == 0;
- const int ime_fabricated_flag =
- fabricated_by_xim ? ui::EF_IME_FABRICATED_KEY : 0;
-#endif
-
- return GetEventFlagsFromXState(xevent->xkey.state) |
- (IsKeypadKey(XLookupKeysym(&xevent->xkey, 0)) ? ui::EF_NUMPAD_KEY : 0) |
- ime_fabricated_flag;
-}
-
// Get the event flag for the button in XButtonEvent. During a ButtonPress
// event, |state| in XButtonEvent does not include the button that has just been
// pressed. Instead |state| contains flags for the buttons (if any) that had
« no previous file with comments | « branches/1916/src/ui/events/event_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698