Merge lp:~unity-team/nux/nux.text-entry-im-auto-test into lp:nux/2.0

[Brandon Schaefer]

TextEntry with InputMethod support.

[Jay Taoko (jaytaoko)]

Excellent work!

review: Approve

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2012-02-12 01:55:02 +0000
+++ Nux/InputMethodIBus.cpp	2012-02-23 05:24:18 +0000
@@ -6,7 +6,7 @@
 {
   IBusBus* IBusIMEContext::bus_ = NULL;
 
-  IBusIMEContext::IBusIMEContext(TextEntryIM* text_entry) 
+  IBusIMEContext::IBusIMEContext(TextEntry* text_entry) 
     : text_entry_(text_entry),
       context_(NULL),
       is_focused_(false)
@@ -68,14 +68,16 @@
       ibus_input_context_reset(context_);
   }
 
-  // FIXME Need to get the key_code form nux NOT just the keysym
   bool IBusIMEContext::FilterKeyEvent(const KeyEvent& event)
   {
-    guint keyval = event.key_code(); // todo(jaytaoko): ui::GdkKeyCodeForWindowsKeyCode(event.key_code(), event.IsShiftDown() ^ event.IsCapsLockDown());
+    guint keyval = event.key_sym(); // todo(jaytaoko): ui::GdkKeyCodeForWindowsKeyCode(event.key_code(), event.IsShiftDown() ^ event.IsCapsLockDown());
 
     if (context_) {
       guint modifiers = 0;
 
+      if (event.flags() & IBUS_IGNORED_MASK)
+        return false;
+
       if (event.type() == EVENT_KEY_UP)
         modifiers |= IBUS_RELEASE_MASK;
 
@@ -88,19 +90,14 @@
       if (event.IsCapsLockDown())
         modifiers |= IBUS_LOCK_MASK;
 
-      // FIXME Not the best way to get the x11_key_code. Should be able to get it from TextEntry::ProcessKeyEvent
-      // The x11_keycode is needed for the ibus-hangul engine!
-      nux::Event cur_event = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent(); 
-
       ibus_input_context_process_key_event_async(context_,
-        keyval, cur_event.x11_keycode - 8, modifiers,
+        keyval, event.key_code() - 8, modifiers,
         -1,
         NULL,
         reinterpret_cast<GAsyncReadyCallback>(ProcessKeyEventDone),
         new ProcessKeyEventData(this, event));
       return true;
     }
-
     return false;
   }
 
@@ -113,11 +110,14 @@
     nuxAssert(bus_ != NULL);
     nuxAssert(ibus_bus_is_connected(bus_));
 
-    context_ = ibus_bus_create_input_context(bus_, "nux");
+    if (!(context_ = ibus_bus_create_input_context(bus_, "nux")))
+    {
+      nuxDebugMsg("[IBusIMEContext::IBusIMEContext] Cannot create InputContext");
+      return;
+    }
 
     // connect input context signals
     g_signal_connect(context_, "commit-text",         G_CALLBACK(OnCommitText_),        this);
-    g_signal_connect(context_, "forward-key-event",   G_CALLBACK(OnForwardKeyEvent_),   this);
     g_signal_connect(context_, "update-preedit-text", G_CALLBACK(OnUpdatePreeditText_), this);
     g_signal_connect(context_, "show-preedit-text",   G_CALLBACK(OnShowPreeditText_),   this);
     g_signal_connect(context_, "hide-preedit-text",   G_CALLBACK(OnHidePreeditText_),   this);
@@ -138,7 +138,7 @@
 
   void IBusIMEContext::DestroyContext()
   {
-    nuxDebugMsg("***IBusIMEContext::DestroyContext***");
+    //nuxDebugMsg("***IBusIMEContext::DestroyContext***");
     if (!context_)
       return;
 
@@ -147,25 +147,27 @@
     nuxAssert(!context_);
   }
 
-  // FIXME Also need to figure out how to get the pop up window
-  // for a possible ibus-engine to always be on top of the active
-  // window
   void IBusIMEContext::UpdateCursorLocation()
   {
     nux::Rect strong, weak;
     text_entry_->GetCursorRects(&strong, &weak);
-    nux::Geometry geo = text_entry_->GetGeometry();
+    
+    // Get the position of the TextEntry in the Window.
+    nux::Geometry geo = text_entry_->GetAbsoluteGeometry();
+
+    // Get the Geometry of the window on the display.
+    nux::Geometry window_geo = nux::GetGraphicsDisplay()->GetWindowGeometry();
 
     ibus_input_context_set_cursor_location(context_,
-      strong.x + geo.x,
-      strong.y + geo.y,
-      strong.width,
-      strong.height);
+      geo.x + window_geo.x + strong.x,
+      geo.y + window_geo.y,
+      0,
+      geo.height);
   }
 
   void IBusIMEContext::OnConnected(IBusBus *bus)
   {
-    nuxDebugMsg("***IBusIMEContext::OnConnected***");
+    //nuxDebugMsg("***IBusIMEContext::OnConnected***");
 
     nuxAssert(bus_ == bus);
     nuxAssert(ibus_bus_is_connected(bus_));
@@ -177,13 +179,15 @@
 
   void IBusIMEContext::OnDisconnected(IBusBus *bus)
   {
-    nuxDebugMsg("***IBusIMEContext::OnDisonnected***");
+    //nuxDebugMsg("***IBusIMEContext::OnDisonnected***");
+
+    if (context_)
+      DestroyContext();
   }
 
   void IBusIMEContext::OnCommitText(IBusInputContext *context, IBusText* text)
   {
-    nuxDebugMsg("***IBusIMEContext::OnCommitText***");
-    printf ("OnCommit %s\n", text->text);
+    //nuxDebugMsg("***IBusIMEContext::OnCommitText::%s***", text->text);
     nuxAssert(context_ == context);
 
     text_entry_->DeleteSelection();
@@ -201,39 +205,15 @@
     }
   }
 
-  void IBusIMEContext::OnForwardKeyEvent(IBusInputContext *context, guint keyval, guint keycode, guint state)
-  {
-    nuxDebugMsg("***IBusIMEContext::OnForwardKeyEvent***");
-    nuxAssert(context_ == context);
-
-    int flags = 0;
-
-    if (state & IBUS_LOCK_MASK)
-      flags |= KEY_MODIFIER_CAPS_LOCK;
-    if (state & IBUS_CONTROL_MASK)
-      flags |= KEY_MODIFIER_CTRL;
-    if (state & IBUS_SHIFT_MASK)
-      flags |= KEY_MODIFIER_SHIFT;
-    if (state & IBUS_MOD1_MASK)
-      flags |= KEY_MODIFIER_ALT;
-
-    int mouse_state = 0;
-    if (state & IBUS_BUTTON1_MASK)
-      mouse_state |= MOUSE_BUTTON1;
-    if (state & IBUS_BUTTON2_MASK)
-      mouse_state |= MOUSE_BUTTON2;
-    if (state & IBUS_BUTTON3_MASK)
-      mouse_state |= MOUSE_BUTTON3;
-
-    //ForwardKeyEvent(KeyEvent(state & IBUS_RELEASE_MASK ? EVENT_KEY_DOWN : EVENT_KEY_UP, keyval /* todo(jaytaoko): ui::WindowsKeyCodeForGdkKeyCode(keyval)*/, mouse_state, flags));
-  }
-
   void IBusIMEContext::OnUpdatePreeditText(IBusInputContext* context, IBusText* text, guint cursor_pos, gboolean visible)
   {
-    nuxDebugMsg("***IBusIMEContext::OnUpdatePreeditText***");
+    //nuxDebugMsg("***IBusIMEContext::OnUpdatePreeditText***");
     nuxAssert(context_ == context);
     nuxAssert(IBUS_IS_TEXT(text));
 
+    if (text_entry_->preedit_.empty())
+      UpdateCursorLocation();
+
     if (visible)
     {
       IBusAttrList* attrs = text->attrs;
@@ -279,50 +259,54 @@
         text_entry_->preedit_ = preedit;
         text_entry_->preedit_cursor_ = preedit.length();
         text_entry_->QueueRefresh (true, true);
-        text_entry_->sigTextChanged.emit(text_entry_);
-        UpdateCursorLocation();
+        text_entry_->text_changed.emit(text_entry_);
       }
     }
+    else
+    {
+      OnHidePreeditText(context_);
+    }
   }
 
   void IBusIMEContext::OnShowPreeditText(IBusInputContext *context)
   {
-    nuxDebugMsg("***IBusIMEContext::OnShowPreeditText***");
+    //nuxDebugMsg("***IBusIMEContext::OnShowPreeditText***");
     nuxAssert(context_ == context);
   }
 
   void IBusIMEContext::OnHidePreeditText(IBusInputContext *context)
   {
-    nuxDebugMsg("***IBusIMEContext::OnHidePreeditText***");
+    //nuxDebugMsg("***IBusIMEContext::OnHidePreeditText***");
     nuxAssert(context_ == context);
 
     text_entry_->ResetPreedit();
     text_entry_->QueueRefresh (true, true);
-    text_entry_->sigTextChanged.emit(text_entry_);
+    text_entry_->text_changed.emit(text_entry_);
   }
 
   void IBusIMEContext::OnEnable(IBusInputContext *context)
   {
-    nuxDebugMsg("***IBusIMEContext::OnEnable***");
+    //nuxDebugMsg("***IBusIMEContext::OnEnable***");
     nuxAssert(context_ == context);
 
     text_entry_->ime_active_ = true;
+    UpdateCursorLocation();
   }
 
   void IBusIMEContext::OnDisable(IBusInputContext *context)
   {
-    nuxDebugMsg("***IBusIMEContext::OnDisable***");
+    //nuxDebugMsg("***IBusIMEContext::OnDisable***");
     nuxAssert(context_ == context);
 
     text_entry_->ime_active_ = false;
     text_entry_->ResetPreedit();
     text_entry_->QueueRefresh (true, true);
-    text_entry_->sigTextChanged.emit(text_entry_);
+    text_entry_->text_changed.emit(text_entry_);
   }
 
   void IBusIMEContext::OnDestroy(IBusInputContext *context)
   {
-    nuxDebugMsg("***IBusIMEContext::OnDestroy***");
+    //nuxDebugMsg("***IBusIMEContext::OnDestroy***");
     nuxAssert(context_ == context);
 
     g_object_unref(context_);
@@ -331,7 +315,7 @@
 
   void IBusIMEContext::ProcessKeyEventDone(IBusInputContext *context, GAsyncResult* res, ProcessKeyEventData *data)
   {
-    nuxDebugMsg("***IBusIMEContext::ProcessKeyEventDone***");
+    //nuxDebugMsg("***IBusIMEContext::ProcessKeyEventDone***");
       nuxAssert(data->context->context_ == context);
 
       GError *error = NULL;
@@ -346,9 +330,14 @@
         g_error_free (error);
       }
 
-      // FIXME Need to forward this event somewhere..
       if (processed == FALSE)
-        printf ("Processed %i\n", processed);
+      {
+        data->context->text_entry_->ProcessKeyEvent(data->event.type(),
+                                                    data->event.key_sym(),
+                                                    data->event.flags() | IBUS_IGNORED_MASK,
+                                                    data->event.character().c_str(),
+                                                    0);
+      }
 
       delete data;
   }

=== modified file 'Nux/InputMethodIBus.h'
--- Nux/InputMethodIBus.h	2012-02-12 00:39:29 +0000
+++ Nux/InputMethodIBus.h	2012-02-23 05:24:18 +0000
@@ -1,14 +1,14 @@
-#ifndef INPUTMETHODIBUS_H
+#ifndef INPUTMETHODIBUS_H 
 #define INPUTMETHODIBUS_H
 
-#include <Nux/TextEntryIM.h>
+#include <Nux/TextEntry.h>
 #include <ibus.h>
 
 namespace nux
 {
 
   class IBusIMEContext;
-  class TextEntryIM;
+  class TextEntry;
   
   // FIXME This class should be reworked to replace the mouse_state
   // with the hardware key_code. 
@@ -17,19 +17,21 @@
   public:
 
     KeyEvent(NuxEventType type,
-      unsigned int key_code,
-      unsigned int mouse_state, unsigned int event_flags)
+      unsigned int key_sym,
+      unsigned int key_code, unsigned int event_flags, const char* character)
       : type_(type)
+      , key_sym_(key_sym)
       , key_code_(key_code)
       , key_modifiers_(event_flags)
-      , mouse_state_(mouse_state)
+      , character_(character)
     {
     }
 
     NuxEventType type() const {return type_;}
+    unsigned int key_sym() const {return key_sym_;}
     unsigned int key_code() const {return key_code_;}
     unsigned int flags() const {return key_modifiers_;}
-    unsigned int MouseState() const {return mouse_state_;}
+    std::string character() const {return character_;}
 
     bool IsShiftDown() const { return (key_modifiers_ & KEY_MODIFIER_SHIFT) != 0; }
     bool IsControlDown() const { return (key_modifiers_ & KEY_MODIFIER_CTRL) != 0; }
@@ -38,9 +40,10 @@
 
   private:
     EventType type_;
+    unsigned int key_sym_;
     unsigned int key_code_;
     unsigned int key_modifiers_;
-    unsigned int mouse_state_;
+    std::string character_;
 
     KeyEvent(const KeyEvent&);
     void operator = (const KeyEvent&);
@@ -53,7 +56,7 @@
     ProcessKeyEventData(IBusIMEContext* context,
       const KeyEvent& event)
       : context(context)
-      , event(event.type(), event.key_code(), event.MouseState(), event.flags())
+      , event(event.type(), event.key_sym(), event.key_code(), event.flags(), event.character().c_str())
     {
 
     }
@@ -65,7 +68,7 @@
   class IBusIMEContext
   {
   public:
-    explicit IBusIMEContext(TextEntryIM* text_entry);
+    explicit IBusIMEContext(TextEntry* text_entry);
     virtual ~IBusIMEContext();
 
     // views::IMEContext implementations:
@@ -87,7 +90,7 @@
     void OnConnected(IBusBus *bus);
 
     //CHROMEG_CALLBACK_0(IBusIMEContext, void, OnDisconnected, IBusBus*);
-    static void OnDisconnected_(IBusBus* bus, void* data) {reinterpret_cast<IBusIMEContext*>(data)->OnConnected(bus);}
+    static void OnDisconnected_(IBusBus* bus, void* data) {reinterpret_cast<IBusIMEContext*>(data)->OnDisconnected(bus);}
     void OnDisconnected(IBusBus *bus);
 
 //     // Event handlers for IBusIMEContext:
@@ -95,10 +98,6 @@
     static void OnCommitText_(IBusInputContext* context, IBusText* text, void* data) {reinterpret_cast<IBusIMEContext*>(data)->OnCommitText(context, text);}
     void OnCommitText(IBusInputContext *context, IBusText* text);
 
-    //CHROMEG_CALLBACK_3(IBusIMEContext, void, OnForwardKeyEvent, IBusInputContext*, guint, guint, guint);
-    static void OnForwardKeyEvent_(IBusInputContext* context, guint keyval, guint keycode, guint state, void* data) {reinterpret_cast<IBusIMEContext*>(data)->OnForwardKeyEvent(context, keyval, keycode, state);}
-    void OnForwardKeyEvent(IBusInputContext *context, guint keyval, guint keycode, guint state);
-
     //CHROMEG_CALLBACK_3(IBusIMEContext, void, OnUpdatePreeditText, IBusInputContext*, IBusText*, guint, gboolean);
     static void OnUpdatePreeditText_(IBusInputContext* context, IBusText* text, guint cursor_pos, gboolean visible, void* data) {reinterpret_cast<IBusIMEContext*>(data)->OnUpdatePreeditText(context, text, cursor_pos, visible);}
     void OnUpdatePreeditText(IBusInputContext *context, IBusText* text, guint cursor_pos, gboolean visible);
@@ -127,7 +126,7 @@
       GAsyncResult* res,
       ProcessKeyEventData* data);
 
-    TextEntryIM* text_entry_;
+    TextEntry* text_entry_;
     IBusInputContext* context_;
     bool is_focused_;
 

=== modified file 'Nux/Makefile.am'
--- Nux/Makefile.am	2012-02-13 15:22:30 +0000
+++ Nux/Makefile.am	2012-02-23 05:24:18 +0000
@@ -15,13 +15,15 @@
   -DG_LOG_DOMAIN=\"Nux\" \
   $(GCC_FLAGS) \
   $(NUX_CFLAGS) \
+  $(IBUS_CFLAGS) \
   $(MAINTAINER_CFLAGS)
 
 libnux_@NUX_API_VERSION@_la_LIBADD = \
   $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
   $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
   $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
-  $(NUX_LIBS)
+  $(NUX_LIBS) \
+  $(IBUS_LIBS) 
 
 libnux_@NUX_API_VERSION@_la_LDFLAGS = \
   $(NUX_LT_LDFLAGS)
@@ -93,6 +95,7 @@
   $(srcdir)/SystemThread.cpp \
   $(srcdir)/TabView.cpp \
   $(srcdir)/TextEntry.cpp \
