Relax monitor-section processor channel restriction

[ardour.git] / libs / gtkmm2ext / cairo_widget.cc

diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc
index aa8f883a7d979b808958155f02edc30c60998388..229ffe8d3115c120c7cf05e109fd49b02abb3847 100644 (file)
--- a/libs/gtkmm2ext/cairo_widget.cc
+++ b/libs/gtkmm2ext/cairo_widget.cc
@@ -23,22 +23,21 @@
 #include "gtkmm2ext/cairo_widget.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 static const char* has_cairo_widget_background_info = "has_cairo_widget_background_info";
 
 bool CairoWidget::_flat_buttons = false;
 bool CairoWidget::_widget_prelight = true;
 
-static void noop() { }
-sigc::slot<void> CairoWidget::focus_handler (sigc::ptr_fun (noop));
+sigc::slot<void,Gtk::Widget*> CairoWidget::focus_handler;
 
 void CairoWidget::set_source_rgb_a( cairo_t* cr, Gdk::Color col, float a)  //ToDo:  this one and the Canvas version should be in a shared file (?)
 {
        float r = col.get_red_p ();
        float g = col.get_green_p ();
        float b = col.get_blue_p ();
-       
+
        cairo_set_source_rgba(cr, r, g, b, a);
 }
 
@@ -49,19 +48,61 @@ CairoWidget::CairoWidget ()
        , _grabbed (false)
        , _name_proxy (this, X_("name"))
        , _current_parent (0)
+       , _canvas_widget (false)
 {
        _name_proxy.connect (sigc::mem_fun (*this, &CairoWidget::on_name_changed));
 }
 
 CairoWidget::~CairoWidget ()
 {
+       if (_canvas_widget) {
+               gtk_widget_set_realized (GTK_WIDGET(gobj()), false);
+       }
        if (_parent_style_change) _parent_style_change.disconnect();
 }
 
+void
+CairoWidget::set_canvas_widget ()
+{
+       assert (!_canvas_widget);
+       ensure_style ();
+       gtk_widget_set_realized (GTK_WIDGET(gobj()), true);
+       _canvas_widget = true;
+}
+
+int
+CairoWidget::get_width () const
+{
+       if (_canvas_widget) {
+               return _allocation.get_width ();
+       }
+       return Gtk::EventBox::get_width ();
+}
+
+int
+CairoWidget::get_height () const
+{
+       if (_canvas_widget) {
+               return _allocation.get_height ();
+       }
+       return Gtk::EventBox::get_height ();
+}
+
+void
+CairoWidget::size_allocate (Gtk::Allocation& alloc)
+{
+       if (_canvas_widget) {
+               memcpy (&_allocation, &alloc, sizeof(Gtk::Allocation));
+               return;
+       }
+       Gtk::EventBox::size_allocate (alloc);
+}
+
+
 bool
 CairoWidget::on_button_press_event (GdkEventButton*)
 {
-       focus_handler();
+       focus_handler (this);
        return false;
 }
 
@@ -139,9 +180,9 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
                cairo_context->paint ();
        }
 #endif
-       
+
        Gtk::Widget* child = get_child ();
-       
+
        if (child) {
                propagate_expose (*child, ev);
        }
@@ -183,15 +224,21 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
 #endif
 
        cr->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height);
-       cr->clip_preserve ();
 
-       /* paint expose area the color of the parent window bg
-       */
-       
-       Gdk::Color bg (get_parent_bg());
-       
-       cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
-       cr->fill ();
+       if (_need_bg) {
+               cr->clip_preserve ();
+
+               /* paint expose area the color of the parent window bg
+                */
+
+               Gdk::Color bg (get_parent_bg());
+
+               cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
+               cr->fill ();
+       } else {
+               std::cerr << get_name() << " skipped bg fill\n";
+               cr->clip ();
+       }
 
        cairo_rectangle_t expose_area;
        expose_area.x = ev->area.x;
@@ -219,7 +266,7 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
 #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
        }
 #endif
-       
+
        return true;
 }
 
@@ -230,10 +277,36 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
  */
 
 void
-CairoWidget::set_dirty ()
+CairoWidget::set_dirty (cairo_rectangle_t *area)
 {
        ENSURE_GUI_THREAD (*this, &CairoWidget::set_dirty);
-       queue_draw ();
+       if (!area) {
+               queue_draw ();
+       } else {
+               // TODO emit QueueDrawArea -> ArdourCanvas::Widget
+               if (QueueDraw ()) {
+                       return;
+               }
+               queue_draw_area (area->x, area->y, area->width, area->height);
+       }
+}
+
+void
+CairoWidget::queue_draw ()
+{
+       if (QueueDraw ()) {
+               return;
+       }
+       Gtk::EventBox::queue_draw ();
+}
+
+void
+CairoWidget::queue_resize ()
+{
+       if (QueueResize ()) {
+               return;
+       }
+       Gtk::EventBox::queue_resize ();
 }
 
 /** Handle a size allocation.
@@ -242,7 +315,11 @@ CairoWidget::set_dirty ()
 void
 CairoWidget::on_size_allocate (Gtk::Allocation& alloc)
 {
-       Gtk::EventBox::on_size_allocate (alloc);
+       if (!_canvas_widget) {
+               Gtk::EventBox::on_size_allocate (alloc);
+       } else {
+               memcpy (&_allocation, &alloc, sizeof(Gtk::Allocation));
+       }
 
 #ifdef OPTIONAL_CAIRO_IMAGE_SURFACE
        if (getenv("ARDOUR_IMAGE_SURFACE")) {
@@ -254,6 +331,9 @@ CairoWidget::on_size_allocate (Gtk::Allocation& alloc)
        }
 #endif
 
+       if (_canvas_widget) {
+               return;
+       }
        set_dirty ();
 }
 
@@ -331,7 +411,7 @@ CairoWidget::set_active (bool yn)
 void
 CairoWidget::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
 {
-       queue_draw();
+       set_dirty ();
 }
 
 void
@@ -347,7 +427,7 @@ CairoWidget::on_state_changed (Gtk::StateType)
                set_visual_state (Gtkmm2ext::VisualState (visual_state() & ~Gtkmm2ext::Insensitive));
        }
 
-       queue_draw ();
+       set_dirty ();
 }
 
 void
@@ -384,7 +464,7 @@ CairoWidget::set_widget_prelight (bool yn)
 }
 
 void
-CairoWidget::set_focus_handler (sigc::slot<void> s)
+CairoWidget::set_focus_handler (sigc::slot<void,Gtk::Widget*> s)
 {
        focus_handler = s;
 }