IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

ui/base/ime/input_method_base.cc

Index: ui/base/ime/input_method_base.cc
diff --git a/ui/base/ime/input_method_base.cc b/ui/base/ime/input_method_base.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e11a82e405f2ff799f5e6d7735c344e9f5798214
--- /dev/null
+++ b/ui/base/ime/input_method_base.cc
@@ -0,0 +1,110 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/base/ime/input_method_base.h"
+
+#include "base/logging.h"
+#include "ui/base/ime/input_method_delegate.h"
+#include "ui/base/ime/text_input_client.h"
+
+#if defined(USE_X11)
+#include <X11/Xlib.h>
+#include "base/message_pump_x.h"
+#endif
+
+namespace ui {
+
+InputMethodBase::InputMethodBase()
+  : delegate_(NULL),
+    text_input_client_(NULL),
+    system_toplevel_window_focused_(false) {
+}
+
+InputMethodBase::~InputMethodBase() {
+}
+
+void InputMethodBase::set_delegate(
+    internal::InputMethodDelegate* delegate) {
+  DCHECK(delegate);
+  delegate_ = delegate;
+}
+
+void InputMethodBase::Init(const base::NativeWindow& system_toplevel_window) {
+#if defined(USE_X11)
+  Window focus = None;
+  int revert_to = 0;
+  XGetInputFocus(base::MessagePumpX::GetDefaultXDisplay(), &focus, &revert_to);
+  if (focus == system_toplevel_window)
+    OnFocus();
+#else
+  // TODO(yusukes): Add OS_WIN implementation here.
+  NOTIMPLEMENTED();
+#endif
+}
+
+void InputMethodBase::OnFocus() {
+  DCHECK(!system_toplevel_window_focused_);
+  system_toplevel_window_focused_ = true;
+}
+
+void InputMethodBase::OnBlur() {
+  DCHECK(system_toplevel_window_focused_);
+  system_toplevel_window_focused_ = false;
+}
+
+void InputMethodBase::SetFocusedTextInputClient(TextInputClient* client) {
+  text_input_client_ = client;  // NULL allowed.
+  if (!client)

[James Su, 2011/11/30 02:32:18]

I think we still need to reset the input method when the current client loses
focus. See what the old code in views::InputMethodIBus::OnWillChangeFocus() and
OnDidChangeFocus() did. Perhaps we can introduce similar thing in the new code.

[Yusuke Sato, 2011/11/30 04:23:08]

Added such functions. Please take another look at InputMethod{Base,IBus}.{cc.h}.

On 2011/11/30 02:32:18, James Su wrote:

+    return;
+  // Force to update the input type since client's TextInputStateChanged()
+  // function might not be called if text input types before the client loses
+  // focus and after it acquires focus again are the same.
+  OnTextInputTypeChanged(client);
+  // Force to update caret bounds, in case the client thinks that the caret
+  // bounds has not changed.
+  OnCaretBoundsChanged(client);
+}
+
+TextInputClient* InputMethodBase::GetTextInputClient() const {
+  return system_toplevel_window_focused_ ? text_input_client_ : NULL;
+}
+
+void InputMethodBase::OnTextInputTypeChanged(const TextInputClient* client) {
+  if (!IsTextInputClientFocused(client))
+    return;
+  // TODO(yusukes): Support TextInputTypeTracker for TOUCH_UI.
+}
+
+TextInputType InputMethodBase::GetTextInputType() const {
+  TextInputClient* client = GetTextInputClient();
+  return client ? client->GetTextInputType() : TEXT_INPUT_TYPE_NONE;
+}
+
+bool InputMethodBase::IsTextInputClientFocused(const TextInputClient* client) {
+  return client && (client == GetTextInputClient());
+}
+
+bool InputMethodBase::IsTextInputTypeNone() const {
+  return GetTextInputType() == TEXT_INPUT_TYPE_NONE;
+}
+
+void InputMethodBase::OnInputMethodChanged() const {
+  TextInputClient* client = GetTextInputClient();
+  if (client && client->GetTextInputType() != TEXT_INPUT_TYPE_NONE)
+    client->OnInputMethodChanged();
+}
+
+void InputMethodBase::DispatchKeyEventPostIME(
+    const base::NativeEvent& native_event) const {
+  if (delegate_)
+    delegate_->DispatchKeyEventPostIME(native_event);
+}
+
+void InputMethodBase::DispatchFabricatedKeyEventPostIME(
+    EventType type, KeyboardCode key_code, int flags) const {
+  if (delegate_)
+    delegate_->DispatchFabricatedKeyEventPostIME(type, key_code, flags);
+}
+
+}  // namespace ui