Merge lp:~thomir-deactivatedaccount/nux/textentry-memory-leak-fix into lp:nux/2.0

[Thomi Richards]

Don't leak the Layout instance when the TextEntry is destroyed.

Don't leak the Layout instance when the TextEntry is destroyed.

[lp:~thomir-deactivatedaccount/nux/textentry-memory-leak-fix]

607. By Thomi Richards on 2012-03-29

Don't leak the Canvas or Layout objects when the Text Entry is destroyed.

Unmerged revisions

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-03-17 08:50:58 +0000
+++ Nux/TextEntry.cpp	2012-03-29 04:14:23 +0000
@@ -155,7 +155,7 @@
 #if defined(NUX_OS_LINUX)
     , caret_cursor_(None)
     , ime_(new IBusIMEContext(this))
-#endif    
+#endif
     , ime_active_(false)
     , text_input_mode_(false)
     , key_nav_mode_(false)
@@ -201,6 +201,10 @@
     if (ime_)
       delete ime_;
 #endif
+
+    delete canvas_;
+
+    ResetLayout();
   }
 
   void TextEntry::PreLayoutManagement()
@@ -315,11 +319,15 @@
     cursor_blink_status_ = 4;
 
     // 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); 
+    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)
+<<<<<<< TREE
     im_filtered = ime_->FilterKeyEvent(event);
+=======
+    retval = ime_->FilterKeyEvent(event);
+>>>>>>> MERGE-SOURCE
 #endif
 
     if ((!multiline_) && (!lose_key_focus_on_key_nav_direction_up_) && (keysym == NUX_VK_UP))
@@ -336,8 +344,8 @@
 
     if (event_type == NUX_KEYUP)
       return;
-    
-  
+
+
     // we need to ignore some characters
     if (keysym == NUX_VK_TAB)
       return;
@@ -497,7 +505,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)
@@ -505,7 +513,7 @@
     {
       Display* display = nux::GetGraphicsDisplay()->GetX11Display();
       nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-    
+
       if (display && window)
       {
         caret_cursor_ = XCreateFontCursor(display, XC_xterm);
@@ -514,7 +522,7 @@
     }
 #endif
   }
-  
+
   void TextEntry::RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags)
   {
 #if defined(NUX_OS_LINUX)
@@ -522,7 +530,7 @@
     {
       Display* display = nux::GetGraphicsDisplay()->GetX11Display();
       nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
-      
+
       if (display && window)
       {
         XUndefineCursor(display, window->GetInputWindowId());
@@ -608,7 +616,7 @@
 
   bool TextEntry::HandledDeadKeys(int keysym, int state, const char* character)
   {
-#if defined(NUX_OS_LINUX)    
+#if defined(NUX_OS_LINUX)
     /* Checks if the keysym between the first and last dead key */
     if ((keysym >= XK_dead_grave) && (keysym <= XK_dead_stroke) && !dead_key_mode_)
     {
@@ -619,7 +627,7 @@
       {
         composition_mode_ = true;
         composition_string_.clear();
-        
+
         dead_key_string_ = character;
 
         std::string dead_key;
@@ -636,7 +644,7 @@
     return false;
 #else
     return false;
-#endif        
+#endif
   }
 
   bool TextEntry::HandledComposition(int keysym, const char* character)
@@ -664,9 +672,9 @@
         composition_string_.clear();
         return true;
       }
-        
+
       composition_string_ += character;
-      
+
       std::string composition_match;
 
       int match = LookForMatch(composition_match);
@@ -692,11 +700,11 @@
 
         return true;
       }
-    } 
+    }
     return false;
 #else
     return false;
-#endif    
+#endif
   }
 
   void TextEntry::SetText(const char* text)
@@ -840,7 +848,7 @@
         need_im_reset_ = true;
 #if defined(NUX_OS_LINUX)
         ime_->Focus();
-#endif        
+#endif
         //gtk_im_context_focus_in(im_context_);
         //UpdateIMCursorLocation();
       }
@@ -860,7 +868,7 @@
       if (!readonly_ /*&& im_context_*/)
       {
         need_im_reset_ = true;
-#if defined(NUX_OS_LINUX)        
+#if defined(NUX_OS_LINUX)
         ime_->Blur();
 #endif
         //gtk_im_context_focus_out(im_context_);
@@ -1260,7 +1268,7 @@
     {
       if (nux_compose_seqs_compact[i].compare(composition_string_) == 0)
       {
-        // advance to the next sequence after :: 
+        // advance to the next sequence after ::
         while (nux_compose_seqs_compact[++i].compare("::") != 0)
         {
         }
@@ -1418,7 +1426,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);
@@ -2331,14 +2339,14 @@
           // This will move the cursor one line up.
           return true;
         }
-        
+
         if (multiline_ && (key_sym == NUX_VK_DOWN))
         {
           // Navigate between the lines of the text entry.
-          // This will move the cursor one line down.          
+          // This will move the cursor one line down.
           return true;
         }
-                
+
         if ((!multiline_) && (!lose_key_focus_on_key_nav_direction_up_) && (key_sym == NUX_VK_UP))
         {
           // By returning true, the text entry signals that it want to receive the signal for this event.
@@ -2415,7 +2423,7 @@
   void TextEntry::SetLoseKeyFocusOnKeyNavDirectionDown(bool b)
   {
     lose_key_focus_on_key_nav_direction_down_ = b;
-  }  
+  }
 
   bool TextEntry::GetLoseKeyFocusOnKeyNavDirectionDown() const
   {