Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / ui / base / ime / input_method_auralinux.cc

diff --git a/src/ui/base/ime/input_method_auralinux.cc b/src/ui/base/ime/input_method_auralinux.cc
index c31576d..1bf2017 100644 (file)
--- a/src/ui/base/ime/input_method_auralinux.cc
+++ b/src/ui/base/ime/input_method_auralinux.cc
@@ -18,36 +18,6 @@ InputMethodAuraLinux::InputMethodAuraLinux(
 
 InputMethodAuraLinux::~InputMethodAuraLinux() {}
 
-// static
-void InputMethodAuraLinux::Initialize() {
-#if (USE_X11)
-  // Force a IBus IM context to run in synchronous mode.
-  //
-  // Background: IBus IM context runs by default in asynchronous mode.  In
-  // this mode, gtk_im_context_filter_keypress() consumes all the key events
-  // and returns true while asynchronously sending the event to an underlying
-  // IME implementation.  When the event has not actually been consumed by
-  // the underlying IME implementation, the context pushes the event back to
-  // the GDK event queue marking the event as already handled by the IBus IM
-  // context.
-  //
-  // The problem here is that those pushed-back GDK events are never handled
-  // when base::MessagePumpX11 is used, which only handles X events.  So, we
-  // make a IBus IM context run in synchronous mode by setting an environment
-  // variable.  This is only the interface to change the mode.
-  //
-  // Another possible solution is to use GDK event loop instead of X event
-  // loop.
-  //
-  // Since there is no reentrant version of setenv(3C), it's a caller's duty
-  // to avoid race conditions.  This function should be called in the main
-  // thread on a very early stage, and supposed to be called from
-  // ui::InitializeInputMethod().
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  env->SetVar("IBUS_ENABLE_SYNC_MODE", "1");
-#endif
-}
-
 // Overriden from InputMethod.
 
 void InputMethodAuraLinux::Init(bool focused) {
@@ -86,7 +56,8 @@ bool InputMethodAuraLinux::DispatchKeyEvent(const ui::KeyEvent& event) {
 
   // Let an IME handle the key event first.
   if (input_method_context_->DispatchKeyEvent(event)) {
-    if (event.type() == ET_KEY_PRESSED) {
+    if (event.type() == ET_KEY_PRESSED &&
+        (event.flags() & ui::EF_IME_FABRICATED_KEY) == 0) {
       const ui::KeyEvent fabricated_event(ET_KEY_PRESSED,
                                           VKEY_PROCESSKEY,
                                           event.flags(),