Replace InputMethodEngineIBus.

chrome/browser/chromeos/input_method/input_method_engine.cc

Index: chrome/browser/chromeos/input_method/input_method_engine.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc
index 5afa635d7b11d31bbde22e2c94461d15bb0abebc..05df7585fb48dc1015dc79a8712f23ccab64d3ec 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine.cc
@@ -4,23 +4,10 @@
 
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 
-#include <map>
-
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
-#include "chrome/browser/chromeos/input_method/ibus_engine_controller.h"
-#include "chrome/browser/chromeos/input_method/ibus_keymap.h"
-#include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/input_method_util.h"
+#include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 
 namespace chromeos {
 
-const char* kExtensionImePrefix = "_ext_ime_";
-const char* kErrorNotActive = "IME is not active";
-const char* kErrorWrongContext = "Context is not active";
-const char* kCandidateNotFound = "Candidate not found";
-
 InputMethodEngine::KeyboardEvent::KeyboardEvent()
     : alt_key(false),
       ctrl_key(false),
@@ -45,585 +32,6 @@ InputMethodEngine::Candidate::~Candidate() {
 InputMethodEngine::Observer::~Observer() {
 }
 
-class InputMethodEngineImpl
-    : public InputMethodEngine,
-      public input_method::IBusEngineController::Observer {
- public:
-  InputMethodEngineImpl()
-      : observer_(NULL), active_(false), next_context_id_(1),
-        context_id_(-1) {}
-
-  ~InputMethodEngineImpl() {
-    input_method::InputMethodManager* manager =
-        input_method::InputMethodManager::GetInstance();
-    manager->RemoveInputMethodExtension(ibus_id_);
-  }
-
-  bool Init(InputMethodEngine::Observer* observer,
-            const char* engine_name,
-            const char* extension_id,
-            const char* engine_id,
-            const char* description,
-            const char* language,
-            const std::vector<std::string>& layouts,
-            std::string* error);
-
-  virtual bool SetComposition(int context_id,
-                              const char* text, int selection_start,
-                              int selection_end, int cursor,
-                              const std::vector<SegmentInfo>& segments,
-                              std::string* error);
-  virtual bool ClearComposition(int context_id,
-                                std::string* error);
-  virtual bool CommitText(int context_id,
-                          const char* text, std::string* error);
-  virtual bool SetCandidateWindowVisible(bool visible, std::string* error);
-  virtual void SetCandidateWindowCursorVisible(bool visible);
-  virtual void SetCandidateWindowVertical(bool vertical);
-  virtual void SetCandidateWindowPageSize(int size);
-  virtual void SetCandidateWindowAuxText(const char* text);
-  virtual void SetCandidateWindowAuxTextVisible(bool visible);
-  virtual bool SetCandidates(int context_id,
-                             const std::vector<Candidate>& candidates,
-                             std::string* error);
-  virtual bool SetCursorPosition(int context_id, int candidate_id,
-                                 std::string* error);
-  virtual bool SetMenuItems(const std::vector<MenuItem>& items);
-  virtual bool UpdateMenuItems(const std::vector<MenuItem>& items);
-  virtual bool IsActive() const {
-    return active_;
-  }
-  virtual void KeyEventDone(input_method::KeyEventHandle* key_data,
-                            bool handled);
-
-  virtual void OnReset();
-  virtual void OnEnable();
-  virtual void OnDisable();
-  virtual void OnFocusIn();
-  virtual void OnFocusOut();
-  virtual void OnKeyEvent(bool key_press, unsigned int keyval,
-                          unsigned int keycode, bool alt_key, bool ctrl_key,
-                          bool shift_key,
-                          input_method::KeyEventHandle* key_data);
-  virtual void OnPropertyActivate(const char* name, unsigned int state);
-  virtual void OnCandidateClicked(unsigned int index, unsigned int button,
-                                  unsigned int state);
- private:
-  bool MenuItemToProperty(
-      const MenuItem& item,
-      input_method::IBusEngineController::EngineProperty* property);
-
-  // Pointer to the object recieving events for this IME.
-  InputMethodEngine::Observer* observer_;
-
-  // Connection to IBus.
-  scoped_ptr<input_method::IBusEngineController> connection_;
-
-  // True when this IME is active, false if deactive.
-  bool active_;
-
-  // Next id that will be assigned to a context.
-  int next_context_id_;
-
-  // ID that is used for the current input context.  False if there is no focus.
-  int context_id_;
-
-  // User specified id of this IME.
-  std::string engine_id_;
-
-  // ID used by ibus to reference this IME.
-  std::string ibus_id_;
-
-  // Mapping of candidate index to candidate id.
-  std::vector<int> candidate_ids_;
-
-  // Mapping of candidate id to index.
-  std::map<int, int> candidate_indexes_;
-};
-
-bool InputMethodEngineImpl::Init(InputMethodEngine::Observer* observer,
-                                 const char* engine_name,
-                                 const char* extension_id,
-                                 const char* engine_id,
-                                 const char* description,
-                                 const char* language,
-                                 const std::vector<std::string>& layouts,
-                                 std::string* error) {
-  ibus_id_ = kExtensionImePrefix;
-  ibus_id_ += extension_id;
-  ibus_id_ += engine_id;
-
-  std::string layout;
-  input_method::InputMethodManager* manager =
-      input_method::InputMethodManager::GetInstance();
-
-  if (!layouts.empty()) {
-    layout = JoinString(layouts, ',');
-  } else {
-    const std::string fallback_id =
-        manager->GetInputMethodUtil()->GetHardwareInputMethodId();
-    const input_method::InputMethodDescriptor* fallback_desc =
-        manager->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
-            fallback_id);
-    layout = fallback_desc->keyboard_layout();
-  }
-
-  connection_.reset(input_method::IBusEngineController::Create(this,
-                                                               ibus_id_.c_str(),
-                                                               engine_name,
-                                                               description,
-                                                               language,
-                                                               layout.c_str()));
-  if (!connection_.get()) {
-    *error = "ConnectInputMethodExtension() failed.";
-    return false;
-  }
-
-  observer_ = observer;
-  engine_id_ = engine_id;
-  manager->AddInputMethodExtension(ibus_id_, engine_name, layouts, language);
-  return true;
-}
-
-bool InputMethodEngineImpl::SetComposition(
-    int context_id,
-    const char* text,
-    int selection_start,
-    int selection_end,
-    int cursor,
-    const std::vector<SegmentInfo>& segments,
-    std::string* error) {
-  if (!active_) {
-    *error = kErrorNotActive;
-    return false;
-  }
-  if (context_id != context_id_ || context_id_ == -1) {
-    *error = kErrorWrongContext;
-    return false;
-  }
-
-  connection_->SetPreeditText(text, cursor);
-  // TODO: Add support for displaying selected text in the composition string.
-  for (std::vector<SegmentInfo>::const_iterator segment = segments.begin();
-       segment != segments.end(); ++segment) {
-    int style;
-    switch (segment->style) {
-      case SEGMENT_STYLE_UNDERLINE:
-        style = input_method::IBusEngineController::UNDERLINE_SINGLE;
-        break;
-      case SEGMENT_STYLE_DOUBLE_UNDERLINE:
-        style = input_method::IBusEngineController::UNDERLINE_DOUBLE;
-        break;
-
-      default:
-        continue;
-    }
-
-    connection_->SetPreeditUnderline(segment->start, segment->end, style);
-  }
-  return true;
-}
-
-bool InputMethodEngineImpl::ClearComposition(int context_id,
-                                             std::string* error) {
-  if (!active_) {
-    *error = kErrorNotActive;
-    return false;
-  }
-  if (context_id != context_id_ || context_id_ == -1) {
-    *error = kErrorWrongContext;
-    return false;
-  }
-
-  connection_->SetPreeditText("", 0);
-  return true;
-}
-
-bool InputMethodEngineImpl::CommitText(int context_id,
-                                       const char* text, std::string* error) {
-  if (context_id != context_id_ || context_id_ == -1) {
-    *error = kErrorWrongContext;
-    return false;
-  }
-  if (!active_) {
-    // TODO: Commit the text anyways.
-    *error = kErrorNotActive;
-    return false;
-  }
-
-  connection_->CommitText(text);
-  return true;
-}
-
-bool InputMethodEngineImpl::SetCandidateWindowVisible(bool visible,
-                                                      std::string* error) {
-  if (!active_) {
-    *error = kErrorNotActive;
-    return false;
-  }
-
-  connection_->SetTableVisible(visible);
-  return true;
-}
-
-void InputMethodEngineImpl::SetCandidateWindowCursorVisible(bool visible) {
-  connection_->SetCursorVisible(visible);
-}
-
-void InputMethodEngineImpl::SetCandidateWindowVertical(bool vertical) {
-  connection_->SetOrientationVertical(vertical);
-}
-
-void InputMethodEngineImpl::SetCandidateWindowPageSize(int size) {
-  connection_->SetPageSize(size);
-}
-
-void InputMethodEngineImpl::SetCandidateWindowAuxText(const char* text) {
-  connection_->SetCandidateAuxText(text);
-}
-
-void InputMethodEngineImpl::SetCandidateWindowAuxTextVisible(bool visible) {
-  connection_->SetCandidateAuxTextVisible(visible);
-}
-
-bool InputMethodEngineImpl::SetCandidates(
-    int context_id, const std::vector<Candidate>& candidates,
-    std::string* error) {
-  if (!active_) {
-    *error = kErrorNotActive;
-    return false;
-  }
-  if (context_id != context_id_ || context_id_ == -1) {
-    *error = kErrorWrongContext;
-    return false;
-  }
-
-  // TODO: Nested candidates
-  std::vector<input_method::IBusEngineController::Candidate> ibus_candidates;
-
-  candidate_ids_.clear();
-  candidate_indexes_.clear();
-  for (std::vector<Candidate>::const_iterator ix = candidates.begin();
-       ix != candidates.end(); ++ix) {
-    ibus_candidates.push_back(input_method::IBusEngineController::Candidate());
-    ibus_candidates.back().value = ix->value;
-    ibus_candidates.back().label = ix->label;
-    ibus_candidates.back().annotation = ix->annotation;
-
-    // Store a mapping from the user defined ID to the candidate index.
-    candidate_indexes_[ix->id] = candidate_ids_.size();
-    candidate_ids_.push_back(ix->id);
-  }
-  connection_->SetCandidates(ibus_candidates);
-  return true;
-}
-
-bool InputMethodEngineImpl::SetCursorPosition(int context_id, int candidate_id,
-                                              std::string* error) {
-  if (!active_) {
-    *error = kErrorNotActive;
-    return false;
-  }
-  if (context_id != context_id_ || context_id_ == -1) {
-    *error = kErrorWrongContext;
-    return false;
-  }
-
-  std::map<int, int>::const_iterator position =
-      candidate_indexes_.find(candidate_id);
-  if (position == candidate_indexes_.end()) {
-    *error = kCandidateNotFound;
-    return false;
-  }
-
-  connection_->SetCursorPosition(position->second);
-  return true;
-}
-
-bool InputMethodEngineImpl::SetMenuItems(const std::vector<MenuItem>& items) {
-  std::vector<input_method::IBusEngineController::EngineProperty*> properties;
-
-  for (std::vector<MenuItem>::const_iterator item = items.begin();
-       item != items.end(); ++item) {
-    input_method::IBusEngineController::EngineProperty* property =
-        new input_method::IBusEngineController::EngineProperty;
-    if (!MenuItemToProperty(*item, property)) {
-      delete property;
-      DVLOG(1) << "Bad menu item";
-      return false;
-    }
-    properties.push_back(property);
-  }
-  return connection_->RegisterProperties(properties);
-}
-
-bool InputMethodEngineImpl::MenuItemToProperty(
-    const MenuItem& item,
-    input_method::IBusEngineController::EngineProperty* property) {
-  property->key = item.id;
-  property->label = item.label;
-  property->visible = item.visible;
-  property->sensitive = item.enabled;
-  property->checked = item.checked;
-
-  if (!item.children.empty()) {
-    property->type = input_method::IBusEngineController::PROPERTY_TYPE_MENU;
-  } else {
-    switch (item.style) {
-      case MENU_ITEM_STYLE_NONE:
-          property->type =
-              input_method::IBusEngineController::PROPERTY_TYPE_NORMAL;
-          break;
-      case MENU_ITEM_STYLE_CHECK:
-          property->type =
-              input_method::IBusEngineController::PROPERTY_TYPE_TOGGLE;
-          break;
-      case MENU_ITEM_STYLE_RADIO:
-          property->type =
-              input_method::IBusEngineController::PROPERTY_TYPE_RADIO;
-          break;
-      case MENU_ITEM_STYLE_SEPARATOR:
-          property->type =
-              input_method::IBusEngineController::PROPERTY_TYPE_SEPARATOR;
-          break;
-    }
-  }
-
-  property->modified = 0;
-  if (item.modified & MENU_ITEM_MODIFIED_LABEL) {
-    property->modified |=
-        input_method::IBusEngineController::PROPERTY_MODIFIED_LABEL;
-  }
-  if (item.modified & MENU_ITEM_MODIFIED_STYLE) {
-    property->modified |=
-        input_method::IBusEngineController::PROPERTY_MODIFIED_TYPE;
-  }
-  if (item.modified & MENU_ITEM_MODIFIED_VISIBLE) {
-    property->modified |=
-        input_method::IBusEngineController::PROPERTY_MODIFIED_VISIBLE;
-  }
-  if (item.modified & MENU_ITEM_MODIFIED_ENABLED) {
-    property->modified |=
-        input_method::IBusEngineController::PROPERTY_MODIFIED_SENSITIVE;
-  }
-  if (item.modified & MENU_ITEM_MODIFIED_CHECKED) {
-    property->modified |=
-        input_method::IBusEngineController::PROPERTY_MODIFIED_CHECKED;
-  }
-
-  for (std::vector<MenuItem>::const_iterator child = item.children.begin();
-       child != item.children.end(); ++child) {
-    input_method::IBusEngineController::EngineProperty* new_property =
-        new input_method::IBusEngineController::EngineProperty;
-    if (!MenuItemToProperty(*child, new_property)) {
-      delete new_property;
-      DVLOG(1) << "Bad menu item child";
-      return false;
-    }
-    property->children.push_back(new_property);
-  }
-
-  return true;
-}
-
-bool InputMethodEngineImpl::UpdateMenuItems(
-    const std::vector<MenuItem>& items) {
-  std::vector<input_method::IBusEngineController::EngineProperty*> properties;
-
-  for (std::vector<MenuItem>::const_iterator item = items.begin();
-       item != items.end(); ++item) {
-    input_method::IBusEngineController::EngineProperty* new_property =
-        new input_method::IBusEngineController::EngineProperty();
-    if (!MenuItemToProperty(*item, new_property)) {
-      DVLOG(1) << "Bad menu item";
-      delete new_property;
-      return false;
-    }
-    properties.push_back(new_property);
-  }
-  return connection_->UpdateProperties(properties);
-}
-
-void InputMethodEngineImpl::KeyEventDone(input_method::KeyEventHandle* key_data,
-                                         bool handled) {
-  connection_->KeyEventDone(key_data, handled);
-}
-
-void InputMethodEngineImpl::OnReset() {
-  // Ignored
-}
-
-void InputMethodEngineImpl::OnEnable() {
-  active_ = true;
-  observer_->OnActivate(engine_id_);
-}
-
-void InputMethodEngineImpl::OnDisable() {
-  active_ = false;
-  observer_->OnDeactivated(engine_id_);
-}
-
-void InputMethodEngineImpl::OnFocusIn() {
-  context_id_ = next_context_id_;
-  ++next_context_id_;
-
-  InputContext context;
-  context.id = context_id_;
-  // TODO: Other types
-  context.type = "text";
-
-  observer_->OnFocus(context);
-}
-
-void InputMethodEngineImpl::OnFocusOut() {
-  int context_id = context_id_;
-  context_id_ = -1;
-  observer_->OnBlur(context_id);
-}
-
-void InputMethodEngineImpl::OnKeyEvent(bool key_press, unsigned int keyval,
-                                       unsigned int keycode, bool alt_key,
-                                       bool ctrl_key, bool shift_key,
-                                       input_method::KeyEventHandle* key_data) {
-  KeyboardEvent event;
-  event.type = key_press ? "keydown" : "keyup";
-  event.key = input_method::GetIBusKey(keyval);
-  event.alt_key = alt_key;
-  event.ctrl_key = ctrl_key;
-  event.shift_key = shift_key;
-  observer_->OnKeyEvent(engine_id_, event, key_data);
-}
-
-void InputMethodEngineImpl::OnPropertyActivate(const char* name,
-                                               unsigned int state) {
-  observer_->OnMenuItemActivated(engine_id_, name);
-}
-
-void InputMethodEngineImpl::OnCandidateClicked(unsigned int index,
-                                               unsigned int button,
-                                               unsigned int state) {
-  if (index > candidate_ids_.size()) {
-    return;
-  }
-
-  MouseButtonEvent pressed_button;
-  if (button & input_method::IBusEngineController::MOUSE_BUTTON_1_MASK) {
-    pressed_button = MOUSE_BUTTON_LEFT;
-  } else if (button & input_method::IBusEngineController::MOUSE_BUTTON_2_MASK) {
-    pressed_button = MOUSE_BUTTON_MIDDLE;
-  } else if (button & input_method::IBusEngineController::MOUSE_BUTTON_3_MASK) {
-    pressed_button = MOUSE_BUTTON_RIGHT;
-  } else {
-    DVLOG(1) << "Unknown button: " << button;
-    pressed_button = MOUSE_BUTTON_LEFT;
-  }
-
-  observer_->OnCandidateClicked(
-      engine_id_, candidate_ids_.at(index), pressed_button);
-}
-
-class InputMethodEngineStub : public InputMethodEngine {
- public:
-  InputMethodEngineStub() : active_(false) {}
-  ~InputMethodEngineStub() {}
-
-  bool Init(InputMethodEngine::Observer* observer,
-            const char* engine_name,
-            const char* extension_id,
-            const char* engine_id,
-            const char* description,
-            const char* language,
-            const std::vector<std::string>& layouts,
-            std::string* error) {
-    DVLOG(1) << "Init";
-    return true;
-  }
-
-  virtual bool SetComposition(int context_id,
-                              const char* text, int selection_start,
-                              int selection_end, int cursor,
-                              const std::vector<SegmentInfo>& segments,
-                              std::string* error) {
-    DVLOG(1) << "SetComposition";
-    return true;
-  }
-
-  virtual bool ClearComposition(int context_id, std::string* error) {
-    DVLOG(1) << "ClearComposition";
-    return true;
-  }
-
-  virtual bool CommitText(int context_id,
-                          const char* text, std::string* error) {
-    DVLOG(1) << "CommitText";
-    return true;
-  }
-
-  virtual bool SetCandidateWindowVisible(bool visible, std::string* error) {
-    DVLOG(1) << "SetCandidateWindowVisible";
-    return true;
-  }
-
-  virtual void SetCandidateWindowCursorVisible(bool visible) {
-    DVLOG(1) << "SetCandidateWindowCursorVisible";
-  }
-
-  virtual void SetCandidateWindowVertical(bool vertical) {
-    DVLOG(1) << "SetCandidateWindowVertical";
-  }
-
-  virtual void SetCandidateWindowPageSize(int size) {
-    DVLOG(1) << "SetCandidateWindowPageSize";
-  }
-
-  virtual void SetCandidateWindowAuxText(const char* text) {
-    DVLOG(1) << "SetCandidateWindowAuxText";
-  }
-
-  virtual void SetCandidateWindowAuxTextVisible(bool visible) {
-    DVLOG(1) << "SetCandidateWindowAuxTextVisible";
-  }
-
-  virtual bool SetCandidates(int context_id,
-                             const std::vector<Candidate>& candidates,
-                             std::string* error) {
-    DVLOG(1) << "SetCandidates";
-    return true;
-  }
-
-  virtual bool SetCursorPosition(int context_id, int candidate_id,
-                                 std::string* error) {
-    DVLOG(1) << "SetCursorPosition";
-    return true;
-  }
-
-  virtual bool SetMenuItems(const std::vector<MenuItem>& items) {
-    DVLOG(1) << "SetMenuItems";
-    return true;
-  }
-
-  virtual bool UpdateMenuItems(const std::vector<MenuItem>& items) {
-    DVLOG(1) << "UpdateMenuItems";
-    return true;
-  }
-
-  virtual bool IsActive() const {
-    DVLOG(1) << "IsActive";
-    return active_;
-  }
-
-  virtual void KeyEventDone(input_method::KeyEventHandle* key_data,
-                            bool handled) {
-  }
-
- private:
-  // True when this IME is active, false if deactive.
-  bool active_;
-
-  // User specified id of this IME.
-  std::string engine_id_;
-};
-
 InputMethodEngine* InputMethodEngine::CreateEngine(
     InputMethodEngine::Observer* observer,
     const char* engine_name,
@@ -634,20 +42,16 @@ InputMethodEngine* InputMethodEngine::CreateEngine(
     const std::vector<std::string>& layouts,
     std::string* error) {
 
-#if defined(HAVE_IBUS)
-  InputMethodEngineImpl* new_engine = new InputMethodEngineImpl();
-#else
-  InputMethodEngineStub* new_engine = new InputMethodEngineStub();
-#endif
-
-  if (!new_engine->Init(observer, engine_name, extension_id, engine_id,
-                        description, language, layouts, error)) {
-    DVLOG(1) << "Init() failed.";
-    delete new_engine;
-    new_engine = NULL;
-  }
-
-  return new_engine;
+  InputMethodEngineIBus* engine = new InputMethodEngineIBus();
+  engine->Initialize(observer,
+                     engine_name,
+                     extension_id,
+                     engine_id,
+                     description,
+                     language,
+                     layouts,
+                     error);
+  return engine;
 }
 
 }  // namespace chromeos