+  $(srcdir)/InputMethodIBus.cpp \
   $(srcdir)/TextLoader.cpp \
   $(srcdir)/TextureArea.cpp \
   $(srcdir)/Timeline.cpp \
@@ -178,6 +181,7 @@
   $(srcdir)/SystemThread.h \
   $(srcdir)/TabView.h \
   $(srcdir)/TextEntry.h \
+  $(srcdir)/InputMethodIBus.h \
   $(srcdir)/TextLoader.h \
   $(srcdir)/TextureArea.h \
   $(srcdir)/Timeline.h \

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-02-18 21:32:06 +0000
+++ Nux/TextEntry.cpp	2012-02-23 05:24:18 +0000
@@ -76,8 +76,8 @@
     return result;
   }
 
-// Calculate pixel size based on the Windows DPI of 96 for compatibility
-// reasons.
+  // Calculate pixel size based on the Windows DPI of 96 for compatibility
+  // reasons.
   CairoFont::CairoFont(const std::string &family,
                        /*PangoFontDescription *font,*/
                        double pt_size,
@@ -112,10 +112,10 @@
   TextEntry::TextEntry(const char* text, NUX_FILE_LINE_DECL)
     : View(NUX_FILE_LINE_PARAM)
     , _size_match_text(true)
-    , _texture2D(NULL)
-    , canvas_(NULL)
-    , cached_layout_(NULL)
-    , preedit_attrs_(NULL)
+    , _texture2D(nullptr)
+    , canvas_(nullptr)
+    , cached_layout_(nullptr)
+    , preedit_attrs_(nullptr)
     , completion_color_(color::Gray)
     , last_dblclick_time_(0)
     , cursor_(0)
@@ -152,7 +152,9 @@
     , align_(CairoGraphics::ALIGN_LEFT)
 #if defined(NUX_OS_LINUX)
     , caret_cursor_(None)
-#endif
+    , ime_(new IBusIMEContext(this))
+#endif    
+    , ime_active_(false)
     , text_input_mode_(false)
     , key_nav_mode_(false)
   {
@@ -182,8 +184,6 @@
 
   TextEntry::~TextEntry()
   {
-    ResetLayout();
-
     if (cursor_blink_timer_)
       g_source_remove(cursor_blink_timer_);
 
@@ -191,8 +191,10 @@
     if (_texture2D)
       _texture2D->UnReference();
 
-    if (canvas_)
-      delete canvas_;
+#if defined(NUX_OS_LINUX)
+    if (ime_)
+      delete ime_;
+#endif
   }
 
   void TextEntry::PreLayoutManagement()
@@ -242,7 +244,7 @@
     {
         SelectLine();
     }
-    else if (event_type == NUX_MOUSE_DOUBLECLICK)
+    else if (event_type == NUX_MOUSE_DOUBLECLICK && !ime_active_)
     {
       SelectWord();
       last_dblclick_time_ = current_time;
@@ -281,26 +283,25 @@
     const char*     character  ,   /*character*/
     unsigned short   keyCount       /*key repeat count*/)
   {
+    bool retval = FALSE;
+
     if (event_type == NUX_KEYDOWN)
       text_input_mode_ = true;
 
-//     GdkEventKey *gdk_event = static_cast<GdkEventKey *>(event.GetOriginalEvent());
-//     ASSERT(gdk_event);
-//
-//     Event::Type type = event.GetType();
-    // Cause the cursor to stop blinking for a while.
     cursor_blink_status_ = 4;
 
-//     if (!readonly_ /*&& im_context_*/ && type != Event::EVENT_KEY_PRESS && 0/*&& gtk_im_context_filter_keypress(im_context_, gdk_event)*/)
-//     {
-//         need_im_reset_ = true;
-//         QueueRefresh(false, true);
-//         return EVENT_RESULT_HANDLED;
-//     }
+    // FIXME Have to get the current event fot he x11_keycode for ibus-hangul/korean input
+    nux::Event cur_event = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent(); 
+    KeyEvent event((NuxEventType)event_type, keysym,cur_event.x11_keycode, state, character); 
+
+#if defined(NUX_OS_LINUX)
+    retval = ime_->FilterKeyEvent(event); 
+#endif
 
     if (event_type == NUX_KEYUP)
       return;
-
+    
+  
     // we need to ignore some characters
     if (keysym == NUX_VK_TAB)
       return;
@@ -316,8 +317,7 @@
     bool ctrl = (state & NUX_STATE_CTRL);
 
     // DLOG("TextEntry::key_down(%d, shift:%d ctrl:%d)", keyval, shift, ctrl);
-
-    if (event_type == NUX_KEYDOWN)
+    if (event_type == NUX_KEYDOWN && !retval)
     {
       if (keyval == NUX_VK_LEFT)
       {
@@ -428,7 +428,7 @@
 //       }
     }
 
-    if (character != 0 && (strlen(character) != 0))
+    if (!retval && character != 0 && (strlen(character) != 0))
     {
       EnterText(character);
     }
@@ -456,7 +456,7 @@
   {
     ProcessMouseEvent(NUX_MOUSE_MOVE, x, y, dx, dy, button_flags, key_flags);
   }
-
+  
   void TextEntry::RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags)
   {
 #if defined(NUX_OS_LINUX)
@@ -464,7 +464,7 @@
     {
       Display* display = nux::GetGraphicsDisplay()->GetX11Display();
       nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-
+    
       if (display && window)
       {
         caret_cursor_ = XCreateFontCursor(display, XC_xterm);
@@ -473,7 +473,7 @@
     }
 #endif
   }
-
+  
   void TextEntry::RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags)
   {
 #if defined(NUX_OS_LINUX)
@@ -481,7 +481,7 @@
     {
       Display* display = nux::GetGraphicsDisplay()->GetX11Display();
       nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-
+      
       if (display && window)
       {
         XUndefineCursor(display, window->GetInputWindowId());
@@ -559,9 +559,9 @@
     // intentionally left empty
   }
 
-  void TextEntry::SetText(const char *text)
+  void TextEntry::SetText(const char* text)
   {
-    const char *end = NULL;
+    const char* end = NULL;
     g_utf8_validate(text, -1, &end);
 
     std::string txt((text && *text && end > text) ? std::string(text, end) : "");
@@ -574,7 +574,7 @@
     need_im_reset_ = true;
     //ResetImContext();
     QueueRefresh(true, true);
-    sigTextChanged.emit(this);
+    text_changed.emit(this);
   }
 
   std::string const& TextEntry::GetText() const
@@ -582,9 +582,28 @@
     return text_;
   }
 
-  void TextEntry::SetCompletion(const char *text)
-  {
-    const char *end = NULL;
+  std::string TextEntry::GetTextSelection() const
+  {
+    if (text_.size() == 0)
+    {
+      return std::string("");
+    }
+
+    int selection_start = 0;
+    int selection_end = 0;
+    if (GetSelectionBounds(&selection_start, &selection_end))
+    {
+      return text_.substr(selection_start, selection_end);
+    }
+    else
+    {
+      return std::string("");
+    }
+  }
+
+  void TextEntry::SetCompletion(const char* text)
+  {
+    const char* end = NULL;
     g_utf8_validate(text, -1, &end);
     std::string txt((text && *text && end > text) ? std::string(text, end) : "");
     if (txt == completion_)
@@ -628,7 +647,7 @@
   void TextEntry::MainDraw()
   {
 
-    CairoGraphics *edit_canvas = EnsureCanvas();
+    CairoGraphics* edit_canvas = EnsureCanvas();
 
     if (update_canvas_ || !last_selection_region_.empty() || !selection_region_.empty())
     {
@@ -677,6 +696,9 @@
       if (!readonly_ /*&& im_context_*/)
       {
         need_im_reset_ = true;
+#if defined(NUX_OS_LINUX)
+        ime_->Focus();
+#endif        
         //gtk_im_context_focus_in(im_context_);
         //UpdateIMCursorLocation();
       }
@@ -696,6 +718,9 @@
       if (!readonly_ /*&& im_context_*/)
       {
         need_im_reset_ = true;
+#if defined(NUX_OS_LINUX)        
+        ime_->Blur();
+#endif
         //gtk_im_context_focus_out(im_context_);
       }
       cursor_visible_ = false; // hide cursor when losing focus
@@ -733,7 +758,7 @@
     int display_width = GetBaseWidth() - kInnerBorderX * 2;
     int display_height = GetBaseHeight() - kInnerBorderY * 2;
 
-    PangoLayout *layout = EnsureLayout();
+    PangoLayout* layout = EnsureLayout();
     int text_width, text_height;
     pango_layout_get_pixel_size(layout, &text_width, &text_height);
 
@@ -1199,7 +1224,7 @@
 
     int pre_completion_length = tmp_string.length();
 
-    if (!completion_.empty() && !wrap_)
+    if (!completion_.empty() && !wrap_ && preedit_.empty())
     {
       tmp_string = text_ + completion_;
     }
@@ -1225,7 +1250,7 @@
     }
     if (!completion_.empty() && !wrap_)
     {
-      attr = pango_attr_foreground_new(65535 * completion_color_.red,
+      attr = pango_attr_foreground_new(65535 * completion_color_.red, 
                                        65535 * completion_color_.green,
                                        65535 * completion_color_.blue);
       attr->start_index = static_cast<guint>(pre_completion_length);
@@ -1455,7 +1480,7 @@
     }
 
     ResetLayout();
-    sigTextChanged.emit(this);
+    text_changed.emit(this);
   }
 
   void TextEntry::DeleteText(int start, int end)
@@ -1486,7 +1511,7 @@
       selection_bound_ -= (end - start);
 
     ResetLayout();
-    sigTextChanged.emit(this);
+    text_changed.emit(this);
   }
 
   void TextEntry::SelectWord()
@@ -1532,6 +1557,11 @@
     QueueRefresh(true, true);
   }
 
+  bool TextEntry::im_active()
+  {
+    return ime_active_;
+  }
+
   void TextEntry::DeleteSelection()
   {
     int start, end;
@@ -1668,8 +1698,8 @@
           continue;
         if (end_index < line->start_index)
           break;
-        draw_start = Max<int>(start_index, line->start_index);
-        draw_end = Min<int>(end_index, line->start_index + line->length);
+        draw_start = std::max<int>(start_index, line->start_index);
+        draw_end = std::min<int>(end_index, line->start_index + line->length);
         pango_layout_line_get_x_ranges(line, draw_start, draw_end,
           &ranges, &n_ranges);
         pango_layout_line_get_pixel_extents(line, NULL, &line_extents);
@@ -1739,8 +1769,8 @@
     nuxAssert(count);
     nuxAssert(preedit_.length() == 0);
 
-    PangoLayout *layout = EnsureLayout();
-    const char *text = pango_layout_get_text(layout);
+    PangoLayout* layout = EnsureLayout();
+    const char* text = pango_layout_get_text(layout);
     int index = TextIndexToLayoutIndex(current_index, false);
     int new_index = 0;
     int new_trailing = 0;
@@ -1780,11 +1810,11 @@
 
     // The cursor movement direction shall be determined by the direction of
     // current text line.
-    PangoLayout *layout = EnsureLayout();
+    PangoLayout* layout = EnsureLayout();
     int n_log_attrs;
-    PangoLogAttr *log_attrs;
+    PangoLogAttr* log_attrs;
     pango_layout_get_log_attrs(layout, &log_attrs, &n_log_attrs);
-    const char *text = pango_layout_get_text(layout);
+    const char* text = pango_layout_get_text(layout);
     int index = TextIndexToLayoutIndex(current_index, false);
     int line_index;
     pango_layout_index_to_line_x(layout, index, FALSE, &line_index, NULL);
@@ -1797,12 +1827,12 @@
     }
 
 #if PANGO_VERSION_CHECK(1,16,0)
-    PangoLayoutLine *line = pango_layout_get_line_readonly(layout, line_index);
+    PangoLayoutLine* line = pango_layout_get_line_readonly(layout, line_index);
 #else
-    PangoLayoutLine *line = pango_layout_get_line(layout, line_index);
+    PangoLayoutLine* line = pango_layout_get_line(layout, line_index);
 #endif
     bool rtl = (line->resolved_dir == PANGO_DIRECTION_RTL);
-    const char *ptr = text + index;
+    const char* ptr = text + index;
     int offset = static_cast<int>(g_utf8_pointer_to_offset(text, ptr));
     while (count != 0)
     {
@@ -2055,12 +2085,17 @@
     return Clamp(index, 0, static_cast<int>(text_.length()));
   }
 
-  bool TextEntry::GetSelectionBounds(int *start, int *end)
+  bool TextEntry::GetSelectionBounds(int* start, int* end) const
   {
     if (start)
-      *start = Min<int>(selection_bound_, cursor_);
+    {
+      *start = std::min<int>(selection_bound_, cursor_);
+    }
+
     if (end)
-      *end = Max<int>(selection_bound_, cursor_);
+    {
+      *end = std::max<int>(selection_bound_, cursor_);
+    }
 
     return (selection_bound_ != cursor_);
   }
@@ -2108,7 +2143,7 @@
     unsigned int key_sym,
     const char* character)
   {
-    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == true) && (text_input_mode_ == false))
+    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == true) && (text_input_mode_ == false) && (ime_active_ == false))
     {
       if (key_sym == NUX_VK_ENTER ||
         key_sym == NUX_KP_ENTER ||
@@ -2124,7 +2159,7 @@
       }
     }
 
-    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == true) && (text_input_mode_ == true))
+    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == true) && (text_input_mode_ == true) && (ime_active_ == false))
     {
       // Enable to exit the TextEntry when in write mode(hack for unity dash)
       if (key_sym == NUX_VK_UP ||
@@ -2142,4 +2177,17 @@
 
     return true;
   }
+
+  /// Public API
+
+  void TextEntry::MoveCursorToLineStart()
+  {
+    MoveCursor(DISPLAY_LINE_ENDS, -1, 0);
+  }
+
+  void TextEntry::MoveCursorToLineEnd()
+  {
+    MoveCursor(DISPLAY_LINE_ENDS, 1, 0);
+  }
+
 }

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2012-02-12 02:24:29 +0000
+++ Nux/TextEntry.h	2012-02-23 05:24:18 +0000
@@ -25,10 +25,14 @@
 #include "pango/pango.h"
 #include "pango/pangocairo.h"
 #include "NuxImage/CairoGraphics.h"
