diff options
author | Robin Gareus <robin@gareus.org> | 2014-10-28 02:15:10 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-10-28 02:15:10 +0100 |
commit | b04414d170bff6d3d7cbfdcedd2dcab917fa3e18 (patch) | |
tree | c373438261496bd18f87b85ef1277b9c593cb9d3 /libs/gtkmm2ext | |
parent | 6dc3a4bf61b0b5cd7947af6c5c9099f09c32b934 (diff) |
allow to use cairo-image/software surface for canvas & cairowidgets
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r-- | libs/gtkmm2ext/cairo_widget.cc | 39 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/cairo_widget.h | 2 |
2 files changed, 34 insertions, 7 deletions
diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index 03c23000a2..5180c2e8d0 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -64,17 +64,27 @@ CairoWidget::on_button_press_event (GdkEventButton*) bool CairoWidget::on_expose_event (GdkEventExpose *ev) { - cairo_t* cr = gdk_cairo_create (get_window ()->gobj()); - cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cairo_clip_preserve (cr); +#ifdef USE_CAIRO_IMAGE_SURFACE + + if (!image_surface) { + image_surface = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height()); + } + + Cairo::RefPtr<Cairo::Context> cr = Cairo::Context::create (image_surface); +#else + Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context (); +#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()); - cairo_set_source_rgb (cr, bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); - cairo_fill (cr); + cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); + cr->fill (); cairo_rectangle_t expose_area; expose_area.x = ev->area.x; @@ -82,9 +92,20 @@ CairoWidget::on_expose_event (GdkEventExpose *ev) expose_area.width = ev->area.width; expose_area.height = ev->area.height; - render (cr, &expose_area); + render (cr->cobj(), &expose_area); - cairo_destroy (cr); +#ifdef USE_CAIRO_IMAGE_SURFACE + image_surface->flush(); + /* now blit our private surface back to the GDK one */ + + Cairo::RefPtr<Cairo::Context> cairo_context = get_window()->create_cairo_context (); + + cairo_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + cairo_context->clip (); + cairo_context->set_source (image_surface, 0, 0); + cairo_context->set_operator (Cairo::OPERATOR_SOURCE); + cairo_context->paint (); +#endif return true; } @@ -108,6 +129,10 @@ CairoWidget::on_size_allocate (Gtk::Allocation& alloc) { Gtk::EventBox::on_size_allocate (alloc); +#ifdef USE_CAIRO_IMAGE_SURFACE + image_surface = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, alloc.get_width(), alloc.get_height()); +#endif + set_dirty (); } diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h index 87002101bd..038198ab57 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h @@ -20,6 +20,7 @@ #ifndef __gtk2_ardour_cairo_widget_h__ #define __gtk2_ardour_cairo_widget_h__ +#include <cairomm/surface.h> #include <gtkmm/eventbox.h> #include "gtkmm2ext/visibility.h" @@ -116,6 +117,7 @@ protected: static sigc::slot<void> focus_handler; private: + Cairo::RefPtr<Cairo::Surface> image_surface; Glib::SignalProxyProperty _name_proxy; sigc::connection _parent_style_change; Widget * _current_parent; |