debugging new ref count system for nuiMainWindow

deps/harfbuzz/hb-ot-shape-normalize.cc

@@ -63,6 +63,15 @@ HB_BEGIN_DECLS
  *     matra for the Indic shaper.
  */
 
+static void
+output_glyph (hb_ot_shape_context_t *c,
+	      hb_codepoint_t glyph)
+{
+  hb_buffer_t *buffer = c->buffer;
+
+  buffer->output_glyph (glyph);
+  hb_glyph_info_set_unicode_props (&buffer->out_info[buffer->out_len - 1], buffer->unicode);
+}
 
 static bool
 decompose (hb_ot_shape_context_t *c,
@@ -78,42 +87,39 @@ decompose (hb_ot_shape_context_t *c,
   bool has_a = hb_font_get_glyph (c->font, a, 0, &glyph);
   if (shortest && has_a) {
     /* Output a and b */
-    c->buffer->output_glyph (a);
+    output_glyph (c, a);
     if (b)
-      c->buffer->output_glyph (b);
+      output_glyph (c, b);
     return TRUE;
   }
 
   if (decompose (c, shortest, a)) {
     if (b)
-      c->buffer->output_glyph (b);
+      output_glyph (c, b);
     return TRUE;
   }
 
   if (has_a) {
-    c->buffer->output_glyph (a);
+    output_glyph (c, a);
     if (b)
-      c->buffer->output_glyph (b);
+      output_glyph (c, b);
     return TRUE;
   }
 
   return FALSE;
 }
 
-static bool
+static void
 decompose_current_glyph (hb_ot_shape_context_t *c,
 			 bool shortest)
 {
-  if (decompose (c, shortest, c->buffer->info[c->buffer->idx].codepoint)) {
+  if (decompose (c, shortest, c->buffer->info[c->buffer->idx].codepoint))
     c->buffer->skip_glyph ();
-    return TRUE;
-  } else {
+  else
     c->buffer->next_glyph ();
-    return FALSE;
-  }
 }
 
-static bool
+static void
 decompose_single_char_cluster (hb_ot_shape_context_t *c,
 			       bool will_recompose)
 {
@@ -122,39 +128,34 @@ decompose_single_char_cluster (hb_ot_shape_context_t *c,
   /* If recomposing and font supports this, we're good to go */
   if (will_recompose && hb_font_get_glyph (c->font, c->buffer->info[c->buffer->idx].codepoint, 0, &glyph)) {
     c->buffer->next_glyph ();
-    return FALSE;
+    return;
   }
 
-  return decompose_current_glyph (c, will_recompose);
+  decompose_current_glyph (c, will_recompose);
 }
 
-static bool
+static void
 decompose_multi_char_cluster (hb_ot_shape_context_t *c,
 			      unsigned int end)
 {
-  bool changed = FALSE;
-
   /* TODO Currently if there's a variation-selector we give-up, it's just too hard. */
   for (unsigned int i = c->buffer->idx; i < end; i++)
     if (unlikely (is_variation_selector (c->buffer->info[i].codepoint)))
-      return changed;
+      return;
 
   while (c->buffer->idx < end)
-    changed |= decompose_current_glyph (c, FALSE);
-
-  return changed;
+    decompose_current_glyph (c, FALSE);
 }
 
 void
 _hb_ot_shape_normalize (hb_ot_shape_context_t *c)
 {
   hb_buffer_t *buffer = c->buffer;
   bool recompose = !hb_ot_shape_complex_prefer_decomposed (c->plan->shaper);
-  bool changed = FALSE;
   bool has_multichar_clusters = FALSE;
   unsigned int count;
 
-  /* We do a farily straightforward yet custom normalization process in three
+  /* We do a fairly straightforward yet custom normalization process in three
    * separate rounds: decompose, reorder, recompose (if desired).  Currently
    * this makes two buffer swaps.  We can make it faster by moving the last
    * two rounds into the inner loop for the first round, but it's more readable
@@ -173,9 +174,9 @@ _hb_ot_shape_normalize (hb_ot_shape_context_t *c)
         break;
 
     if (buffer->idx + 1 == end)
-      changed |= decompose_single_char_cluster (c, recompose);
+      decompose_single_char_cluster (c, recompose);
     else {
-      changed |= decompose_multi_char_cluster (c, end);
+      decompose_multi_char_cluster (c, end);
       has_multichar_clusters = TRUE;
     }
   }
@@ -193,9 +194,6 @@ _hb_ot_shape_normalize (hb_ot_shape_context_t *c)
   if (!has_multichar_clusters)
     return; /* Done! */
 
-  if (changed)
-    _hb_set_unicode_props (c->buffer); /* BUFFER: Set general_category and combining_class in var1 */
-
 
   /* Second round, reorder (inplace) */
 

include/nuiDefaultDecoration.h

@@ -109,7 +109,6 @@ class nuiDefaultDecoration
 
 private:
 
-  static nuiImageSequence* mpKnobSequence;
   static std::list<nuiTexture*> mIcons;
   static std::map<nglString, std::pair<const char*, int32> > mImages;
 

include/nuiRefCount.h

@@ -104,3 +104,31 @@ class nuiRefCount
   bool mPermanent;
 };
 
+class NGL_API nuiRefGuard : nuiNonCopyable
+{
+public:
+  nuiRefGuard(const nuiRefCount* pRef)
+  {
+    mpRef = pRef;
+    mpRef->Acquire();
+  }
+
+  nuiRefGuard(const nuiRefCount& rRef)
+  {
+    mpRef = &rRef;
+    mpRef->Acquire();
+  }
+
+
+  ~nuiRefGuard()
+  {
+    mpRef->Release();
+  }
+
+private:
+  const nuiRefCount* mpRef;
+};
+
+
+#define nuiAutoRef nuiRefGuard nui_local_auto_ref(this);
+

src/Decorations/nuiDefaultDecoration.cpp

@@ -114,11 +114,18 @@ void nuiDefaultDecoration::Init()
 
 void nuiDefaultDecoration::Exit()
 {
-  if (mpKnobSequence)
-    mpKnobSequence->Release();
-  mpKnobSequence = NULL;
+  {
+    // Release the icons:
+    std::list<nuiTexture*>::iterator it = mIcons.begin();
+    std::list<nuiTexture*>::iterator end = mIcons.end();
+    while (it != end)
+    {
+      nuiTexture* pTex = *it;
+      pTex->Release();
+    }
+    mIcons.clear();
+  }
 
-  mIcons.clear();
   mImages.clear();
 
   nuiWidget::ClearDefaultDecorations();
@@ -832,8 +839,6 @@ void nuiDefaultDecoration::ComboBox(nuiWidget* pWidget)
 // nuiKnob
 //
 
-nuiImageSequence* nuiDefaultDecoration::mpKnobSequence = NULL;
-
 void nuiDefaultDecoration::KnobSequence(nuiWidget* pWidget)
 {
 }

src/Renderers/nuiTexture.cpp

@@ -431,6 +431,11 @@ void nuiTexture::ClearAll()
   for (uint32 i = 0; i < count; i++)
   {
     nuiTexture* pTex = proxies[i];
+    if (pTex->GetRefCount() != 1)
+    {
+      nglString str(pTex->GetSource());
+      NGL_OUT("Texture '%s' is still owned more than once!\n", str.GetChars());
+    }
     NGL_ASSERT(pTex->GetRefCount() == 1);
     pTex->Release();
   }

src/WidgetTree/nuiContainer.cpp

@@ -47,11 +47,13 @@ void nuiContainer::SetObjectName(const nglString& rName)
 
 bool nuiContainer::Trash()
 {
+  nuiAutoRef;
   return nuiWidget::Trash();
 }
 
 void nuiContainer::CallOnTrash()
 {
+  nuiAutoRef;
   CheckValid();
   ChildrenCallOnTrash();
   nuiWidget::CallOnTrash();
@@ -416,6 +418,7 @@ void nuiContainer::DrawChild(nuiDrawContext* pContext, nuiWidget* pChild)
 bool nuiContainer::DispatchMouseClick(const nglMouseInfo& rInfo)
 {
   CheckValid();
+  nuiAutoRef;
   if (!mMouseEventEnabled || mTrashed)
     return false;
 
@@ -467,6 +470,7 @@ bool nuiContainer::DispatchMouseClick(const nglMouseInfo& rInfo)
 bool nuiContainer::DispatchMouseUnclick(const nglMouseInfo& rInfo)
 {
   CheckValid();
+  nuiAutoRef;
   if (!mMouseEventEnabled || mTrashed)
     return false;
 
@@ -518,6 +522,7 @@ bool nuiContainer::DispatchMouseUnclick(const nglMouseInfo& rInfo)
 nuiWidgetPtr nuiContainer::DispatchMouseMove(const nglMouseInfo& rInfo)
 {
   CheckValid();
+  nuiAutoRef;
   if (!mMouseEventEnabled || mTrashed)
     return false;
 

src/WidgetTree/nuiMainWindow.cpp

@@ -1255,7 +1255,7 @@ void nuiMainWindow::DestroyAllWindows()
   {
     nuiMainWindow* pWin = mpWindows.front();
     NGL_LOG("window", NGL_LOG_ALWAYS, "Destroying window #%d '%s'\n", count, pWin->GetNGLWindow()->GetTitle().GetChars());
-    delete pWin;
+    pWin->Release();
     count++;
   }
   NGL_ASSERT(mpWindows.empty());