+#if defined(NUX_OS_LINUX)
+#include "InputMethodIBus.h"
+#endif
 
 namespace nux
 {
   class CairoGraphics;
+  class IBusIMEContext;
 
   class CairoFont
   {
@@ -81,9 +85,9 @@
     ~TextEntry();
 
     Area* FindAreaUnderMouse(const Point& mouse_position, NuxEventType event_type);
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void PostDraw(GraphicsEngine &graphics_engine, bool force_draw);
+    virtual void Draw(GraphicsEngine& graphics_engine, bool force_draw);
+    virtual void DrawContent(GraphicsEngine& graphics_engine, bool force_draw);
+    virtual void PostDraw(GraphicsEngine& graphics_engine, bool force_draw);
 
     void PreLayoutManagement();
     long PostLayoutManagement(long layoutResult);
@@ -125,24 +129,25 @@
     /*!
         This signal is emitted when the text has changed.
     */
-    sigc::signal <void, TextEntry*> sigTextChanged;
+    sigc::signal <void, TextEntry*> text_changed;
     sigc::signal <void> activated;
     sigc::signal <void, int> cursor_moved;
 
-    void SetText(const char *text);
+    void SetText(const char* text);
     std::string const& GetText() const;
+    std::string GetTextSelection() const;
 
-    void SetCompletion(const char *text); // Should use std::string, does not for consistancy
+    void SetCompletion(const char* text); // Should use std::string, does not for consistancy
     std::string const& GetCompletion() const;
 
-    void SetCompletionColor(const Color &color);
+    void SetCompletionColor(const Color& color);
     Color const& GetCompletionColor() const;
 
-    void SetTextColor(const Color &color);
+    void SetTextColor(const Color& color);
     Color const& GetTextColor() const;
-    void SetFontFamily(const char *font);
+    void SetFontFamily(const char* font);
     void SetFontSize(double font_size);
-    void SetFontOptions(const cairo_font_options_t *options);
+    void SetFontOptions(const cairo_font_options_t* options);
 
     /** Select text between start and end. */
     void Select(int start, int end);
@@ -152,6 +157,11 @@
     CairoGraphics::Alignment GetAlign() const;
     void SetAlign(CairoGraphics::Alignment align);
 
+    bool im_active();
+
+    void MoveCursorToLineStart();
+    void MoveCursorToLineEnd();
+    
   protected:
     bool _block_focus; // used to selectively ignore focus keyevents
 
@@ -195,17 +205,17 @@
     void ResetPreedit();
     /** Send out a request to blink the cursor if necessary */
     void QueueCursorBlink();
-    static bool CursorBlinkCallback(TextEntry *data);
+    static bool CursorBlinkCallback(TextEntry* data);
 
     void ShowCursor();
     void HideCursor();
 
     /** Draw the Cursor to the canvas */
-    void DrawCursor(CairoGraphics *canvas);
+    void DrawCursor(CairoGraphics* canvas);
     /** Draw the text to the canvas */
-    void DrawText(CairoGraphics *canvas);
+    void DrawText(CairoGraphics* canvas);
 
-    void GetCursorRects(Rect *strong, Rect *weak);
+    void GetCursorRects(Rect* strong, Rect* weak);
 
     void UpdateCursorRegion();
 
@@ -230,7 +240,7 @@
      * coordinate in the layout */
     int XYToTextIndex(int x, int y);
     /** Get the offset range that is currently selected,in number of characters.*/
-    bool GetSelectionBounds(int *start, int *end);
+    bool GetSelectionBounds(int* start, int* end) const;
     /** Set the offest range that should be selected, in number of characters. */
     void SetSelectionBounds(int selection_bound, int cursor);
 
@@ -247,7 +257,7 @@
     int GetPrevCharLength(int index);
 
     /** Insert text at current caret position */
-    void EnterText(const char *str);
+    void EnterText(const char* str);
     /** Delete text in a specified range, in number of characters. */
     void DeleteText(int start, int end);
 
@@ -279,8 +289,8 @@
     /**
      * Gets the cursor location in pango layout. The unit is pixel.
      */
-    void GetCursorLocationInLayout(int *strong_x, int *strong_y, int *strong_height,
-                                   int *weak_x, int *weak_y, int *weak_height);
+    void GetCursorLocationInLayout(int* strong_x, int* strong_y, int* strong_height,
+                                   int* weak_x, int* weak_y, int* weak_height);
 
     /** The CairoCanvas which hold cairo_t inside */
     CairoGraphics* canvas_;
@@ -293,7 +303,7 @@
     /** The preedit text of the edit control */
     std::string preedit_;
     /** Attribute list of the preedit text */
-    PangoAttrList *preedit_attrs_;
+    PangoAttrList* preedit_attrs_;
     /**
      *  The character that should be displayed in invisible mode.
      *  If this is empty, then the edit control is visible
@@ -387,7 +397,7 @@
     /** The font size of the text */
     double font_size_;
 
-    cairo_font_options_t *font_options_;
+    cairo_font_options_t* font_options_;
     double font_dpi_;
 
     /** The text color of the edit control */
@@ -404,6 +414,12 @@
     std::list<Rect> last_cursor_region_;
     std::list<Rect> cursor_region_;
 
+#if defined(NUX_OS_LINUX)
+    IBusIMEContext* ime_;
+    friend class IBusIMEContext;
+#endif
+    bool ime_active_;
+
   protected:
     bool text_input_mode_;
     bool key_nav_mode_;

=== removed file 'Nux/TextEntryIM.cpp'
--- Nux/TextEntryIM.cpp	2012-02-12 01:55:02 +0000
+++ Nux/TextEntryIM.cpp	1970-01-01 00:00:00 +0000
@@ -1,2126 +0,0 @@
-/*
-  Copyright 2008 Google Inc.
-
-  Licensed under the Apache License, Version 2.0(the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-
-#include "Nux.h"
-#include "Layout.h"
-#include "HLayout.h"
-#include "VLayout.h"
-#include "Validator.h"
-
-#include "cairo/cairo.h"
-#include "pango/pango.h"
-#include "pango/pangocairo.h"
-#include "NuxImage/CairoGraphics.h"
-
-#include "TextEntryIM.h"
-#include "TextEntry.h"
-
-#if defined(NUX_OS_LINUX)
-#include <X11/cursorfont.h>
-#endif
-
-namespace nux
-{
-  static const int kInnerBorderX = 2;
-  static const int kInnerBorderY = 0; //1;
-  static const int kCursorBlinkTimeout = 400;
-  static const double kStrongCursorLineWidth = 1;
-  static const double kStrongCursorBarWidth = 1;
-  static const double kWeakCursorLineWidth = 3;
-  static const double kWeakCursorBarWidth = 3;
-  static const Color kStrongCursorColor(0.9f, 0.9f, 0.9f, 1.0f);
-  static const Color kWeakCursorColor(1.0f, 1.0f, 1.0f, 0.5f);
-  static const Color kDefaultTextColor(0, 0, 0, 1.0f);
-  static const Color kDefaultBackgroundColor(1, 1, 1, 1.0f);
-  static const Color kDefaultSelectionBackgroundColor(0.5, 0.5, 0.5, 1.0f);
-  static const Color kDefaultSelectionTextColor(1, 1, 1, 1.0f);
-  static const unsigned long long kTripleClickTimeout = 500;
-  static const std::string kDefaultFontName = "Ubuntu";
-
-  static unsigned long long GetCurrentTime()
-  {
-    GTimeVal tv;
-    g_get_current_time(&tv);
-    return static_cast<unsigned long long>(tv.tv_sec) * 1000 + tv.tv_usec / 1000;
-  }
-
-  static std::string CleanupLineBreaks(const char *source)
-  {
-    nuxAssert(source);
-    std::string result;
-    while (*source) {
-      if (*source == '\r') {
-        result += ' ';
-        if (source[1] == '\n')
-          source++;
-      } else if (*source == '\n') {
-        result += ' ';
-      } else {
-        result += *source;
-      }
-      source++;
-    }
-    return result;
-  }
-
-  NUX_IMPLEMENT_OBJECT_TYPE(TextEntryIM);
-
-  TextEntryIM::TextEntryIM(const char* text, NUX_FILE_LINE_DECL)
-    : View(NUX_FILE_LINE_PARAM)
-    , _size_match_text(true)
-    , _texture2D(nullptr)
-    , canvas_(nullptr)
-    , cached_layout_(nullptr)
-    , preedit_attrs_(nullptr)
-    , completion_color_(color::Gray)
-    , last_dblclick_time_(0)
-    , cursor_(0)
-    , preedit_cursor_(0)
-    , selection_bound_(0)
-    , scroll_offset_x_(0)
-    , scroll_offset_y_(0)
-    , cursor_blink_timer_(0)
-    , cursor_blink_status_(0)
-    , visible_(true)
-    , focused_(false)
-    , need_im_reset_(false)
-    , overwrite_(false)
-    , select_words_(false)
-    , select_lines_(false)
-    , button_(false)
-    , bold_(false)
-    , underline_(false)
-    , strikeout_(false)
-    , italic_(false)
-    , multiline_(false)
-    , wrap_(false)
-    , cursor_visible_(false)
-    , readonly_(false)
-    , content_modified_(false)
-    , selection_changed_(false)
-    , cursor_moved_(false)
-    , update_canvas_(true)
-    , font_family_("Ubuntu")
-    , font_size_(12)
-    , font_options_(cairo_font_options_create())
-    , font_dpi_(96.0)
-    , _text_color(color::White)
-    , align_(CairoGraphics::ALIGN_LEFT)
-#if defined(NUX_OS_LINUX)
-    , caret_cursor_(None)
-#endif
-    , ime_(new IBusIMEContext(this))
-    , ime_active_(false)
-    , text_input_mode_(false)
-    , key_nav_mode_(false)
-  {
-    cairo_font_options_set_antialias(font_options_, CAIRO_ANTIALIAS_SUBPIXEL);
-    cairo_font_options_set_hint_style(font_options_, CAIRO_HINT_STYLE_FULL);
-    cairo_font_options_set_hint_metrics(font_options_, CAIRO_HINT_METRICS_ON);
-    cairo_font_options_set_subpixel_order(font_options_, CAIRO_SUBPIXEL_ORDER_RGB);
-
-    mouse_down.connect(sigc::mem_fun(this, &TextEntryIM::RecvMouseDown));
-    mouse_drag.connect(sigc::mem_fun(this, &TextEntryIM::RecvMouseDrag));
-    mouse_up.connect(sigc::mem_fun(this, &TextEntryIM::RecvMouseUp));
-    mouse_double_click.connect(sigc::mem_fun(this, &TextEntryIM::RecvMouseDoubleClick));
-    mouse_enter.connect(sigc::mem_fun(this, &TextEntryIM::RecvMouseEnter));
-    mouse_leave.connect(sigc::mem_fun(this, &TextEntryIM::RecvMouseLeave));
-
-    key_down.connect(sigc::mem_fun(this, &TextEntryIM::RecvKeyEvent));
-
-    begin_key_focus.connect(sigc::mem_fun(this, &TextEntryIM::RecvStartKeyFocus));
-    end_key_focus.connect(sigc::mem_fun(this, &TextEntryIM::RecvEndKeyFocus));
-
-    SetMinimumSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
-    SetText(text);
-
-    SetAcceptKeyboardEvent(true);
-    EnableDoubleClick(true);
-  }
-
-  TextEntryIM::~TextEntryIM()
-  {
-    if (cursor_blink_timer_)
-      g_source_remove(cursor_blink_timer_);
-
-    cairo_font_options_destroy(font_options_);
-    if (_texture2D)
-      _texture2D->UnReference();
-  }
-
-  void TextEntryIM::PreLayoutManagement()
-  {
-    View::PreLayoutManagement();
-  }
-
-  long TextEntryIM::PostLayoutManagement(long layoutResult)
-  {
-    long result = View::PostLayoutManagement(layoutResult);
-    MainDraw();
-    return result;
-  }
-
-  void TextEntryIM::GeometryChanged()
-  {
-
-      update_canvas_ = true;
-      View::GeometryChanged();
-
-  }
-
-  Area* TextEntryIM::FindAreaUnderMouse(const Point& mouse_position, NuxEventType event_type)
-  {
-    Area* area = View::FindAreaUnderMouse(mouse_position, event_type);
-
-    return area;
-  }
-
-  void TextEntryIM::ProcessMouseEvent(int event_type, int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
-  {
-    if (GetEventButton(button_flags) != 1 && event_type != NUX_MOUSE_MOVE)
-      return;
-
-    //ResetImContext();
-    //Event::Type type = event.GetType();
-
-    int X = static_cast<int>(x /*round(event.GetX())*/) - kInnerBorderX - scroll_offset_x_;
-    int Y = static_cast<int>(y /*round(event.GetY())*/) - kInnerBorderY - scroll_offset_y_;
-    int index = XYToTextIndex(X, Y);
-    int sel_start, sel_end;
-    GetSelectionBounds(&sel_start, &sel_end);
-
-    unsigned long long current_time = GetCurrentTime();
-
-    if ((event_type == NUX_MOUSE_PRESSED) && (current_time - last_dblclick_time_ <= kTripleClickTimeout))
-    {
-        SelectLine();
-    }
-    else if (event_type == NUX_MOUSE_DOUBLECLICK)
-    {
-      SelectWord();
-      last_dblclick_time_ = current_time;
-    }
-    else if (event_type == NUX_MOUSE_PRESSED)
-    {
-      if (key_flags & NUX_STATE_SHIFT)
-      {
-        // If current click position is inside the selection range, then just
-        // cancel the selection.
-        if (index > sel_start && index < sel_end)
-          SetCursor(index);
-        else if (index <= sel_start)
-          SetSelectionBounds(sel_end, index);
-        else if (index >= sel_end)
-          SetSelectionBounds(sel_start, index);
-      }
-      else
-      {
-        SetCursor(index);
-      }
-    }
-    else if (event_type == NUX_MOUSE_MOVE)
-    {
-      SetSelectionBounds(selection_bound_, index);
-    }
-
-    QueueRefresh(false, true);
-    //return EVENT_RESULT_HANDLED;
-  }
-
-  void TextEntryIM::ProcessKeyEvent(
-    unsigned long    event_type  ,   /*event type*/
-    unsigned long    keysym     ,   /*event keysym*/
-    unsigned long    state      ,   /*event state*/
-    const char*     character  ,   /*character*/
-    unsigned short   keyCount       /*key repeat count*/)
-  {
-
-    KeyEvent event((NuxEventType)event_type, keysym, 0, state); 
-    ime_->FilterKeyEvent(event);
-
-    if (event_type == NUX_KEYDOWN)
-      text_input_mode_ = true;
-
-//     GdkEventKey *gdk_event = static_cast<GdkEventKey *>(event.GetOriginalEvent());
-//     ASSERT(gdk_event);
-//
-//     Event::Type type = event.GetType();
-    // Cause the cursor to stop blinking for a while.
-    cursor_blink_status_ = 4;
-
-//     if (!readonly_ /*&& im_context_*/ && type != Event::EVENT_KEY_PRESS && 0/*&& gtk_im_context_filter_keypress(im_context_, gdk_event)*/)
-//     {
-//         need_im_reset_ = true;
-//         QueueRefresh(false, true);
-//         return EVENT_RESULT_HANDLED;
-//     }
-
-    if (event_type == NUX_KEYUP)
-      return;
-
-    // we need to ignore some characters
-    if (keysym == NUX_VK_TAB)
-      return;
-
-    if (keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER)
-    {
-      activated.emit();
-      return;
-    }
-
-    unsigned int keyval = keysym;
-    bool shift = (state & NUX_STATE_SHIFT);
-    bool ctrl = (state & NUX_STATE_CTRL);
-
-    // DLOG("TextEntryIM::key_down(%d, shift:%d ctrl:%d)", keyval, shift, ctrl);
-
-    if (event_type == NUX_KEYDOWN)
-    {
-      if (keyval == NUX_VK_LEFT)
-      {
-        if (!ctrl)
-          MoveCursor(VISUALLY, -1, shift);
-        else
-          MoveCursor(WORDS, -1, shift);
-      }
-      else if (keyval == NUX_VK_RIGHT)
-      {
-        if (!ctrl)
-          MoveCursor(VISUALLY, 1, shift);
-        else
-          MoveCursor(WORDS, 1, shift);
-      }
-      else if (keyval == NUX_VK_UP)
-      {
-        MoveCursor(DISPLAY_LINES, -1, shift);
-      }
-      else if (keyval == NUX_VK_DOWN)
-      {
-        MoveCursor(DISPLAY_LINES, 1, shift);
-      }
-      else if (keyval == NUX_VK_HOME)
-      {
-        if (!ctrl)
-          MoveCursor(DISPLAY_LINE_ENDS, -1, shift);
-        else
-          MoveCursor(BUFFER, -1, shift);
-      }
-      else if (keyval == NUX_VK_END)
-      {
-        if (!ctrl)
-          MoveCursor(DISPLAY_LINE_ENDS, 1, shift);
-        else
-          MoveCursor(BUFFER, 1, shift);
-      }
-      else if (keyval == NUX_VK_PAGE_UP)
-      {
-        if (!ctrl)
-          MoveCursor(PAGES, -1, shift);
-        else
-          MoveCursor(BUFFER, -1, shift);
-      }
-      else if (keyval == NUX_VK_PAGE_DOWN)
-      {
-        if (!ctrl)
-          MoveCursor(PAGES, 1, shift);
-        else
-          MoveCursor(BUFFER, 1, shift);
-      }
-      else if (((keyval == NUX_VK_x) && ctrl && !shift) || ((keyval == NUX_VK_DELETE) && shift && !ctrl))
-      {
-        CutClipboard();
-      }
-      else if (((keyval == NUX_VK_c) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && ctrl && (!shift)))
-      {
-          CopyClipboard();
-      }
-      else if (((keyval == NUX_VK_v) && ctrl && (!shift)) || ((keyval == NUX_VK_INSERT) && shift && (!ctrl)))
-      {
-          PasteClipboard();
-      }
-      else if ((keyval == NUX_VK_a) && ctrl)
-      {
-        // Select all
-        int text_length = static_cast<int>(text_.length());
-        SetSelectionBounds(0, text_length);
-        QueueRefresh(false, true);
-        return;
-      }
-      else if (keyval == NUX_VK_BACKSPACE)
-      {
-        if (!ctrl)
-          BackSpace(VISUALLY);
-        else
-          BackSpace(WORDS);
-      }
-      else if ((keyval == NUX_VK_DELETE) && (!shift))
-      {
-        if (!ctrl)
-          Delete(VISUALLY);
-        else
-          Delete(WORDS);
-      }
-      else if ((keyval == NUX_VK_INSERT) && (!shift) && (!ctrl))
-      {
-        ToggleOverwrite();
-      }
-//       else
-//       {
-//         return EVENT_RESULT_UNHANDLED;
-//       }
-    }
-    else
-    { // EVENT_KEY_PRESS
-//       if (keyval == GDK_Return || keyval == GDK_KP_Enter)
-//       {
-//         // If multiline_ is unset, just ignore new_line.
-//         if (multiline_)
-//           EnterText("\n");
-//         else
-//           return;
-//       }
-//       else
-//       {
-//         return;
-//       }
-    }
-
-    if (character != 0 && (strlen(character) != 0) && !ime_active_)
-    {
-      EnterText(character);
-    }
-
-    QueueRefresh(false, true);
-    return;
-  }
-
-  void TextEntryIM::RecvMouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-    ProcessMouseEvent(NUX_MOUSE_DOUBLECLICK, x, y, 0, 0, button_flags, key_flags);
-  }
-
-  void TextEntryIM::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-    ProcessMouseEvent(NUX_MOUSE_RELEASED, x, y, 0, 0, button_flags, key_flags);
-  }
-
-  void TextEntryIM::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-    ProcessMouseEvent(NUX_MOUSE_PRESSED, x, y, 0, 0, button_flags, key_flags);
-  }
-
-  void TextEntryIM::RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
-  {
-    ProcessMouseEvent(NUX_MOUSE_MOVE, x, y, dx, dy, button_flags, key_flags);
-  }
-  
-  void TextEntryIM::RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-#if defined(NUX_OS_LINUX)
-    if (caret_cursor_ == None)
-    {
-      Display* display = nux::GetGraphicsDisplay()->GetX11Display();
-      nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-    
-      if (display && window)
-      {
-        caret_cursor_ = XCreateFontCursor(display, XC_xterm);
-        XDefineCursor(display, window->GetInputWindowId(), caret_cursor_);
-      }
-    }
-#endif
-  }
-  
-  void TextEntryIM::RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-#if defined(NUX_OS_LINUX)
-    if (caret_cursor_ != None)
-    {
-      Display* display = nux::GetGraphicsDisplay()->GetX11Display();
-      nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-      
-      if (display && window)
-      {
-        XUndefineCursor(display, window->GetInputWindowId());
-        XFreeCursor(display, caret_cursor_);
-        caret_cursor_ = None;
-      }
-    }
-#endif
-  }
-
-  void TextEntryIM::RecvKeyEvent(
-    unsigned long    eventType  ,   /*event type*/
-    unsigned long    keysym     ,   /*event keysym*/
-    unsigned long    state      ,   /*event state*/
-    const char*     character  ,   /*character*/
-    unsigned short   keyCount       /*key repeat count*/)
-  {
-    ProcessKeyEvent(eventType, keysym, state, character, keyCount);
-  }
-
-  void TextEntryIM::RecvStartKeyFocus()
-  {
-    key_nav_mode_           = true;
-    text_input_mode_        = false;
-
-    FocusInx();
-  }
-
-  void TextEntryIM::RecvEndKeyFocus()
-  {
-    key_nav_mode_     = false;
-    text_input_mode_  = false;
-
-    FocusOutx();
-  }
-
-  void TextEntryIM::Draw(GraphicsEngine& gfxContext, bool forceDraw)
-  {
-    MainDraw();
-    Geometry base = GetGeometry();
-
-    gfxContext.PushClippingRectangle(base);
-
-    nux::GetPainter().PaintBackground(gfxContext, base);
-
-    Color col = color::Black;
-    col.alpha = 0;
-    gfxContext.QRP_Color(base.x,
-      base.y,
-      base.width,
-      base.height,
-      col);
-
-    TexCoordXForm texxform;
-    texxform.SetWrap(TEXWRAP_REPEAT, TEXWRAP_REPEAT);
-    texxform.SetTexCoordType(TexCoordXForm::OFFSET_COORD);
-    gfxContext.QRP_1Tex(base.x,
-      base.y,
-      base.width,
-      base.height,
-      _texture2D->GetDeviceTexture(),
-      texxform,
-      _text_color);
-
-    gfxContext.PopClippingRectangle();
-  }
-
-  void TextEntryIM::DrawContent(GraphicsEngine& gfxContext, bool forceDraw)
-  {
-    //MainDraw();
-  }
-
-  void TextEntryIM::PostDraw(GraphicsEngine& gfxContext, bool forceDraw)
-  {
-    // intentionally left empty
-  }
-
-  void TextEntryIM::SetText(const char *text)
-  {
-    const char *end = NULL;
-    g_utf8_validate(text, -1, &end);
-
-    std::string txt((text && *text && end > text) ? std::string(text, end) : "");
-    if (txt == text_)
-      return; // prevent some redraws
-
-    text_ = multiline_ ? txt : CleanupLineBreaks(txt.c_str());
-    cursor_ = 0;
-    selection_bound_ = 0;
-    need_im_reset_ = true;
-    //ResetImContext();
-    QueueRefresh(true, true);
-    sigTextChanged.emit(this);
-  }
-
-  std::string const& TextEntryIM::GetText() const
-  {
-    return text_;
-  }
-
-  void TextEntryIM::SetCompletion(const char *text)
-  {
-    const char *end = NULL;
-    g_utf8_validate(text, -1, &end);
-    std::string txt((text && *text && end > text) ? std::string(text, end) : "");
-    if (txt == completion_)
-      return;
-
-    completion_ = txt;
-    QueueRefresh(true, true);
-  }
-
-  std::string const& TextEntryIM::GetCompletion() const
-  {
-    return completion_;
-  }
-
-  void TextEntryIM::SetCompletionColor(const Color &color)
-  {
-    completion_color_ = color;
-    QueueRefresh(true, true);
-  }
-
-  Color const& TextEntryIM::GetCompletionColor() const
-  {
-    return completion_color_;
-  }
-
-  void TextEntryIM::SetTextColor(const Color &text_color)
-  {
-    if (_text_color != text_color)
-    {
-      _text_color = text_color;
-      QueueRefresh(true, true);
-    }
-  }
-
-  Color const& TextEntryIM::GetTextColor() const
-  {
-    return _text_color;
-  }
-
-
-  void TextEntryIM::MainDraw()
-  {
-
-    CairoGraphics *edit_canvas = EnsureCanvas();
-
-    if (update_canvas_ || !last_selection_region_.empty() || !selection_region_.empty())
-    {
-      edit_canvas->PushState();
-      DrawText(edit_canvas);
-      edit_canvas->PopState();
-    }
-
-//     if (background_)
-//       background_->Draw(canvas, 0, 0, GetBaseWidth, GetBaseHeight);
-
-    CairoGraphics* final_canvas = new CairoGraphics(CAIRO_FORMAT_ARGB32, edit_canvas->GetWidth(), edit_canvas->GetHeight());
-
-    final_canvas->PushState();
-    final_canvas->IntersectRectClipRegion(kInnerBorderX,
-      kInnerBorderY,
-      GetBaseWidth() - kInnerBorderX,
-      GetBaseHeight() - kInnerBorderY);
-    final_canvas->DrawCanvas(0, 0, edit_canvas);
-    final_canvas->PopState();
-    DrawCursor(final_canvas);
-
-    update_canvas_ = false;
-    last_selection_region_ = selection_region_;
-    last_cursor_region_ = cursor_region_;
-
-    NBitmapData* bitmap = final_canvas->GetBitmap();
-    delete final_canvas;
-
-    if (!_texture2D || _texture2D->GetWidth() != bitmap->GetWidth() || _texture2D->GetHeight() != bitmap->GetHeight())
-    {
-      if (_texture2D)
-        _texture2D->UnReference();
-      _texture2D = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    }
-
-    _texture2D->Update(bitmap);
-    delete bitmap;
-  }
-
-  void TextEntryIM::FocusInx()
-  {
-    if (!focused_)
-    {
-      focused_ = true;
-      if (!readonly_ /*&& im_context_*/)
-      {
-        need_im_reset_ = true;
-        ime_->Focus();
-        //gtk_im_context_focus_in(im_context_);
-        //UpdateIMCursorLocation();
-      }
-      cursor_visible_ = true; // show cursor when getting focus
-      selection_changed_ = true;
-      cursor_moved_ = true;
-      // Don't adjust scroll.
-      QueueRefresh(true, false);
-    }
-  }
-
-  void TextEntryIM::FocusOutx()
-  {
-    if (focused_)
-    {
-      focused_ = false;
-      if (!readonly_ /*&& im_context_*/)
-      {
-        need_im_reset_ = true;
-        ime_->Blur();
-        //gtk_im_context_focus_out(im_context_);
-      }
-      cursor_visible_ = false; // hide cursor when losing focus
-      selection_changed_ = true;
-      cursor_moved_ = true;
-      // Don't adjust scroll.
-      QueueRefresh(true, false);
-    }
-  }
-
-  CairoGraphics* TextEntryIM::EnsureCanvas()
-  {
-    if (canvas_)
-    {
-      if ((GetBaseWidth() == canvas_->GetWidth()) && (GetBaseHeight() == canvas_->GetHeight()))
-      {
-        return canvas_;
-      }
-      else
-      {
-        nuxDebugMsg("[TextEntryIM::EnsureCanvas] Recreate canvas");
-        delete canvas_;
-        canvas_ = NULL;
-      }
-    }
-    canvas_ = new CairoGraphics(CAIRO_FORMAT_ARGB32, GetBaseWidth(), GetBaseHeight());
-    nuxAssert(canvas_);
-    return canvas_;
-  }
-
-  void TextEntryIM::AdjustScroll()
-  {
-    int old_offset_x = scroll_offset_x_;
-    int old_offset_y = scroll_offset_y_;
-    int display_width = GetBaseWidth() - kInnerBorderX * 2;
-    int display_height = GetBaseHeight() - kInnerBorderY * 2;
-
-    PangoLayout *layout = EnsureLayout();
-    int text_width, text_height;
-    pango_layout_get_pixel_size(layout, &text_width, &text_height);
-
-    int strong_x, strong_y, strong_height;
-    int weak_x, weak_y, weak_height;
-    GetCursorLocationInLayout(&strong_x, &strong_y, &strong_height,
-      &weak_x, &weak_y, &weak_height);
-
-    if (!wrap_ && display_width > text_width)
-    {
-      PangoAlignment align = pango_layout_get_alignment(layout);
-      if (align == PANGO_ALIGN_RIGHT)
-        scroll_offset_x_ = display_width - text_width;
-      else if (align == PANGO_ALIGN_CENTER)
-        scroll_offset_x_ = (display_width - text_width) / 2;
-      else
-        scroll_offset_x_ = 0;
-    }
-    else
-    {
-      if (scroll_offset_x_ + strong_x < 0)
-        scroll_offset_x_ = -strong_x;
-      else if (scroll_offset_x_ + strong_x > display_width)
-        scroll_offset_x_ = display_width - strong_x;
-
-      if (std::abs(weak_x - strong_x) < display_width)
-      {
-        if (scroll_offset_x_ + weak_x < 0)
-          scroll_offset_x_ = - weak_x;
-        else if (scroll_offset_x_ + weak_x > display_width)
-          scroll_offset_x_ = display_width - weak_x;
-      }
-    }
-
-    if (display_height > text_height)
-    {
-      scroll_offset_y_ = 0;
-    }
-    else
-    {
-      if (scroll_offset_y_ + strong_y + strong_height > display_height)
-        scroll_offset_y_ = display_height - strong_y - strong_height;
-      if (scroll_offset_y_ + strong_y < 0)
-        scroll_offset_y_ = -strong_y;
-    }
-
-    if (old_offset_x != scroll_offset_x_ || old_offset_y != scroll_offset_y_)
-      content_modified_ = true;
-  }
-
-  void TextEntryIM::QueueRefresh(bool relayout, bool adjust_scroll)
-  {
-    if (relayout)
-      ResetLayout();
-
-    if (adjust_scroll)
-      AdjustScroll();
-
-    QueueTextDraw();
-    QueueCursorBlink();
-  }
-
-  void TextEntryIM::ResetImContext()
-  {
-    if (need_im_reset_)
-    {
-      need_im_reset_ = false;
-//       if (im_context_)
-//         gtk_im_context_reset(im_context_);
-      ResetPreedit();
-    }
-  }
-
-  void TextEntryIM::ResetPreedit() {
-    // Reset layout if there were some content in preedit string
-    if (preedit_.length())
-      ResetLayout();
-
-    preedit_.clear();
-    preedit_cursor_ = 0;
-    if (preedit_attrs_) {
-      pango_attr_list_unref(preedit_attrs_);
-      preedit_attrs_ = NULL;
-    }
-  }
-
-  void TextEntryIM::DrawText(CairoGraphics *canvas)
-  {
-    PangoLayout *layout = EnsureLayout();
-
-    bool redraw_text = false;
-    if (update_canvas_)
-    {
-      canvas->ClearCanvas();
-      canvas->PushState();
-      redraw_text = true;
-    }
-    else if (!last_selection_region_.empty())
-    {
-      //last_selection_region_.Integerize();
-      canvas->PushState();
-      canvas->IntersectGeneralClipRegion(last_selection_region_);
-      canvas->ClearRect(0, 0, GetBaseWidth(), GetBaseHeight());
-      redraw_text = true;
-    }
-
-    if (redraw_text)
-    {
-      cairo_set_source_rgb(canvas->GetInternalContext(),
-        _text_color.red,
-        _text_color.green,
-        _text_color.blue);
-
-      cairo_move_to(canvas->GetInternalContext(),
-        scroll_offset_x_ + kInnerBorderX,
-        scroll_offset_y_ + kInnerBorderY);
-
-      pango_cairo_show_layout(canvas->GetInternalContext(), layout);
-
-      canvas->PopState();
-    }
-
-    // Draw selection background.
-    // Selection in a single line may be not continual, so we use pango to
-    // get the x-ranges of each selection range in one line, and draw them
-    // separately.
-    if (!selection_region_.empty())
-    {
-      canvas->PushState();
-      //selection_region_.Integerize();
-      canvas->IntersectGeneralClipRegion(selection_region_);
-
-      Color selection_color = GetSelectionBackgroundColor();
-      Color text_color = GetSelectionTextColor();
-
-      cairo_set_source_rgb(canvas->GetInternalContext(),
-        selection_color.red,
-        selection_color.green,
-        selection_color.blue);
-      cairo_paint(canvas->GetInternalContext());
-
-      cairo_move_to(canvas->GetInternalContext(),
-        scroll_offset_x_ + kInnerBorderX,
-        scroll_offset_y_ + kInnerBorderY);
-      cairo_set_source_rgb(canvas->GetInternalContext(),
-        text_color.red,
-        text_color.green,
-        text_color.blue);
-      pango_cairo_show_layout(canvas->GetInternalContext(), layout);
-      canvas->PopState();
-    }
-  }
-
-  bool TextEntryIM::CursorBlinkCallback(TextEntryIM *self)
-  {
-    if (self->cursor_blink_status_)
-      self->ShowCursor();
-    else
-      self->HideCursor();
-
-    if (--self->cursor_blink_status_ < 0)
-      self->cursor_blink_status_ = 2;
-
-    return true;
-  }
-
-  void TextEntryIM::QueueCursorBlink()
-  {
-    if (!cursor_blink_timer_)
-      cursor_blink_timer_ = g_timeout_add(kCursorBlinkTimeout,
-                                          (GSourceFunc)&CursorBlinkCallback,
-                                          this);
-  }
-
-  void TextEntryIM::ShowCursor()
-  {
-    if (!cursor_visible_)
-    {
-      cursor_visible_ = true;
-      if (focused_ && !readonly_)
-      {
-        cursor_moved_ = true;
-        QueueRefresh(false, false);
-      }
-    }
-  }
-
-  void TextEntryIM::HideCursor()
-  {
-    if (cursor_visible_)
-    {
-      cursor_visible_ = false;
-      if (focused_ && !readonly_)
-      {
-        cursor_moved_ = true;
-        QueueRefresh(false, false);
-      }
-    }
-  }
-
-  void TextEntryIM::GetCursorRects(Rect *strong, Rect *weak)
-  {
-    int strong_x, strong_y, strong_height;
-    int weak_x, weak_y, weak_height;
-    GetCursorLocationInLayout(&strong_x, &strong_y, &strong_height,
-      &weak_x, &weak_y, &weak_height);
-
-    strong->x =
-      strong_x + kInnerBorderX + scroll_offset_x_ - kStrongCursorBarWidth;
-    strong->width = kStrongCursorBarWidth * 2;
-    strong->y = strong_y + kInnerBorderY + scroll_offset_y_;
-    strong->height = strong_height;
-
-    if (weak_x != strong_x)
-    {
-      weak->x = weak_x+ kInnerBorderX + scroll_offset_x_ - kWeakCursorBarWidth;
-      weak->width = kWeakCursorBarWidth * 2;
-      weak->y = weak_y+ kInnerBorderY + scroll_offset_y_;
-      weak->height = weak_height;
-    }
-    else
-    {
-      *weak = *strong;
-    }
-  }
-
-  void TextEntryIM::UpdateCursorRegion()
-  {
-    cursor_region_.clear();
-
-    Rect strong, weak;
-    GetCursorRects(&strong, &weak);
-
-    cursor_region_.push_back(strong);
-    cursor_region_.push_back(weak);
-  }
-
-
-  void TextEntryIM::DrawCursor(CairoGraphics *canvas)
-  {
-    if (!cursor_visible_)
-      return;
-
-    int strong_x, strong_y, strong_height;
-    int weak_x, weak_y, weak_height;
-    GetCursorLocationInLayout(&strong_x, &strong_y, &strong_height,
-      &weak_x, &weak_y, &weak_height);
-
-    // Draw strong cursor.
-    // 0.5 is for cairo drawing between the grid
-    canvas->DrawLine(strong_x + kInnerBorderX + scroll_offset_x_ + 0.5,
-                     strong_y + kInnerBorderY + scroll_offset_y_,
-                     strong_x + kInnerBorderX + scroll_offset_x_ + 0.5,
-                     strong_y + strong_height + kInnerBorderY + scroll_offset_y_,
-                     kStrongCursorLineWidth, kStrongCursorColor);
-    // Draw a small arror towards weak cursor
-    if (strong_x > weak_x)
-    {
-      canvas->DrawLine(
-        strong_x + kInnerBorderX + scroll_offset_x_ - kStrongCursorBarWidth,
-        strong_y + kInnerBorderY + scroll_offset_y_ + kStrongCursorLineWidth,
-        strong_x + kInnerBorderX + scroll_offset_x_,
-        strong_y + kInnerBorderY + scroll_offset_y_ + kStrongCursorLineWidth,
-        kStrongCursorLineWidth, kStrongCursorColor);
-    }
-    else if (strong_x < weak_x)
-    {
-      canvas->DrawLine(
-        strong_x + kInnerBorderX + scroll_offset_x_,
-        strong_y + kInnerBorderY + scroll_offset_y_ + kStrongCursorLineWidth,
-        strong_x + kInnerBorderX + scroll_offset_x_ + kStrongCursorBarWidth,
-        strong_y + kInnerBorderY + scroll_offset_y_ + kStrongCursorLineWidth,
-        kStrongCursorLineWidth, kStrongCursorColor);
-    }
-
-    if (strong_x != weak_x )
-    {
-      // Draw weak cursor.
-      canvas->DrawLine(weak_x + kInnerBorderX + scroll_offset_x_,
-        weak_y + kInnerBorderY + scroll_offset_y_,
-        weak_x + kInnerBorderX + scroll_offset_x_,
-        weak_y + weak_height + kInnerBorderY + scroll_offset_y_,
-        kWeakCursorLineWidth, kWeakCursorColor);
-      // Draw a small arror towards strong cursor
-      if (weak_x > strong_x)
-      {
-        canvas->DrawLine(
-          weak_x + kInnerBorderX + scroll_offset_x_ - kWeakCursorBarWidth,
-          weak_y + kInnerBorderY + scroll_offset_y_ + kWeakCursorLineWidth,
-          weak_x + kInnerBorderX + scroll_offset_x_,
-          weak_y + kInnerBorderY + scroll_offset_y_ + kWeakCursorLineWidth,
-          kWeakCursorLineWidth, kWeakCursorColor);
-      }
-      else
-      {
-        canvas->DrawLine(
-          weak_x + kInnerBorderX + scroll_offset_x_,
-          weak_y + kInnerBorderY + scroll_offset_y_ + kWeakCursorLineWidth,
-          weak_x + kInnerBorderX + scroll_offset_x_ + kWeakCursorBarWidth,
-          weak_y + kInnerBorderY + scroll_offset_y_ + kWeakCursorLineWidth,
-          kWeakCursorLineWidth, kWeakCursorColor);
-      }
-    }
-  }
-
-  Color TextEntryIM::GetSelectionBackgroundColor()
-  {
-    return kDefaultSelectionBackgroundColor;
-  }
-
-  Color TextEntryIM::GetSelectionTextColor()
-  {
-    return kDefaultSelectionTextColor;
-  }
-
-  void TextEntryIM::GetCursorLocationInLayout(int *strong_x, int *strong_y,
-    int *strong_height,
-    int *weak_x, int *weak_y,
-    int *weak_height)
-  {
-    PangoLayout *layout = EnsureLayout();
-    int cursor_index = TextIndexToLayoutIndex(cursor_, true);
-
-    PangoRectangle strong, weak;
-    pango_layout_get_cursor_pos(layout, cursor_index, &strong, &weak);
-
-    if (strong_x)
-      *strong_x = PANGO_PIXELS(strong.x);
-    if (strong_y)
-      *strong_y = PANGO_PIXELS(strong.y);
-    if (strong_height)
-      *strong_height = PANGO_PIXELS(strong.height);
-    if (weak_x)
-      *weak_x = PANGO_PIXELS(weak.x);
-    if (weak_y)
-      *weak_y = PANGO_PIXELS(weak.y);
-    if (weak_height)
-      *weak_height = PANGO_PIXELS(weak.height);
-  }
-
-  PangoLayout* TextEntryIM::EnsureLayout()
-  {
-    if (!cached_layout_)
-    {
-      cached_layout_ = CreateLayout();
-    }
-    return cached_layout_;
-  }
-
-  void TextEntryIM::QueueTextDraw()
-  {
-    if (content_modified_)
-    {
-      UpdateSelectionRegion();
-      UpdateCursorRegion();
-      QueueDraw(); //owner->QueueDraw();
-      content_modified_ = false;
-      update_canvas_ = true;
-    }
-    else
-    {
-      if (selection_changed_)
-      {
-        UpdateSelectionRegion();
-        if (!last_selection_region_.empty())
-          QueueDraw(); //owner_->QueueDrawRegion(last_selection_region_);
-        if (!selection_region_.empty())
-          QueueDraw(); //owner_->QueueDrawRegion(selection_region_);
-        selection_changed_ = false;
-      }
-      if (cursor_moved_)
-      {
-        UpdateCursorRegion();
-        if (!last_cursor_region_.empty())
-          QueueDraw(); //owner_->QueueDrawRegion(last_cursor_region_);
-        if (!cursor_region_.empty())
-          QueueDraw(); //owner_->QueueDrawRegion(cursor_region_);
-        cursor_moved_ = false;
-      }
-    }
-  }
-
-  void TextEntryIM::ResetLayout()
-  {
-    if (cached_layout_)
-    {
-      g_object_unref(cached_layout_);
-      cached_layout_ = NULL;
-      content_modified_ = true;
-    }
-  }
-
-  PangoLayout* TextEntryIM::CreateLayout()
-  {
-    // Creates the pango layout with a temporary canvas that is not zoomed.
-    CairoGraphics *canvas = new CairoGraphics(CAIRO_FORMAT_ARGB32, 1, 1);
-    PangoLayout *layout = pango_cairo_create_layout(canvas->GetInternalContext());
-    delete canvas;
-    PangoAttrList *tmp_attrs = pango_attr_list_new();
-    std::string tmp_string;
-
-    /* Set necessary parameters */
-    pango_cairo_context_set_font_options(pango_layout_get_context(layout),
-                                          font_options_);
-    pango_cairo_context_set_resolution(pango_layout_get_context(layout),
-                                        font_dpi_);
-
-    if (wrap_)
-    {
-      pango_layout_set_width(layout, (GetBaseWidth() - kInnerBorderX * 2) * PANGO_SCALE);
-      pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-    }
-    else
-    {
-      pango_layout_set_width(layout, -1);
-    }
-
-    pango_layout_set_single_paragraph_mode(layout, !multiline_);
-
-    if (preedit_.length())
-    {
-      size_t cursor_index = static_cast<size_t>(cursor_);
-      size_t text_length = text_.length();
-      size_t preedit_length = preedit_.length();
-      if (visible_)
-      {
-        tmp_string = text_;
-        tmp_string.insert(cursor_index, preedit_);
-      }
-      else
-      {
-        size_t nchars = g_utf8_strlen(text_.c_str(), text_length);
-        size_t preedit_nchars = g_utf8_strlen(preedit_.c_str(), preedit_length);
-        nchars += preedit_nchars;
-        tmp_string.reserve(password_char_.length() * nchars);
-        for (size_t i = 0; i < nchars; ++i)
-          tmp_string.append(password_char_);
-        size_t cursor_offset =
-            g_utf8_pointer_to_offset(text_.c_str(), text_.c_str() + cursor_index);
-        /* Fix cursor index and preedit_length */
-        cursor_index = cursor_offset * password_char_.length();
-        preedit_length = preedit_nchars * password_char_.length();
-      }
-      if (preedit_attrs_)
-        pango_attr_list_splice(tmp_attrs, preedit_attrs_,
-                               static_cast<int>(cursor_index),
-                               static_cast<int>(preedit_length));
-    }
-    else
-    {
-      if (visible_)
-      {
-        tmp_string = text_;
-      }
-      else
-      {
-        size_t nchars = g_utf8_strlen(text_.c_str(), text_.length());
-        tmp_string.reserve(password_char_.length() * nchars);
-        for (size_t i = 0; i < nchars; ++i)
-          tmp_string.append(password_char_);
-      }
-    }
-
-    int pre_completion_length = tmp_string.length();
-
-    if (!completion_.empty() && !wrap_)
-    {
-      tmp_string = text_ + completion_;
-    }
-
-    pango_layout_set_text(layout, tmp_string.c_str(),
-                          static_cast<int>(tmp_string.length()));
-
-    /* Set necessary attributes */
-    PangoAttribute *attr;
-    if (underline_)
-    {
-      attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-      attr->start_index = 0;
-      attr->end_index = static_cast<guint>(pre_completion_length);
-      pango_attr_list_insert(tmp_attrs, attr);
-    }
-    if (strikeout_)
-    {
-      attr = pango_attr_strikethrough_new(TRUE);
-      attr->start_index = 0;
-      attr->end_index = static_cast<guint>(pre_completion_length);
-      pango_attr_list_insert(tmp_attrs, attr);
-    }
-    if (!completion_.empty() && !wrap_)
-    {
-      attr = pango_attr_foreground_new(65535 * completion_color_.red, 
-                                       65535 * completion_color_.green,
-                                       65535 * completion_color_.blue);
-      attr->start_index = static_cast<guint>(pre_completion_length);
-      attr->end_index = static_cast<guint>(tmp_string.length());
-      pango_attr_list_insert(tmp_attrs, attr);
-    }
-    /* Set font desc */
-    {
-      /* safe to down_cast here, because we know the actual implementation. */
-      CairoFont *font = new CairoFont(
-              font_family_.empty() ? kDefaultFontName : font_family_.c_str(),
-              font_size_,
-              italic_ ? CairoFont::STYLE_ITALIC : CairoFont::STYLE_NORMAL,
-              bold_ ? CairoFont::WEIGHT_BOLD : CairoFont::WEIGHT_NORMAL);
-      nuxAssert(font);
-      attr = pango_attr_font_desc_new(font->GetFontDescription());
-      attr->start_index = 0;
-      attr->end_index = static_cast<unsigned int>(tmp_string.length());
-      pango_attr_list_insert(tmp_attrs, attr);
-      pango_layout_set_font_description(layout, font->GetFontDescription());
-      font->Destroy();
-    }
-    pango_layout_set_attributes(layout, tmp_attrs);
-    pango_attr_list_unref(tmp_attrs);
-
-    /* Set alignment according to text direction. Only set layout's alignment
-     * when it's not wrapped and in single line mode.
-     */
-    if (!wrap_ && pango_layout_get_line_count(layout) <= 1 &&
-        align_ != CairoGraphics::ALIGN_CENTER)
-    {
-      PangoDirection dir;
-      if (visible_)
-        dir = pango_find_base_dir(tmp_string.c_str(),
-                                  static_cast<int>(tmp_string.length()));
-      else
-        dir = PANGO_DIRECTION_NEUTRAL;
-
-      if (dir == PANGO_DIRECTION_NEUTRAL)
-      {
-//         GtkWidget *widget = GetWidgetAndCursorLocation(NULL);
-//         if (widget && gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
-//           dir = PANGO_DIRECTION_RTL;
-//         else
-//           dir = PANGO_DIRECTION_LTR;
-
-        dir = PANGO_DIRECTION_LTR;
-      }
-
-      // If wordWrap is false then "justify" alignment has no effect.
-      PangoAlignment pango_align = (align_ == CairoGraphics::ALIGN_RIGHT ?
-                                    PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT);
-
-      // Invert the alignment if text direction is right to left.
-      if (dir == PANGO_DIRECTION_RTL)
-      {
-        pango_align = (align_ == CairoGraphics::ALIGN_RIGHT ?
-                       PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
-      }
-
-      pango_layout_set_alignment(layout, pango_align);
-      pango_layout_set_justify(layout, FALSE);
-    }
-    else if (align_ == CairoGraphics::ALIGN_JUSTIFY)
-    {
-      pango_layout_set_justify(layout, TRUE);
-      pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
-    }
-    else if (align_ == CairoGraphics::ALIGN_RIGHT)
-    {
-      pango_layout_set_justify(layout, FALSE);
-      pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);
-    }
-    else if (align_ == CairoGraphics::ALIGN_CENTER)
-    {
-      pango_layout_set_justify(layout, FALSE);
-      pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-    }
-    else
-    {
-      pango_layout_set_justify(layout, FALSE);
-      pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
-    }
-
-    {
-      PangoContext *context;
-      PangoFontMetrics *metrics;
-      int ascent, descent;
-
-      context = pango_layout_get_context(layout);
-      metrics = pango_context_get_metrics(context,
-                                           pango_layout_get_font_description(layout),
-                                           pango_context_get_language(context));
-
-      ascent = pango_font_metrics_get_ascent(metrics);
-      descent = pango_font_metrics_get_descent(metrics);
-
-      int full_height = PANGO_PIXELS(ascent + descent) + (kInnerBorderY * 2);
-      SetMinimumHeight(full_height);
-
-      pango_font_metrics_unref(metrics);
-    }
-
-    return layout;
-  }
-
-  int TextEntryIM::TextIndexToLayoutIndex(int text_index, bool consider_preedit_cursor)
-  {
-      if (visible_)
-      {
-        if (text_index < cursor_)
-          return text_index;
-
-        if (text_index == cursor_ && consider_preedit_cursor)
-          return text_index + preedit_cursor_;
-
-        return text_index + static_cast<int>(preedit_.length());
-      }
-
-      const char *text = text_.c_str();
-      int offset = static_cast<int>(
-        g_utf8_pointer_to_offset(text, text + text_index));
-      int preedit_offset = 0;
-      int preedit_chars = 0;
-      if (preedit_.length())
-      {
-        const char *preedit_text = preedit_.c_str();
-        preedit_offset = static_cast<int>(g_utf8_pointer_to_offset(
-          preedit_text, preedit_text + preedit_cursor_));
-        preedit_chars = static_cast<int>(g_utf8_strlen(
-          preedit_text, preedit_.length()));
-      }
-
-      int password_char_length = static_cast<int>(password_char_.length());
-
-      if (text_index < cursor_)
-        return offset * password_char_length;
-
-      if (text_index == cursor_ && consider_preedit_cursor)
-        return (offset + preedit_offset) * password_char_length;
-
-      return (offset + preedit_chars) * password_char_length;
-  }
-
-
-  int TextEntryIM::LayoutIndexToTextIndex(int layout_index)
-  {
-    if (visible_)
-    {
-      if (layout_index < cursor_)
-        return layout_index;
-
-      int preedit_length = static_cast<int>(preedit_.length());
-      if (layout_index >= cursor_ + preedit_length)
-        return layout_index - preedit_length;
-
-      return cursor_;
-    }
-
-    int password_char_length = static_cast<int>(password_char_.length());
-    nuxAssert(layout_index % password_char_length == 0);
-
-    int offset = layout_index / password_char_length;
-
-    const char *text = text_.c_str();
-    int cursor_offset = static_cast<int>(
-      g_utf8_pointer_to_offset(text, text + cursor_));
-    int preedit_chars = static_cast<int>(
-      g_utf8_strlen(preedit_.c_str(), preedit_.length()));
-
-    if (offset < cursor_offset)
-      return static_cast<int>(g_utf8_offset_to_pointer(text, offset) - text);
-
-    if (offset >= cursor_offset + preedit_chars)
-      return static_cast<int>(
-      g_utf8_offset_to_pointer(text, offset - preedit_chars) - text);
-
-    return cursor_;
-  }
-
-  int TextEntryIM::GetCharLength(int index)
-  {
-    const char *text = text_.c_str();
-    const char *ptr = text + index;
-    const char *end = text + text_.length();
-    const char *next = g_utf8_find_next_char(ptr, end);
-    return static_cast<int>(next ? static_cast<int>(next - ptr) : end - ptr);
-  }
-
-  int TextEntryIM::GetPrevCharLength(int index)
-  {
-    const char *text = text_.c_str();
-    const char *ptr = text + index;
-    const char *prev = g_utf8_find_prev_char(text, ptr);
-    return static_cast<int>(prev ? static_cast<int>(ptr - prev) : ptr - text);
-  }
-
-  void TextEntryIM::EnterText(const char *str)
-  {
-    if (readonly_ || !str || !*str) return;
-
-    if (GetSelectionBounds(NULL, NULL))
-    {
-      DeleteSelection();
-    }
-    else if (overwrite_ && cursor_ != static_cast<int>(text_.length()))
-    {
-      DeleteText(cursor_, cursor_ + GetCharLength(cursor_));
-    }
-
-    std::string tmp_text;
-    if (!multiline_)
-    {
-      tmp_text = CleanupLineBreaks(str);
-      str = tmp_text.c_str();
-    }
-
-    const char *end = NULL;
-    g_utf8_validate(str, -1, &end);
-    if (end > str)
-    {
-      size_t len = end - str;
-
-      text_.insert(cursor_, str, len);
-      cursor_ += static_cast<int>(len);
-      selection_bound_ += static_cast<int>(len);
-    }
-
-    ResetLayout();
-    sigTextChanged.emit(this);
-  }
-
-  void TextEntryIM::DeleteText(int start, int end)
-  {
-    if (readonly_) return;
-
-    int text_length = static_cast<int>(text_.length());
-    if (start < 0)
-      start = 0;
-    else if (start > text_length)
-      start = text_length;
-
-    if (end < 0)
-      end = 0;
-    else if (end > text_length)
-      end = text_length;
-
-    if (start > end)
-      std::swap(start, end);
-    else if (start == end)
-      return;
-
-    text_.erase(start, end - start);
-
-    if (cursor_ >= end)
-      cursor_ -= (end - start);
-    if (selection_bound_ >= end)
-      selection_bound_ -= (end - start);
-
-    ResetLayout();
-    sigTextChanged.emit(this);
-  }
-
-  void TextEntryIM::SelectWord()
-  {
-    int selection_bound = MoveWords(cursor_, -1);
-    int cursor = MoveWords(selection_bound, 1);
-    SetSelectionBounds(selection_bound, cursor);
-  }
-
-  void TextEntryIM::SelectLine()
-  {
-    int selection_bound = MoveLineEnds(cursor_, -1);
-    int cursor = MoveLineEnds(selection_bound, 1);
-    SetSelectionBounds(selection_bound, cursor);
-  }
-
-  void TextEntryIM::Select(int start, int end) {
-    int text_length = static_cast<int>(text_.length());
-    if (start == -1)
-      start = text_length;
-    if (end == -1)
-      end = text_length;
-
-    start = Clamp(start, 0, text_length);
-    end = Clamp(end, 0, text_length);
-    SetSelectionBounds(start, end);
-    QueueRefresh(false, true);
-  }
-
-  void TextEntryIM::SelectAll() {
-    SetSelectionBounds(0, static_cast<int>(text_.length()));
-    QueueRefresh(false, true);
-  }
-
-  CairoGraphics::Alignment TextEntryIM::GetAlign() const
-  {
-    return align_;
-  }
-
-  void TextEntryIM::SetAlign(CairoGraphics::Alignment align)
-  {
-    align_ = align;
-    QueueRefresh(true, true);
-  }
-
-  bool TextEntryIM::im_active()
-  {
-    return ime_active_;
-  }
-
-  void TextEntryIM::DeleteSelection()
-  {
-    int start, end;
-    if (GetSelectionBounds(&start, &end))
-      DeleteText(start, end);
-  }
-
-  void TextEntryIM::CopyClipboard()
-  {
-//     int start, end;
-//     if (GetSelectionBounds(&start, &end))
-//     {
-//       GtkWidget *widget = GetWidgetAndCursorLocation(NULL);
-//       if (widget)
-//       {
-//         if (visible_)
-//         {
-//           gtk_clipboard_set_text(
-//             gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD),
-//             text_.c_str() + start, end - start);
-//         }
-//         else
-//         {
-//           // Don't copy real content if it's in invisible.
-//           std::string content;
-//           int nchars = static_cast<int>(
-//             g_utf8_strlen(text_.c_str() + start, end - start));
-//           for (int i = 0; i < nchars; ++i)
-//             content.append(password_char_);
-//           gtk_clipboard_set_text(
-//             gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD),
-//             content.c_str(), static_cast<int>(content.length()));
-//         }
-//       }
-//     }
-  }
-
-  void TextEntryIM::CutClipboard()
-  {
-    CopyClipboard();
-    DeleteSelection();
-  }
-
-  void TextEntryIM::PasteClipboard()
-  {
-//     GtkWidget *widget = GetWidgetAndCursorLocation(NULL);
-//     if (widget)
-//     {
-//       gtk_clipboard_request_text(
-//         gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD),
-//         PasteCallback, this);
-//     }
-  }
-
-  void TextEntryIM::BackSpace(MovementStep step)
-  {
-    if (GetSelectionBounds(NULL, NULL))
-    {
-      DeleteSelection();
-    }
-    else
-    {
-      if (cursor_ == 0)
-        return;
-      if (step == VISUALLY)
-      {
-        DeleteText(cursor_ - GetPrevCharLength(cursor_), cursor_);
-      }
-      else if (step == WORDS)
-      {
-        int new_cursor;
-        new_cursor = MoveWords(cursor_, -1);
-        DeleteText(new_cursor, cursor_);
-      }
-    }
-  }
-
-  void TextEntryIM::Delete(MovementStep step)
-  {
-    if (GetSelectionBounds(NULL, NULL))
-    {
-      DeleteSelection();
-    }
-    else
-    {
-      if (cursor_ == static_cast<int>(text_.length()))
-        return;
-      if (step == VISUALLY)
-      {
-        DeleteText(cursor_, cursor_ + GetCharLength(cursor_));
-      }
-      else if (step == WORDS)
-      {
-        int new_cursor;
-        new_cursor = MoveWords(cursor_, 1);
-        DeleteText(cursor_, new_cursor);
-      }
-    }
-  }
-
-  void TextEntryIM::ToggleOverwrite()
-  {
-    overwrite_ = !overwrite_;
-  }
-
-  void TextEntryIM::UpdateSelectionRegion()
-  {
-    selection_region_.clear();
-
-    // Selection in a single line may be not continual, so we use pango to
-    // get the x-ranges of each selection range in one line, and draw them
-    // separately.
-    int start_index, end_index;
-    if (GetSelectionBounds(&start_index, &end_index))
-    {
-      PangoLayout *layout = EnsureLayout();
-      PangoRectangle line_extents, pos;
-      int draw_start, draw_end;
-      int *ranges;
-      int n_ranges;
-      int n_lines = pango_layout_get_line_count(layout);
-
-      start_index = TextIndexToLayoutIndex(start_index, false);
-      end_index = TextIndexToLayoutIndex(end_index, false);
-
-      for (int line_index = 0; line_index < n_lines; ++line_index)
-      {
-#if PANGO_VERSION_CHECK(1,16,0)
-        PangoLayoutLine *line = pango_layout_get_line_readonly(layout, line_index);
-#else
-        PangoLayoutLine *line = pango_layout_get_line(layout, line_index);
-#endif
-        if (line->start_index + line->length < start_index)
-          continue;
-        if (end_index < line->start_index)
-          break;
-        draw_start = Max<int>(start_index, line->start_index);
-        draw_end = Min<int>(end_index, line->start_index + line->length);
-        pango_layout_line_get_x_ranges(line, draw_start, draw_end,
-          &ranges, &n_ranges);
-        pango_layout_line_get_pixel_extents(line, NULL, &line_extents);
-        pango_layout_index_to_pos(layout, line->start_index,  &pos);
-        for (int i = 0; i < n_ranges; ++i)
-        {
-          selection_region_.push_back(Rect(
-            kInnerBorderX + scroll_offset_x_ + PANGO_PIXELS(ranges[i * 2]),
-            kInnerBorderY + scroll_offset_y_ + PANGO_PIXELS(pos.y),
-            PANGO_PIXELS(ranges[i * 2 + 1] - ranges[i * 2]),
-            line_extents.height));
-        }
-        g_free(ranges);
-      }
-    }
-  }
-
-  void TextEntryIM::MoveCursor(MovementStep step, int count, bool extend_selection)
-  {
-    if (ime_active_)
-      return; 
-
-    ResetImContext();
-    int new_cursor = 0;
-    // Clear selection first if not extend it.
-    if (!extend_selection)
-    {
-      selection_changed_ = true;
-      cursor_moved_ = true;
-      selection_bound_ = cursor_;
-      cursor_moved.emit(cursor_);
-    }
-
-    // Calculate the new offset after motion.
-    switch(step)
-    {
-    case VISUALLY:
-      new_cursor = MoveVisually(cursor_, count);
-      break;
-    case WORDS:
-      new_cursor = MoveWords(cursor_, count);
-      break;
-    case DISPLAY_LINES:
-      new_cursor = MoveDisplayLines(cursor_, count);
-      break;
-    case DISPLAY_LINE_ENDS:
-      new_cursor = MoveLineEnds(cursor_, count);
-      break;
-    case PAGES:
-      new_cursor = MovePages(cursor_, count);
-      break;
-    case BUFFER:
-      nuxAssert(count == -1 || count == 1);
-      new_cursor = static_cast<int>(count == -1 ? 0 : text_.length());
-      break;
-    }
-
-    if (extend_selection)
-      SetSelectionBounds(selection_bound_, new_cursor);
-    else
-      SetCursor(new_cursor);
-
-    QueueRefresh(true, true);
-  }
-
-  int TextEntryIM::MoveVisually(int current_index, int count)
-  {
-    nuxAssert(current_index >= 0 &&
-      current_index <= static_cast<int>(text_.length()));
-    nuxAssert(count);
-    nuxAssert(preedit_.length() == 0);
-
-    PangoLayout *layout = EnsureLayout();
-    const char *text = pango_layout_get_text(layout);
-    int index = TextIndexToLayoutIndex(current_index, false);
-    int new_index = 0;
-    int new_trailing = 0;
-    while (count != 0)
-    {
-      if (count > 0)
-      {
-        --count;
-        pango_layout_move_cursor_visually(layout, true, index, 0, 1,
-          &new_index, &new_trailing);
-      }
-      else if (count < 0)
-      {
-        ++count;
-        pango_layout_move_cursor_visually(layout, true, index, 0, -1,
-          &new_index, &new_trailing);
-      }
-      index = new_index;
-      if (index < 0 || index == G_MAXINT)
-        return current_index;
-      index = static_cast<int>(g_utf8_offset_to_pointer(text + index, new_trailing) - text);
-    }
-    return LayoutIndexToTextIndex(index);
-  }
-
-  int TextEntryIM::MoveWords(int current_index, int count)
-  {
-    nuxAssert(current_index >= 0 &&
-      current_index <= static_cast<int>(text_.length()));
-    nuxAssert(count);
-    nuxAssert(preedit_.length() == 0);
-
-    if (!visible_)
-    {
-      return static_cast<int>(count > 0 ? text_.length() : 0);
-    }
-
-    // The cursor movement direction shall be determined by the direction of
-    // current text line.
-    PangoLayout *layout = EnsureLayout();
-    int n_log_attrs;
-    PangoLogAttr *log_attrs;
-    pango_layout_get_log_attrs(layout, &log_attrs, &n_log_attrs);
-    const char *text = pango_layout_get_text(layout);
-    int index = TextIndexToLayoutIndex(current_index, false);
-    int line_index;
-    pango_layout_index_to_line_x(layout, index, FALSE, &line_index, NULL);
-
-    // Weird bug: line_index here may be >= than line count?
-    int line_count = pango_layout_get_line_count(layout);
-    if (line_index >= line_count)
-    {
-      line_index = line_count - 1;
-    }
-
-#if PANGO_VERSION_CHECK(1,16,0)
-    PangoLayoutLine *line = pango_layout_get_line_readonly(layout, line_index);
-#else
-    PangoLayoutLine *line = pango_layout_get_line(layout, line_index);
-#endif
-    bool rtl = (line->resolved_dir == PANGO_DIRECTION_RTL);
-    const char *ptr = text + index;
-    int offset = static_cast<int>(g_utf8_pointer_to_offset(text, ptr));
-    while (count != 0)
-    {
-      if (((rtl && count < 0) || (!rtl && count > 0)) && *ptr)
-      {
-        if (log_attrs[offset].is_white)
-        {
-          while (ptr && *ptr && log_attrs[offset].is_white)
-          {
-            ptr = g_utf8_find_next_char(ptr, NULL);
-            ++offset;
-          }
-        }
-        else
-        {
-          if (ptr && *ptr)
-          {
-            ptr = g_utf8_find_next_char(ptr, NULL);
-            ++offset;
-          }
-        }
-        while (ptr && *ptr)
-        {
-          ptr = g_utf8_find_next_char(ptr, NULL);
-          ++offset;
-          if (log_attrs[offset].is_word_start || log_attrs[offset].is_word_end)
-            break;
-        }
-        if (!ptr)
-        {
-          ptr = text;
-          while (*ptr) ++ptr;
-        }
-      }
-      else if (((rtl && count > 0) || (!rtl && count < 0)) && (ptr > text))
-      {
-        if (offset > 0 && log_attrs[offset - 1].is_white)
-        {
-          while (ptr && offset > 0 && log_attrs[offset - 1].is_white)
-          {
-            ptr = g_utf8_find_prev_char(text, ptr);
-            --offset;
-          }
-        }
-        else
-        {
-          if (ptr)
-          {
-            ptr = g_utf8_find_prev_char(text, ptr);
-            --offset;
-          }
-        }
-        while (ptr /*&& *ptr*/) //fix: when at the end of the string, allow ctrl+left arrow to move backward to the start/end of the previous word.
-        {
-          ptr = g_utf8_find_prev_char(text, ptr);
-          --offset;
-          if (log_attrs[offset].is_word_start || log_attrs[offset].is_word_end)
-            break;
-        }
-        if (!ptr)
-          ptr = text;
-      }
-      else
-      {
-        break;
-      }
-      if (count > 0)
-        --count;
-      else
-        ++count;
-    }
-    return LayoutIndexToTextIndex(static_cast<int>(ptr - text));
-  }
-
-  int TextEntryIM::MoveDisplayLines(int current_index, int count)
-  {
-    nuxAssert(current_index >= 0 &&
-      current_index <= static_cast<int>(text_.length()));
-    nuxAssert(count);
-    nuxAssert(preedit_.length() == 0);
-
-    PangoLayout *layout = EnsureLayout();
-    const char *text = pango_layout_get_text(layout);
-    int index = TextIndexToLayoutIndex(current_index, false);
-    int n_lines = pango_layout_get_line_count(layout);
-    int line_index = 0;
-    int x_off = 0;
-    PangoRectangle rect;
-
-    // Find the current cursor X position in layout
-    pango_layout_index_to_line_x(layout, index, FALSE, &line_index, &x_off);
-
-    // Weird bug: line_index here may be >= than line count?
-    if (line_index >= n_lines)
-    {
-      line_index = n_lines - 1;
-    }
-
-    pango_layout_get_cursor_pos(layout, index, &rect, NULL);
-    x_off = rect.x;
-
-    line_index += count;
-
-    if (line_index < 0)
-    {
-      return 0;
-    }
-    else if (line_index >= n_lines)
-    {
-      return static_cast<int>(text_.length());
-    }
-
-    int trailing;
-#if PANGO_VERSION_CHECK(1,16,0)
-    PangoLayoutLine *line = pango_layout_get_line_readonly(layout, line_index);
-#else
-    PangoLayoutLine *line = pango_layout_get_line(layout, line_index);
-#endif
-    // Find out the cursor x offset related to the new line position.
-    if (line->resolved_dir == PANGO_DIRECTION_RTL)
-    {
-      pango_layout_get_cursor_pos(layout, line->start_index + line->length,
-        &rect, NULL);
-    }
-    else
-    {
-      pango_layout_get_cursor_pos(layout, line->start_index, &rect, NULL);
-    }
-
-    // rect.x is the left edge position of the line in the layout
-    x_off -= rect.x;
-    if (x_off < 0) x_off = 0;
-    pango_layout_line_x_to_index(line, x_off, &index, &trailing);
-
-    index = static_cast<int>(g_utf8_offset_to_pointer(text + index, trailing) - text);
-    return LayoutIndexToTextIndex(index);
-  }
-
-  int TextEntryIM::MovePages(int current_index, int count)
-  {
-    nuxAssert(current_index >= 0 &&
-      current_index <= static_cast<int>(text_.length()));
-    nuxAssert(count);
-    nuxAssert(preedit_.length() == 0);
-
-    // Transfer pages to display lines.
-    PangoLayout *layout = EnsureLayout();
-    int layout_height;
-    pango_layout_get_pixel_size(layout, NULL, &layout_height);
-    int n_lines = pango_layout_get_line_count(layout);
-    int line_height = layout_height / n_lines;
-    int page_lines = (GetBaseHeight() - kInnerBorderY * 2) / line_height;
-    return MoveDisplayLines(current_index, count * page_lines);
-  }
-
-  int TextEntryIM::MoveLineEnds(int current_index, int count)
-  {
-    nuxAssert(current_index >= 0 &&
-      current_index <= static_cast<int>(text_.length()));
-    nuxAssert(count);
-    nuxAssert(preedit_.length() == 0);
-
-    PangoLayout *layout = EnsureLayout();
-    int index = TextIndexToLayoutIndex(current_index, false);
-    int line_index = 0;
-
-    // Find current line
-    pango_layout_index_to_line_x(layout, index, FALSE, &line_index, NULL);
-
-    // Weird bug: line_index here may be >= than line count?
-    int line_count = pango_layout_get_line_count(layout);
-    if (line_index >= line_count)
-    {
-      line_index = line_count - 1;
-    }
-
-// #if PANGO_VERSION_CHECK(1,16,0)
-//     PangoLayoutLine *line = pango_layout_get_line_readonly(layout, line_index);
-// #else
-    PangoLayoutLine *line = pango_layout_get_line(layout, line_index);
-// #endif
-
-    if (line->length == 0)
-      return current_index;
-
-    if ((line->resolved_dir == PANGO_DIRECTION_RTL && count < 0) ||
-      (line->resolved_dir != PANGO_DIRECTION_RTL && count > 0))
-    {
-        index = line->start_index + line->length;
-    }
-    else
-    {
-      index = line->start_index;
-    }
-    return LayoutIndexToTextIndex(index);
-  }
-
-  void TextEntryIM::SetCursor(int cursor)
-  {
-    if (cursor != cursor_)
-    {
-      ResetImContext();
-      // If there was a selection range, then the selection range will be cleared.
-      // Then content_modified_ shall be set to true to force redrawing the text.
-      if (cursor_ != selection_bound_)
-        selection_changed_ = true;
-      cursor_ = cursor;
-      selection_bound_ = cursor;
-      cursor_moved_ = true;
-
-      cursor_moved.emit(cursor);
-    }
-  }
-
-  int TextEntryIM::XYToTextIndex(int x, int y)
-  {
-    int width, height;
-    PangoLayout *layout = EnsureLayout();
-    const char *text = pango_layout_get_text(layout);
-    pango_layout_get_pixel_size(layout, &width, &height);
-
-    if (y < 0)
-    {
-      return 0;
-    }
-    else if (y >= height)
-    {
-      return static_cast<int>(text_.length());
-    }
-
-    int trailing;
-    int index;
-    pango_layout_xy_to_index(layout, x * PANGO_SCALE, y * PANGO_SCALE,
-      &index, &trailing);
-    index = static_cast<int>(
-      g_utf8_offset_to_pointer(text + index, trailing) - text);
-
-    index = LayoutIndexToTextIndex(index);
-
-    // Adjust the offset if preedit is not empty and if the offset is after
-    // current cursor.
-    int preedit_length = static_cast<int>(preedit_.length());
-    if (preedit_length && index > cursor_)
-    {
-      if (index >= cursor_ + preedit_length)
-        index -= preedit_length;
-      else
-        index = cursor_;
-    }
-    return Clamp(index, 0, static_cast<int>(text_.length()));
-  }
-
-  bool TextEntryIM::GetSelectionBounds(int *start, int *end)
-  {
-    if (start)
-      *start = Min<int>(selection_bound_, cursor_);
-    if (end)
-      *end = Max<int>(selection_bound_, cursor_);
-
-    return (selection_bound_ != cursor_);
-  }
-
-  void TextEntryIM::SetSelectionBounds(int selection_bound, int cursor)
-  {
-    if (selection_bound_ != selection_bound || cursor_ != cursor)
-    {
-      selection_changed_ = true;
-      selection_bound_ = selection_bound;
-      if (cursor_ != cursor)
-      {
-        cursor_ = cursor;
-        cursor_moved_ = true;
-        cursor_moved.emit(cursor);
-      }
-
-      //ResetImContext();
-    }
-  }
-
-  void TextEntryIM::SetFontFamily(const char *font)
-  {
-    font_family_ = font;
-    QueueRefresh(true, true);
-  }
-
-  void TextEntryIM::SetFontSize(double font_size)
-  {
-    font_size_ = font_size;
-    QueueRefresh(true, true);
-  }
-
-  void TextEntryIM::SetFontOptions(const cairo_font_options_t *options)
-  {
-    g_return_if_fail(options);
-
-    cairo_font_options_destroy(font_options_);
-    font_options_ = cairo_font_options_copy(options);
-
-    QueueRefresh(true, true);
-  }
-
-  bool TextEntryIM::InspectKeyEvent(unsigned int eventType,
-    unsigned int key_sym,
-    const char* character)
-  {
-    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == true) && (text_input_mode_ == false) && (ime_active_ == false))
-    {
-      if (key_sym == NUX_VK_ENTER ||
-        key_sym == NUX_KP_ENTER ||
-        key_sym == NUX_VK_UP ||
-        key_sym == NUX_VK_DOWN ||
-        key_sym == NUX_VK_LEFT ||
-        key_sym == NUX_VK_RIGHT ||
-        key_sym == NUX_VK_LEFT_TAB ||
-        key_sym == NUX_VK_TAB ||
-        key_sym == NUX_VK_ESCAPE)
-      {
-        return false;
-      }
-    }
-
-    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == true) && (text_input_mode_ == true) && (ime_active_ == false))
-    {
-      // Enable to exit the TextEntryIM when in write mode(hack for unity dash)
-      if (key_sym == NUX_VK_UP ||
-      key_sym == NUX_VK_DOWN ||
-      key_sym == NUX_VK_ESCAPE)
-      {
-        return false;
-      }
-    }
-
-    if ((eventType == NUX_KEYDOWN) && (key_nav_mode_ == false) && (text_input_mode_ == false))
-    {
-      return false;
-    }
-
-    return true;
-  }
-}

