Merge lp:~cosmos-door/unity/fix-preedit-663776 into lp:unity

[Mitsuya Shibata]

Fix unvisible pre-edit text in Dash with iBus.
https://bugs.launchpad.net/ubuntu-translations/+bug/663776/comments/77

How to reproduce:
1. Open Dash.
2. Startup Input Method(in Japanese, press Ctrl+Space)
  -> emit signal "preedit-start"
3. Type 'a', preedit text should be render, but dont
  -> emit signal "preedit-changed"
4. Press Enter, preedit text is fixed
  -> emit signal "commit", and render text in Dash

In code:
OnCommit signal handler call SetText, then text is rendered.
However OnPreeditChanged signal handler do nothing.

This branch add code to render preedit text in OnPreeditChanged.
And at OnCommit, remove preedit text, and reset cursor position.

[Mitsuya Shibata (cosmos-door)]

Please refer comments since #71 in LP: #663776

[Neil J. Patel (njpatel)]

Excellent work, approved (with additional fixes so we don't do the tab-to-switch-lenses when im is active).

review: Approve

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2011-09-11 16:51:43 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2011-09-14 13:39:38 +0000
@@ -178,6 +178,10 @@
   if (eventType != NUX_KEYDOWN)
     return false;
 
+  /* If IM is active, de-activate Copy & Paste */
+  if (im_active_)
+    return true;
+
   if (((keyval == NUX_VK_x) && ctrl && !shift) ||
       ((keyval == NUX_VK_DELETE) && shift && !ctrl))
   {
@@ -238,6 +242,17 @@
 {
   LOG_DEBUG(logger) << "Commit: " << str;
   DeleteSelection();
+
+  /* remove preedit text and set cursor to previous position */
+  if (preedit_cursor_) {
+    std::string new_text = GetText();
+    new_text.replace(cursor_, preedit_cursor_, "");
+    int cursor = cursor_;
+    SetText(new_text.c_str());
+    SetCursor(cursor);
+    preedit_cursor_ = 0;
+  }
+
   if (str)
   {
     std::string new_text = GetText();
@@ -260,12 +275,24 @@
   LOG_DEBUG(logger) << "Preedit changed: " << preedit;
 
   preedit_string = preedit.Str();
+
+  if (strlen(preedit.Str().c_str())) {
+    DeleteSelection();
+    std::string new_text = GetText();
+    new_text.replace(cursor_, preedit_cursor_, preedit.Str());
+    int cursor = cursor_;
+    SetText(new_text.c_str());
+    SetCursor(cursor);
+    preedit_cursor_ = preedit.Str().length();
+    UpdateCursorLocation();
+  }
 }
 
 void IMTextEntry::OnPreeditStart(GtkIMContext* context)
 {
   preedit_string = "";
   im_active_ = true;
+  preedit_cursor_ = 0;
 
   LOG_DEBUG(logger) << "Preedit start";
 }
@@ -276,6 +303,16 @@
   im_active_ = false;
   gtk_im_context_reset(im_context_);
 
+  /* remove preedit text and set cursor to previous position */
+  if (preedit_cursor_) {
+    std::string new_text = GetText();
+    new_text.replace(cursor_, preedit_cursor_, "");
+    int cursor = cursor_;
+    SetText(new_text.c_str());
+    SetCursor(cursor);
+    preedit_cursor_ = 0;
+  }
+
   LOG_DEBUG(logger) << "Preedit ended";
 }