a couple of debug output statements to help diagnose a crash

[ardour.git] / libs / canvas / text.cc

diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc
index cfad3758145f4c11a7e05c94916ca223e9e6cd1a..a77e03020d1124b6530b9c1f674b4ee8e96d2584 100644 (file)
--- a/libs/canvas/text.cc
+++ b/libs/canvas/text.cc
@@ -20,6 +20,7 @@
 #include <gdk/gdk.h>
 
 #include <cairomm/cairomm.h>
+#include <gtkmm/window.h>
 #include <gtkmm/label.h>
 
 #include "pbd/stacktrace.h"
@@ -27,10 +28,12 @@
 #include "canvas/text.h"
 #include "canvas/canvas.h"
 #include "canvas/utils.h"
+#include "canvas/colors.h"
 
 using namespace std;
 using namespace ArdourCanvas;
 
+
 Text::Text (Canvas* c)
        : Item (c)
        , _color (0x000000ff)
@@ -39,8 +42,10 @@ Text::Text (Canvas* c)
        , _width (0)
        , _height (0)
        , _need_redraw (false)
+        , _width_correction (-1)
        , _clamped_width (COORD_MAX)
 {
+       _outline = false;
 }
 
 Text::Text (Item* parent)
@@ -51,8 +56,10 @@ Text::Text (Item* parent)
        , _width (0)
        , _height (0)
        , _need_redraw (false)
+        , _width_correction (-1)
        , _clamped_width (COORD_MAX)
 {
+       _outline = false;
 }
 
 Text::~Text ()
@@ -74,7 +81,7 @@ Text::set (string const & text)
 }
 
 void
-Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
+Text::_redraw (Cairo::RefPtr<Cairo::Context> context) const
 {
        if (_text.empty()) {
                return;
@@ -82,23 +89,48 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
 
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
 
-       _redraw (layout);
+       __redraw (layout);
 }
 
 void
-Text::redraw (Glib::RefPtr<Pango::Context> context) const
+Text::_redraw (Glib::RefPtr<Pango::Context> context) const
 {
        if (_text.empty()) {
                return;
        }
 
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
-       _redraw (layout);
+       __redraw (layout);
 }
 
 void
-Text::_redraw (Glib::RefPtr<Pango::Layout> layout) const
+Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
 {
+#ifdef __APPLE__
+       if (_width_correction < 0.0) {
+               // Pango returns incorrect text width on some OS X
+               // So we have to make a correction
+               // To determine the correct indent take the largest symbol for which the width is correct
+               // and make the calculation
+               Gtk::Window win;
+               Gtk::Label foo;
+               win.add (foo);
+
+               int width = 0;
+               int height = 0;
+               Glib::RefPtr<Pango::Layout> test_layout = foo.create_pango_layout ("H");
+               if (_font_description) {
+                       test_layout->set_font_description (*_font_description);
+               }
+               test_layout->get_pixel_size (width, height);
+
+               _width_correction = width*1.5;
+       }
+#else
+        /* don't bother with a conditional here */
+        _width_correction = 0.0;
+#endif
+
        layout->set_text (_text);
 
        if (_font_description) {
@@ -106,24 +138,42 @@ Text::_redraw (Glib::RefPtr<Pango::Layout> layout) const
        }
 
        layout->set_alignment (_alignment);
-
+    
        int w;
        int h;
 
        layout->get_pixel_size (w, h);
 
-       _width = w;
+       _width = w + _width_correction;
        _height = h;
 
+#ifdef __APPLE__
+       _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width * 2, _height * 2);
+#else
        _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width, _height);
-
+#endif
+       
        Cairo::RefPtr<Cairo::Context> img_context = Cairo::Context::create (_image);
 
+#ifdef __APPLE__
+       /* Below, the rendering scaling is set to support retina display
+        */
+       img_context->scale (2, 2);
+#endif
+       
        /* and draw, in the appropriate color of course */
 
-       set_source_rgba (img_context, _color);
-
-       layout->show_in_cairo_context (img_context);
+       if (_outline) {
+               set_source_rgba (img_context, _outline_color);
+               layout->update_from_cairo_context (img_context);
+               pango_cairo_layout_path (img_context->cobj(), layout->gobj());
+               img_context->stroke_preserve ();
+               set_source_rgba (img_context, _color);
+               img_context->fill ();
+       } else {
+               set_source_rgba (img_context, _color);
+               layout->show_in_cairo_context (img_context);
+       }
 
        /* text has now been rendered in _image and is ready for blit in
         * ::render 
@@ -147,20 +197,33 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
        }
 
        if (_need_redraw) {
-               redraw (context);
+               _redraw (context);
        }
        
        Rect intersection (i.get());
 
        context->rectangle (intersection.x0, intersection.y0, intersection.width(), intersection.height());
+#ifdef __APPLE__
+       /* Below, the rendering scaling is set to support retina display
+        */
+       Cairo::Matrix original_matrix = context->get_matrix();
+       context->scale (0.5, 0.5);
+       context->set_source (_image, self.x0 * 2, self.y0 * 2);
+       context->fill ();
+       context->set_matrix (original_matrix);
+#else
        context->set_source (_image, self.x0, self.y0);
        context->fill ();
+#endif
 }
 
 void
 Text::clamp_width (double w)
 {
+        begin_change ();
        _clamped_width = w;
+        _bounding_box_dirty = true;
+        end_change ();
 }
 
 void
@@ -175,7 +238,7 @@ Text::compute_bounding_box () const
        if (_bounding_box_dirty) {
                if (_need_redraw || !_image) {
                        Glib::RefPtr<Pango::Context> context = Glib::wrap (gdk_pango_context_get()); // context now owns C object and will free it
-                       redraw (context);
+                       _redraw (context);
                }
                _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width()), _image->get_height());
                _bounding_box_dirty = false;
@@ -200,6 +263,7 @@ Text::set_font_description (Pango::FontDescription font_description)
        
        _font_description = new Pango::FontDescription (font_description);
        _need_redraw = true;
+        _width_correction = -1.0;
 
        _bounding_box_dirty = true;
        end_change ();
@@ -211,6 +275,9 @@ Text::set_color (Color color)
        begin_change ();
 
        _color = color;
+       if (_outline) {
+               set_outline_color (contrasting_text_color (_color));
+       }
        _need_redraw = true;
 
        end_change ();
@@ -227,3 +294,14 @@ Text::dump (ostream& o) const
 
        o << endl;
 }
+
+
+double
+Text::text_width() const
+{
+    if (_need_redraw) {
+        redraw ();
+    }
+    
+    return _width;
+}