=== removed file 'Nux/TextEntryIM.h'
--- Nux/TextEntryIM.h	2012-02-12 01:55:02 +0000
+++ Nux/TextEntryIM.h	1970-01-01 00:00:00 +0000
@@ -1,383 +0,0 @@
-#ifndef TEXTENTRYIM_H
-#define TEXTENTRYIM_H
-
-
-
-// Heavily inspired from google gadget code
-/*
-  Copyright 2008 Google Inc.
-
-  Licensed under the Apache License, Version 2.0(the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-
-#include "cairo/cairo.h"
-#include "pango/pango.h"
-#include "pango/pangocairo.h"
-#include "NuxImage/CairoGraphics.h"
-#include "InputMethodIBus.h"
-
-namespace nux
-{
-  class CairoGraphics;
-  class IBusIMEContext;
-
-  class TextEntryIM: public View
-  {
-    NUX_DECLARE_OBJECT_TYPE(TextEntryIM, View);
-  public:
-    TextEntryIM(const char* text, NUX_FILE_LINE_PROTO);
-    ~TextEntryIM();
-
-    Area* FindAreaUnderMouse(const Point& mouse_position, NuxEventType event_type);
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void PostDraw(GraphicsEngine &graphics_engine, bool force_draw);
-
-    void PreLayoutManagement();
-    long PostLayoutManagement(long layoutResult);
-
-    //  Receivers
-
-    void RecvMouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvKeyEvent(
-      unsigned long    eventType  ,   /*event type*/
-      unsigned long    keysym     ,   /*event keysym*/
-      unsigned long    state      ,   /*event state*/
-      const char*     character  ,   /*character*/
-      unsigned short   keyCount       /*key repeat count*/);
-
-    void RecvStartKeyFocus();
-    void RecvEndKeyFocus();
-
-    bool _size_match_text;
-    BaseTexture *_texture2D;
-
-    void MainDraw();
-    void ProcessMouseEvent(int event_type, int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    void ProcessKeyEvent   (
-      unsigned long    eventType  ,   /*event type*/
-      unsigned long    keysym     ,   /*event keysym*/
-      unsigned long    state      ,   /*event state*/
-      const char*     character  ,   /*character*/
-      unsigned short   keyCount       /*key repeat count*/);
-
-    void FocusInx();
-    void FocusOutx();
-
-    //! Text changed signal
-    /*!
-        This signal is emitted when the text has changed.
-    */
-    sigc::signal <void, TextEntryIM*> sigTextChanged;
-    sigc::signal <void> activated;
-    sigc::signal <void, int> cursor_moved;
-
-    void SetText(const char *text);
-    std::string const& GetText() const;
-
-    void SetCompletion(const char *text); // Should use std::string, does not for consistancy
-    std::string const& GetCompletion() const;
-
-    void SetCompletionColor(const Color &color);
-    Color const& GetCompletionColor() const;
-
-    void SetTextColor(const Color &color);
-    Color const& GetTextColor() const;
-    void SetFontFamily(const char *font);
-    void SetFontSize(double font_size);
-    void SetFontOptions(const cairo_font_options_t *options);
-
-    /** Select text between start and end. */
-    void Select(int start, int end);
-    /** Select all text */
-    void SelectAll();
-
-    CairoGraphics::Alignment GetAlign() const;
-    void SetAlign(CairoGraphics::Alignment align);
-
-    bool im_active();
-
-  protected:
-    bool _block_focus; // used to selectively ignore focus keyevents
-
-    virtual void GeometryChanged();
-
-    /**
-     * Enum used to specify different motion types.
-     */
-    enum MovementStep {
-      VISUALLY,
-      WORDS,
-      DISPLAY_LINES,
-      DISPLAY_LINE_ENDS,
-      PAGES,
-      BUFFER
-    };
-
-    void QueueTextDraw();
-    /** Remove the cached layout. */
-    void ResetLayout();
-    /**
-     * Create pango layout on-demand. If the layout is not changed, return the
-     * cached one.
-     */
-    PangoLayout* EnsureLayout();
-    /** Create a new layout containning current edit content */
-    PangoLayout* CreateLayout();
-    /** Create cairo canvas on-demand. */
-    CairoGraphics* EnsureCanvas();
-    /** Adjust the scroll information */
-    void AdjustScroll();
-    /**
-     * Send out a request to refresh all informations of the edit control
-     * and queue a draw request.
-     * If @c relayout is true then the layout will be regenerated.
-     * */
-    void QueueRefresh(bool relayout, bool adjust_scroll);
-    /** Reset the input method context */
-    void ResetImContext();
-    /** Reset preedit text */
-    void ResetPreedit();
-    /** Send out a request to blink the cursor if necessary */
-    void QueueCursorBlink();
-    static bool CursorBlinkCallback(TextEntryIM *data);
-
-    void ShowCursor();
-    void HideCursor();
-
-    /** Draw the Cursor to the canvas */
-    void DrawCursor(CairoGraphics *canvas);
-    /** Draw the text to the canvas */
-    void DrawText(CairoGraphics *canvas);
-
-    void GetCursorRects(Rect *strong, Rect *weak);
-
-    void UpdateCursorRegion();
-
-    void UpdateSelectionRegion();
-
-    /** Move cursor */
-    void MoveCursor(MovementStep step, int count, bool extend_selection);
-    /** Move cursor visually, meaning left or right */
-    int MoveVisually(int current_pos, int count);
-    /** Move cursor in words */
-    int MoveWords(int current_pos, int count);
-    /** Move cursor in display lines */
-    int MoveDisplayLines(int current_pos, int count);
-    /** Move cursor in pages */
-    int MovePages(int current_pos, int count);
-    /** Move cursor to the beginning or end of a display line */
-    int MoveLineEnds(int current_pos, int count);
-
-    /** Set the current cursor offset, in number of characters. */
-    void SetCursor(int cursor);
-    /** Get the most reasonable character offset according to the pixel
-     * coordinate in the layout */
-    int XYToTextIndex(int x, int y);
-    /** Get the offset range that is currently selected,in number of characters.*/
-    bool GetSelectionBounds(int *start, int *end);
-    /** Set the offest range that should be selected, in number of characters. */
-    void SetSelectionBounds(int selection_bound, int cursor);
-
-    /** Convert index in text_ into index in layout text. */
-    int TextIndexToLayoutIndex(int text_index, bool consider_preedit_cursor);
-
-    /** Convert index in layout text into index in text_. */
-    int LayoutIndexToTextIndex(int layout_index);
-
-    /** Get char length at index, in number of bytes. */
-    int GetCharLength(int index);
-
-    /** Get previous char length before index, in number of bytes. */
-    int GetPrevCharLength(int index);
-
-    /** Insert text at current caret position */
-    void EnterText(const char *str);
-    /** Delete text in a specified range, in number of characters. */
-    void DeleteText(int start, int end);
-
-    /** Select the current word under cursor */
-    void SelectWord();
-    /** Select the current display line under cursor */
-    void SelectLine();
-    /** Delete the text that is currently selected */
-    void DeleteSelection();
-
-    /** Cut the current selected text to the clipboard */
-    void CutClipboard();
-    /** Copy the current selected text to the clipboard */
-    void CopyClipboard();
-    /** Paste the text in the clipboard to current offset */
-    void PasteClipboard();
-    /** Delete a character before the offset of the cursor */
-    void BackSpace(MovementStep step);
-    /** Delete a character at the offset of the cursor */
-    void Delete(MovementStep step);
-    /** Switch between the overwrite mode and the insert mode*/
-    void ToggleOverwrite();
-
-    /** Gets the color of selection background. */
-    Color GetSelectionBackgroundColor();
-    /** Gets the color of selection text. */
-    Color GetSelectionTextColor();
-
-    /**
-     * Gets the cursor location in pango layout. The unit is pixel.
-     */
-    void GetCursorLocationInLayout(int *strong_x, int *strong_y, int *strong_height,
-                                   int *weak_x, int *weak_y, int *weak_height);
-
-    /** The CairoCanvas which hold cairo_t inside */
-    CairoGraphics* canvas_;
-
-    /** The cached Pango Layout */
-    PangoLayout* cached_layout_;
-
-    /** The text content of the edit control */
-    std::string text_;
-    /** The preedit text of the edit control */
-    std::string preedit_;
-    /** Attribute list of the preedit text */
-    PangoAttrList *preedit_attrs_;
-    /**
-     *  The character that should be displayed in invisible mode.
-     *  If this is empty, then the edit control is visible
-     */
-    std::string password_char_;
-
-    /** The completion string */
-    std::string completion_;
-
-    /** The completion colour */
-    Color completion_color_;
-
-    /** Last time of mouse double click event. */
-    unsigned long long last_dblclick_time_;
-
-    /** The current cursor position in number of bytes. */
-    int cursor_;
-    /**
-     * The preedit cursor position within the preedit string,
-     * in number of bytes.
-     */
-    int preedit_cursor_;
-    /**
-     * The current selection bound in number of bytes,
-     * range between cursor_ and selection_bound_ are selected.
-     */
-    int selection_bound_;
-
-    /** X offset of current scroll, in pixels */
-    int scroll_offset_x_;
-    /** Y offset of current scroll, in pixels */
-    int scroll_offset_y_;
-    /** Timer id of cursor blink callback */
-    int cursor_blink_timer_;
-    /**
-     * Indicates the status of cursor blinking,
-     * 0 means hide cursor
-     * otherwise means show cursor.
-     * The maximum value would be 2, and decrased by one in each cursor blink
-     * callback, then there would be 2/3 visible time and 1/3 invisible time.
-     */
-    int cursor_blink_status_;
-
-    /** Whether the text is visible, decided by password_char_ */
-    bool visible_;
-    /** Whether the edit control is focused */
-    bool focused_;
-    /** Whether the input method should be reset */
-    bool need_im_reset_;
-    /** Whether the keyboard in overwrite mode */
-    bool overwrite_;
-    /** Whether the button click should select words */
-    bool select_words_;
-    /** Whether the button click should select lines */
-    bool select_lines_;
-    /** Whether the left button is pressed */
-    bool button_;
-    /** Whether the text should be bold */
-    bool bold_;
-    /** Whether the text should be underlined */
-    bool underline_;
-    /** Whether the text should be struck-out */
-    bool strikeout_;
-    /** Whether the text should be italic */
-    bool italic_;
-    /** Whether the text could be shown in multilines */
-    bool multiline_;
-    /** Whether the text should be wrapped */
-    bool wrap_;
-    /** whether the cursor should be displayed */
-    bool cursor_visible_;
-    /** whether the edit control is readonly */
-    bool readonly_;
-    /**
-     * Indicates if the content of the edit control has been modified
-     * since last draw
-     */
-    bool content_modified_;
-
-    /** Indicates if the selection region has been changed since last draw. */
-    bool selection_changed_;
-
-    /** Indicates if the cursor position has been moved since last draw. */
-    bool cursor_moved_;
-
-    /** Indicates if the canvas cache needs updating. */
-    bool update_canvas_;
-
-    /** The font family of the text */
-    std::string font_family_;
-    /** The font size of the text */
-    double font_size_;
-
-    cairo_font_options_t *font_options_;
-    double font_dpi_;
-
-    /** The text color of the edit control */
-    Color _text_color;
-
-    CairoGraphics::Alignment align_;
-    
-#if defined(NUX_OS_LINUX)
-    Cursor caret_cursor_;
-#endif
-
-    std::list<Rect> last_selection_region_;
-    std::list<Rect> selection_region_;
-    std::list<Rect> last_cursor_region_;
-    std::list<Rect> cursor_region_;
-
-    IBusIMEContext* ime_;
-    bool ime_active_;
-
-    friend class IBusIMEContext;
-
-  protected:
-    bool text_input_mode_;
-    bool key_nav_mode_;
-
-    virtual bool InspectKeyEvent(unsigned int eventType,
-      unsigned int keysym,
-      const char* character);
-};
-}
-
-#endif // TEXTENTRY_H

