Support reverse conversion for ChromeOS

ui/base/ime/input_method_ibus.cc

 // Copyright (c) 2012 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_ibus.h"
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #undef FocusIn
@@ skipping 25 matching lines @@
 
 namespace {
 
 const int kIBusReleaseMask = 1 << 30;
 const char kClientName[] = "chrome";
 
 // Following capability mask is introduced from
 // http://ibus.googlecode.com/svn/docs/ibus-1.4/ibus-ibustypes.html#IBusCapabilite
 const uint32 kIBusCapabilityPreeditText = 1U;
 const uint32 kIBusCapabilityFocus = 8U;
+const uint32 kIBusCapabilitySurroundingText = 32U;
 
 XKeyEvent* GetKeyEvent(XEvent* event) {
   DCHECK(event && (event->type == KeyPress || event->type == KeyRelease));
   return &event->xkey;
 }
 
 // Converts X (and ibus) flags to event flags.
 int EventFlagsFromXFlags(unsigned int flags) {
   return (flags & LockMask ? ui::EF_CAPS_LOCK_DOWN : 0) |
       (flags & ControlMask ? ui::EF_CONTROL_DOWN : 0) |
@@ skipping 291 matching lines @@
   const gfx::Rect rect = GetTextInputClient()->GetCaretBounds();
 
   gfx::Rect composition_head;
   if (!GetTextInputClient()->GetCompositionCharacterBounds(0,
                                                            &composition_head)) {
     composition_head = rect;
   }
 
   // This function runs asynchronously.
   ibus_client_->SetCursorLocation(rect, composition_head);
+
+  string16 selection_text;

[Yusuke Sato, 2012/08/03 05:46:10]

nit: move to L.366

[Seigo Nonaka, 2012/08/03 07:12:44]

Done.

+  ui::Range selection_range;
+
+  if (!GetTextInputClient()->GetSelectionRange(&selection_range)) {
+    previous_selected_text_.clear();
+    return;
+  }
+  if (!GetTextInputClient()->GetTextFromRange(selection_range,
+                                              &selection_text)) {
+    previous_selected_text_.clear();
+    return;
+  }
+
+  if (previous_selected_text_ == selection_text)
+    return;
+
+  previous_selected_text_ = selection_text;
+
+  // In the original meaning of SetSurroundingText is not just selection text,
+  // but currently there are no way to retrieve surrdounding text in

[Yusuke Sato, 2012/08/03 05:46:10]

surrounding

[Seigo Nonaka, 2012/08/03 07:12:44]

Done.

+  // TextInputClient.
+  // TODO(nona): Implement fully surrounding text retrieval.
+  GetInputContextClient()->SetSurroundingText(UTF16ToUTF8(selection_text),
+                                              0UL,

[Yusuke Sato, 2012/08/03 05:46:10]

is this a caret pos? add /* parameter_name */

[Seigo Nonaka, 2012/08/03 07:12:44]

Done.

+                                              selection_range.length());
+  LOG(ERROR) << selection_text;

[Yusuke Sato, 2012/08/03 05:46:10]

remove

[Seigo Nonaka, 2012/08/03 07:12:44]

Done.

 }
 
 void InputMethodIBus::CancelComposition(const TextInputClient* client) {
   if (context_focused_ && IsTextInputClientFocused(client))
     ResetContext();
 }
 
 std::string InputMethodIBus::GetInputLocale() {
   // Not supported.
   return "";
@@ skipping 64 matching lines @@
 
   input_context_client->SetShowPreeditTextHandler(
       base::Bind(&InputMethodIBus::OnShowPreeditText,
                  weak_ptr_factory_.GetWeakPtr()));
 
   input_context_client->SetHidePreeditTextHandler(
       base::Bind(&InputMethodIBus::OnHidePreeditText,
                  weak_ptr_factory_.GetWeakPtr()));
 
   GetInputContextClient()->SetCapabilities(
-      kIBusCapabilityPreeditText | kIBusCapabilityFocus);
+      kIBusCapabilityPreeditText | kIBusCapabilityFocus |
+      kIBusCapabilitySurroundingText);
 
   UpdateContextFocusState();
   // Since ibus-daemon is launched in an on-demand basis on Chrome OS, RWHVA (or
   // equivalents) might call OnCaretBoundsChanged() before the daemon starts. To
   // save the case, call OnCaretBoundsChanged() here.
   OnCaretBoundsChanged(GetTextInputClient());
   OnInputMethodChanged();
 }
 
 void InputMethodIBus::DestroyContext() {
@@ skipping 76 matching lines @@
   }
 
   // We only focus in |context_| when the focus is in a normal textfield.
   // ibus_input_context_focus_{in|out}() run asynchronously.
   if (old_context_focused && !context_focused_)
     GetInputContextClient()->FocusOut();
   else if (!old_context_focused && context_focused_)
     GetInputContextClient()->FocusIn();
 
   if (context_focused_) {
-    uint32 capability = kIBusCapabilityFocus;
+    uint32 capability = kIBusCapabilityFocus | kIBusCapabilitySurroundingText;
     if (CanComposeInline())
       capability |= kIBusCapabilityPreeditText;
     GetInputContextClient()->SetCapabilities(capability);
   }
 }
 
 void InputMethodIBus::ProcessKeyEventPostIME(
     const base::NativeEvent& native_event,
     uint32 ibus_keyval,
     bool handled) {
@@ skipping 448 matching lines @@
   }
 
   // Use a black thin underline by default.
   if (out_composition->underlines.empty()) {
     out_composition->underlines.push_back(CompositionUnderline(
         0, length, SK_ColorBLACK, false /* thick */));
   }
 }
 
 }  // namespace ui