Merge lp:~vbkaisetsu/nux/bug954901 into lp:nux/2.0

[Koichi Akabe]

* Fixes using Enter as a way to commit Preedit text for specific ibus engines.

Hi,

I fixed bug #954901
Please merge this branch.

[Brandon Schaefer (brandontschaefer)]

Looks good, retval is Return Value but im_filtered works as well. I wasn't aware enter was also a way to commit text, thought it was Ctrl + J for anthy. Thank you!

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-03-10 01:42:52 +0000
+++ Nux/TextEntry.cpp	2012-03-17 08:54:19 +0000
@@ -289,8 +289,7 @@
     const char*     character  ,   /*character*/
     unsigned short   keyCount       /*key repeat count*/)
   {
-    bool retval = FALSE;
-
+    bool im_filtered = false;
 #if defined(NUX_OS_LINUX)
     if (dead_key_mode_ && keysym == XK_space)
     {
@@ -320,7 +319,7 @@
     KeyEvent event((NuxEventType)event_type, keysym,cur_event.x11_keycode, state, character); 
 
 #if defined(NUX_OS_LINUX)
-    retval = ime_->FilterKeyEvent(event); 
+    im_filtered = ime_->FilterKeyEvent(event);
 #endif
 
     if ((!multiline_) && (!lose_key_focus_on_key_nav_direction_up_) && (keysym == NUX_VK_UP))
@@ -343,7 +342,7 @@
     if (keysym == NUX_VK_TAB)
       return;
 
-    if (keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER)
+    if ((keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER) && !im_filtered)
     {
       activated.emit();
       return;
@@ -354,7 +353,7 @@
     bool ctrl = (state & NUX_STATE_CTRL);
 
     // DLOG("TextEntry::key_down(%d, shift:%d ctrl:%d)", keyval, shift, ctrl);
-    if (event_type == NUX_KEYDOWN && !retval)
+    if (event_type == NUX_KEYDOWN && !im_filtered)
     {
       if (keyval == NUX_VK_LEFT)
       {
@@ -467,12 +466,15 @@
 //       }
     }
 
-    if (!retval && character != 0 && (strlen(character) != 0))
+    if ((character != 0 && strlen(character) != 0) && !im_filtered)
     {
       EnterText(character);
     }
 
-    QueueRefresh(false, true);
+    if (!im_filtered)
+    {
+      QueueRefresh(false, true);
+    }
     return;
   }