=== modified file 'configure.ac'
--- configure.ac	2012-02-21 06:39:45 +0000
+++ configure.ac	2012-02-23 05:24:18 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
-m4_define([nux_abi_version], [20120221.01])
+m4_define([nux_abi_version], [20120223.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])
@@ -186,6 +186,16 @@
 AC_SUBST(UNITY_SUPPORT_TEST_CFLAGS)
 AC_SUBST(UNITY_SUPPORT_TEST_LIBS)
 
+PKG_CHECK_MODULES(IBUS,
+                  glib-2.0 >= 2.25.14
+                  gio-2.0
+                  ibus-1.0
+                  gobject-2.0
+                  )
+
+AC_SUBST(IBUS_CFLAGS)
+AC_SUBST(IBUS_LIBS)
+
 dnl ************************************
 dnl Enable/disable tests
 dnl ************************************

=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2012-02-12 22:25:19 +0000
+++ examples/Makefile.am	2012-02-23 05:24:18 +0000
@@ -46,6 +46,7 @@
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
   $(NUX_CFLAGS) \
+  $(IBUS_CFLAGS) \
   $(MAINTAINER_CFLAGS)
 
 ALL_LIBS = \
@@ -54,7 +55,8 @@
   $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
   $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
   $(NUX_EXAMPLES_LIBS) \
-  $(NUX_LIBS)
+  $(NUX_LIBS) \
+  $(IBUS_LIBS) 
 
 # This is the individual executable build. For every $exe in noinst_PROGRAMS
 # you need a $exe_SOURCES and $exe_LDADD so it builds

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-02-19 07:04:11 +0000
+++ tests/Makefile.am	2012-02-23 05:24:18 +0000
@@ -13,8 +13,9 @@
   xtest-vlayout-key-navigation \
   xtest-scrollbar \
   xtest-focus-on-mouse-down \
-  xtest-focus-on-mouse-enter \
-  xtest-keynav-directions
+  xtest-keynav-directions \
+  xtest-text-entry \
+  xtest-focus-on-mouse-enter 
 
 # Please keep alphabetical
 test_nux_SOURCES = \
@@ -100,7 +101,8 @@
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
   $(NUX_CFLAGS) \
-  $(MAINTAINER_CFLAGS)
+  $(MAINTAINER_CFLAGS) \
+  $(IBUS_CFLAGS)
 
 gtest_nux_LDADD = \
   $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
@@ -124,7 +126,8 @@
   $(NUX_CORE_CFLAGS) \
   $(NUX_EXAMPLES_CFLAGS) \
   $(NUX_CFLAGS) \
-  $(MAINTAINER_CFLAGS)
+  $(MAINTAINER_CFLAGS) \
+  $(IBUS_CFLAGS)
 
 TestLibs = $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
   $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
@@ -227,6 +230,14 @@
 xtest_keynav_directions_LDADD = $(TestLibs)
 xtest_keynav_directions_LDFLAGS = -lpthread -lXtst
 
+xtest_text_entry_SOURCES = xtest-text-entry.cpp \
+  nux_automated_test_framework.cpp \
+  nux_automated_test_framework.h
+
+xtest_text_entry_CPPFLAGS = $(TestFlags)
+xtest_text_entry_LDADD = $(TestLibs)
+xtest_text_entry_LDFLAGS = -lpthread -lXtst
+
 
 #run make test as part of make check
 check-local: test gtest test-apps

=== modified file 'tests/Readme.txt'
--- tests/Readme.txt	2012-02-17 13:43:55 +0000
+++ tests/Readme.txt	2012-02-23 05:24:18 +0000
@@ -53,3 +53,6 @@
 
 xtest-keynav-direction
   Test key navigation. Especially test the direction a key nav is coming from when the view is getting the focus.
+
+xtest-text-entry
+  Simulate various operations on the text entry

=== modified file 'tests/nux_automated_test_framework.cpp'
--- tests/nux_automated_test_framework.cpp	2011-12-06 22:44:57 +0000
+++ tests/nux_automated_test_framework.cpp	2012-02-23 05:24:18 +0000
@@ -259,7 +259,16 @@
   }
 
   std::string s(1, c);
-  SendFakeKeyEvent(XStringToKeysym(s.c_str()), modifier);
+
+  if (c == ' ')
+  {
+    SendFakeKeyEvent(XK_space, modifier);
+  }
+  else
+  {   
+    SendFakeKeyEvent(XStringToKeysym(s.c_str()), modifier);
+  }
+
   nux::SleepForMilliseconds(300);
 }
 
@@ -282,7 +291,15 @@
     }
 
     std::string s(1, c);
-    SendFakeKeyEvent(XStringToKeysym(s.c_str()), modifier);
+
+    if (c == ' ')
+    {
+      SendFakeKeyEvent(XK_space, modifier);
+    }
+    else
+    {   
+      SendFakeKeyEvent(XStringToKeysym(s.c_str()), modifier);
+    }
     nux::SleepForMilliseconds(300);
   }
 }
@@ -367,6 +384,44 @@
   SendFakeKeyEvent(XK_Return, 0);
 }
 
+void NuxAutomatedTestFramework::ViewSendRight()
+{
+  SendFakeKeyEvent(XK_Right, 0);
+}
+
+void NuxAutomatedTestFramework::ViewSendLeft()
+{
+  SendFakeKeyEvent(XK_Left, 0);
+}
+
+void NuxAutomatedTestFramework::ViewSendUp()
+{
+  SendFakeKeyEvent(XK_Up, 0);
+}
+
+void NuxAutomatedTestFramework::ViewSendDown()
+{
+  SendFakeKeyEvent(XK_Down, 0);
+}
+
+void NuxAutomatedTestFramework::ViewSendIBusToggle()
+{
+  KeyCode modcode0 = 0;
+  KeyCode modcode1 = 0;
+
+  modcode0 = XKeysymToKeycode(display_, XK_Control_L);
+  XTestFakeKeyEvent(display_, modcode0, True, 0);
+
+  modcode1 = XKeysymToKeycode(display_, XK_space);
+  XTestFakeKeyEvent(display_, modcode1, True, 0);
+
+  // release
+  /* Generate modkey release */
+  XTestFakeKeyEvent(display_, modcode1, False, 0);
+  XTestFakeKeyEvent(display_, modcode0, False, 0);
+
+}
+
 void NuxAutomatedTestFramework::PutMouseAt(int x, int y)
 {
   XTestFakeMotionEvent(display_, XScreenNumberOfScreen(DefaultScreenOfDisplay(display_)), x, y, CurrentTime);  
@@ -458,4 +513,4 @@
   {
     nuxAlertMsg("%s: %s", msg, "Failed");
   }  
-}
\ No newline at end of file
+}

=== modified file 'tests/nux_automated_test_framework.h'
--- tests/nux_automated_test_framework.h	2011-11-23 04:42:44 +0000
+++ tests/nux_automated_test_framework.h	2012-02-23 05:24:18 +0000
@@ -80,6 +80,16 @@
   void ViewSendTab();
   //! Simulate Return key.
   void ViewSendReturn();
+  //! Simulate Left arrow key.
+  void ViewSendLeft();
+  //! Simulate Right arrow key.
+  void ViewSendRight();
+  //! Simulate Up arrow key.
+  void ViewSendUp();
+  //! Simulate Down arrow key.
+  void ViewSendDown();
+
+  void ViewSendIBusToggle();
 
   //! Put the mouse pointer anywhere on the display.
   void PutMouseAt(int x, int y);

=== added file 'tests/xtest-text-entry.cpp'
--- tests/xtest-text-entry.cpp	1970-01-01 00:00:00 +0000
+++ tests/xtest-text-entry.cpp	2012-02-23 05:24:18 +0000
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2010 Inalogic Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jay Taoko <[e-mail]>
+ *
+ */
+
+#include "Nux/Nux.h"
+#include "Nux/WindowThread.h"
+#include "Nux/VLayout.h"
+#include "Nux/TextEntry.h"
+#include "Nux/ProgramFramework/ProgramTemplate.h"
+#include "Nux/ProgramFramework/TestView.h"
+#include <X11/extensions/XTest.h>
+#include <X11/keysym.h> 
+#include "nux_automated_test_framework.h"
+
+class TextTextEntry: public ProgramTemplate
+{
+public:
+  TextTextEntry(const char* program_name, int window_width, int window_height, int program_life_span);
+  ~TextTextEntry();
+
+  virtual void UserInterfaceSetup();
+
+  void TextEntryClick(nux::TextEntry* text_entry);
+  void ResetEvents();
+  nux::TextEntry* text_entry_;
+
+  bool clicked_;
+};
+
+TextTextEntry::TextTextEntry(const char* program_name,
+  int window_width,
+  int window_height,
+  int program_life_span)
+  : ProgramTemplate(program_name, window_width, window_height, program_life_span)
+{
+  ResetEvents();
+  text_entry_ = NULL;
+}
+
+TextTextEntry::~TextTextEntry()
+{
+  
+}
+
+void TextTextEntry::ResetEvents()
+{
+  clicked_ = false;
+}
+
+void TextTextEntry::TextEntryClick(nux::TextEntry* text_entry)
+{
+  if (text_entry_ == text_entry)
+  {
+    clicked_ = true;
+  }
+}
+
+void TextTextEntry::UserInterfaceSetup()
+{
+  nux::VLayout* main_layout = new nux::VLayout(NUX_TRACKER_LOCATION);
+  text_entry_ = new nux::TextEntry("", NUX_TRACKER_LOCATION);
+  text_entry_->SetFontSize(76);
+
+  main_layout->AddView(text_entry_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  main_layout->SetSpaceBetweenChildren(10);
+  main_layout->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
+
+  static_cast<nux::WindowThread*>(window_thread_)->SetLayout(main_layout);
+  
+  nux::ColorLayer background(nux::Color(0xFF4D4D4D));
+  static_cast<nux::WindowThread*>(window_thread_)->SetWindowBackgroundPaintLayer(&background);
+}
+
+bool SetEngineActive (IBusBus* bus_, std::string engine)
+{
+    GList* engines = ibus_bus_list_active_engines(bus_);
+    GList* start = engines;
+
+    bool found = false;
+    gboolean global_flag = ibus_bus_get_use_global_engine(bus_);
+
+    // Iterates through the active engines
+    do
+    {
+      IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (engines->data);
+
+      // Found Engine, make it active!
+      if (g_strcmp0(ibus_engine_desc_get_name(engine_desc), engine.c_str()) == 0)
+      {
+        found = true; 
+
+        // Set ibus to use global engines
+        if (!global_flag)
+          ibus_config_set_value (ibus_bus_get_config(bus_), "general", "use_global_engine", g_variant_new_boolean(true));
+
+        // Set and activate the engine
+        ibus_bus_set_global_engine(bus_,engine.c_str());
+      }
+    } while ((engines = g_list_next(engines)) != NULL);
+
+    // Restores the global setting back to what it was 
+    ibus_config_set_value (ibus_bus_get_config(bus_), "general", "use_global_engine", g_variant_new_boolean(global_flag));
+
+    g_list_free(start);
+    return found;
+}
+
+TextTextEntry* test_textentry = NULL;
+
+void TestingThread(nux::NThread* thread, void* user_data)
+{
+  while (test_textentry->ReadyToGo() == false)
+  {
+    nuxDebugMsg("Waiting to start");
+    nux::SleepForMilliseconds(300);
+  }
+
+  nux::SleepForMilliseconds(1300);
+
+  nux::WindowThread* wnd_thread = static_cast<nux::WindowThread*>(user_data);
+
+  NuxAutomatedTestFramework test(wnd_thread);
+
+  test.Startup();
+
+  test.TestReportMsg(test_textentry->text_entry_, "TextEntry created");
+
+  test_textentry->ResetEvents();
+  test.ViewSendMouseMotionToCenter(test_textentry->text_entry_);
+
+  test.ViewSendMouseClick(0, 1);
+
+  // Type "Nux"
+  // The cursor is at the end of the line
+  // Simulate CTRL+A to select the entire text
+  // Simulate DELETE key to delete the text
+  {
+    test.ViewSendString("Nux");
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "Nux", "Typed \"Nux\"");
+
+    test.ViewSendCtrlA();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetTextSelection() == "Nux", "Selection is \"Nux\"");
+
+   
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "", "TextEntry is empty");
+  }
+
+  // Type "0123456789"
+  // The cursor is at the end of the line
+  // Simulate BACKSPACE key until the text is enpty
+  {
+    test.ViewSendString("Ubuntu");
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "Ubuntu", "Typed \"Ubuntu\"");
+
+    test.ViewSendBackspace();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "Ubunt", "Text is \"Ubunt\"");
+
+    test.ViewSendBackspace();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "Ubun", "Text is \"Ubun\"");
+
+    test.ViewSendBackspace();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "Ubu", "Text is \"Ubu\"");
+
+    test.ViewSendBackspace();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "Ub", "Text is \"Ub\"");
+
+    test.ViewSendBackspace();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "U", "Text is \"U\"");
+
+    test.ViewSendBackspace();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "", "TextEntry is empty");
+  }
+
+  // Type "0123456789"
+  // Move cursor to start of line
+  // Simulate DELETE key until the text is 6789
+  // Simulate CTRL+A to select the entire text
+  // Simulate DELETE key to delete the text
+  {
+    test.ViewSendString("0123456789");
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "0123456789", "Typed \"0123456789\"");
+
+    test_textentry->text_entry_->MoveCursorToLineStart();
+
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "123456789", "Text is \"123456789\"");
+
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "23456789", "Text is \"23456789\"");
+
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "3456789", "Text is \"3456789\"");
+
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "456789", "Text is \"456789\"");
+
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "56789", "Text is \"56789\"");
+
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "6789", "Text \"6789\"");
+
+
+    test.ViewSendCtrlA();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetTextSelection() == "6789", "Selection is \"6789\"");
+
+   
+    test.ViewSendDelete();
+    nux::SleepForMilliseconds(500);
+    test.TestReportMsg(test_textentry->text_entry_->GetText() == "", "TextEntry is empty");
+  }
+
+  // Toggle IBus
+  // Type "qwerty"
+  // Simulate key '1' to select the first IM option
+  {
+    // CTRL+Space to initiate iBus
+    //test.ViewSendIBusToggle();
+    
+    IBusBus* bus_;
+    ibus_init();
+    bus_ = ibus_bus_new();
+    bool active = false;
+  
+    // Test for ibus-pinyin 
+    if (SetEngineActive(bus_,"pinyin"))
+    {
+      // Type random stuff
+      {
+        test.ViewSendString("qwerty");
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "", "TextEntry is only Preedit");
+
+        test.ViewSendChar('1');
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "请问儿童有", "TextEntry is \"请问儿童有\"");
+
+        test.ViewSendCtrlA();
+        nux::SleepForMilliseconds(500);
+        
+        test.ViewSendDelete();
+        nux::SleepForMilliseconds(500);
+      }
+
+      // Testing Cursor in the preedit window
+      {
+        test.ViewSendString("ming");
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "", "TextEntry is only Preedit");
+
+        test.ViewSendLeft();
+        nux::SleepForMilliseconds(500);
+
+        test.ViewSendDelete();
+        nux::SleepForMilliseconds(500);
+
+        test.ViewSendChar('1');
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "民", "TextEntry is \"民\"");
+
+        test.ViewSendCtrlA();
+        nux::SleepForMilliseconds(500);
+        
+        test.ViewSendDelete();
+        nux::SleepForMilliseconds(500);
+      }
+
+      active = true;
+    }
+    else
+    {
+      test.TestReportMsg(false,"Pinyin is NOT an active input method" );
+    }
+
+    // Test for ibus-hangul    
+    if (SetEngineActive(bus_,"hangul"))
+    {   
+      // Test for the the space in ibus-hangul working correctlly 
+      {
+        test.ViewSendString("asd abc ");
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "ㅁㄴㅇ 뮻 ", "TextEntry is \"ㅁㄴㅇ 뮻 \"");
+
+        test.ViewSendCtrlA();
+        nux::SleepForMilliseconds(500);
+
+        test.ViewSendDelete();
+        nux::SleepForMilliseconds(500);
+      }
+
+      active = true;
+    }
+    else
+    {
+      test.TestReportMsg(false,"Hangul is NOT an active input method" );
+    }
+
+    // Checking for ibus-anthy - Japanese
+    if (SetEngineActive(bus_,"anthy"))
+    {   
+      {
+        test.ViewSendString("shisutemu ");
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "", "TextEntry is only Preedit");
+
+        // Ctrl + J commits for ibus-anthy
+        test.ViewSendKeyCombo(XK_Control_L, 0, 0, 'j');
+        nux::SleepForMilliseconds(500);
+        test.TestReportMsg(test_textentry->text_entry_->GetText() == "システム", "TextEntry is \"システム\"");
+
+        test.ViewSendCtrlA();
+        nux::SleepForMilliseconds(500);
+
+        test.ViewSendDelete();
+        nux::SleepForMilliseconds(500);
+      }
+
+      active = true;
+    }
+    else
+    {
+      test.TestReportMsg(false,"Anthy is NOT an active input method" );
+    }
+
+    g_object_unref (bus_); 
+
+    // CTRL+Space to deactivate iBus
+    if (active)
+      test.ViewSendIBusToggle();
+  }
+
+  if (test.WhenDoneTerminateProgram())
+  {
+    wnd_thread->ExitMainLoop();
+  }
+  nuxDebugMsg("Exit testing thread");
+}
+
+int main(int argc, char** argv)
+{
+  int xstatus = XInitThreads();
+  nuxAssertMsg(xstatus > 0, "XInitThreads has failed");
+
+  test_textentry = new TextTextEntry("Text Entry", 600, 200, 40000);
+  test_textentry->Startup();
+  test_textentry->UserInterfaceSetup();
+
+  nux::SystemThread* test_thread = nux::CreateSystemThread(NULL, &TestingThread, test_textentry->GetWindowThread());
+
+  test_thread->Start(test_textentry);
+
+  test_textentry->Run();
+
+  delete test_thread;
+  delete test_textentry;
+
+  return 0;
+}
+