workaround changes in glibmm 2.49.x

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

diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc
index 5a775572225b786d0330b166dd19999664fad682..f3928910bca7de037c783fdb4e19535ccbb69886 100644 (file)
--- a/libs/gtkmm2ext/fastmeter.cc
+++ b/libs/gtkmm2ext/fastmeter.cc
@@ -133,6 +133,14 @@ FastMeter::~FastMeter ()
 {
 }
 
+void
+FastMeter::flush_pattern_cache () {
+       hb_pattern_cache.clear();
+       hm_pattern_cache.clear();
+       vb_pattern_cache.clear();
+       vm_pattern_cache.clear();
+}
+
 Cairo::RefPtr<Cairo::Pattern>
 FastMeter::generate_meter_pattern (
                int width, int height, int *clr, float *stp, int styleflags, bool horiz)
@@ -222,7 +230,10 @@ FastMeter::generate_meter_pattern (
                        cairo_set_line_width(tc, 1.0);
                        cairo_set_source_rgba(tc, .0, .0, .0, 0.4);
                        //cairo_set_operator (tc, CAIRO_OPERATOR_SOURCE);
-                       for (float y=0.5; y < height; y+= 2.0) {
+                       for (int i = 0; float y = 0.5 + i * 2.0; ++i) {
+                               if (y >= height) {
+                                       break;
+                               }
                                cairo_move_to(tc, 0, y);
                                cairo_line_to(tc, width, y);
                                cairo_stroke (tc);
@@ -504,7 +515,7 @@ FastMeter::vertical_size_allocate (Gtk::Allocation &alloc)
                pixwidth  = request_width - 2;
        }
 
-       DrawingArea::on_size_allocate (alloc);
+       CairoWidget::on_size_allocate (alloc);
 }
 
 void
@@ -529,31 +540,26 @@ FastMeter::horizontal_size_allocate (Gtk::Allocation &alloc)
                pixheight  = request_height - 2;
        }
 
-       DrawingArea::on_size_allocate (alloc);
+       CairoWidget::on_size_allocate (alloc);
 }
 
-bool
-FastMeter::on_expose_event (GdkEventExpose* ev)
+void
+FastMeter::render (cairo_t* cr, cairo_rectangle_t* area)
 {
        if (orientation == Vertical) {
-               return vertical_expose (ev);
+               return vertical_expose (cr, area);
        } else {
-               return horizontal_expose (ev);
+               return horizontal_expose (cr, area);
        }
 }
 
-bool
-FastMeter::vertical_expose (GdkEventExpose* ev)
+void
+FastMeter::vertical_expose (cairo_t* cr, cairo_rectangle_t* area)
 {
-       Glib::RefPtr<Gdk::Window> win = get_window ();
        gint top_of_meter;
        GdkRectangle intersection;
        GdkRectangle background;
-
-       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 (cr);
+       GdkRectangle eventarea;
 
        cairo_set_source_rgb (cr, 0, 0, 0); // black
        rounded_rectangle (cr, 0, 0, pixwidth + 2, pixheight + 2, 2);
@@ -572,13 +578,18 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
        background.width = pixrect.width;
        background.height = pixheight - top_of_meter;
 
-       if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) {
+       eventarea.x = area->x;
+       eventarea.y = area->y;
+       eventarea.width = area->width;
+       eventarea.height = area->height;
+
+       if (gdk_rectangle_intersect (&background, &eventarea, &intersection)) {
                cairo_set_source (cr, bgpattern->cobj());
                cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
                cairo_fill (cr);
        }
 
-       if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) {
+       if (gdk_rectangle_intersect (&pixrect, &eventarea, &intersection)) {
                // draw the part of the meter image that we need. the area we draw is bounded "in reverse" (top->bottom)
                cairo_set_source (cr, fgpattern->cobj());
                cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
@@ -590,7 +601,10 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
        if (hold_state) {
                last_peak_rect.x = 1;
                last_peak_rect.width = pixwidth;
-               last_peak_rect.y = max(1, 1 + pixheight - (gint) floor (pixheight * current_peak));
+               last_peak_rect.y = max(1, 1 + pixheight - (int) floor (pixheight * current_peak));
+               if (_styleflags & 2) { // LED stripes
+                       last_peak_rect.y = max(0, (last_peak_rect.y & (~1)));
+               }
                if (bright_hold || (_styleflags & 2)) {
                        last_peak_rect.height = max(0, min(3, pixheight - last_peak_rect.y - 1 ));
                } else {
@@ -610,24 +624,15 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
                last_peak_rect.width = 0;
                last_peak_rect.height = 0;
        }
-
-       cairo_destroy (cr);
-
-       return TRUE;
 }
 
-bool
-FastMeter::horizontal_expose (GdkEventExpose* ev)
+void
+FastMeter::horizontal_expose (cairo_t* cr, cairo_rectangle_t* area)
 {
-       Glib::RefPtr<Gdk::Window> win = get_window ();
        gint right_of_meter;
        GdkRectangle intersection;
        GdkRectangle background;
-
-       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 (cr);
+       GdkRectangle eventarea;
 
        cairo_set_source_rgb (cr, 0, 0, 0); // black
        rounded_rectangle (cr, 0, 0, pixwidth + 2, pixheight + 2, 2);
@@ -645,13 +650,18 @@ FastMeter::horizontal_expose (GdkEventExpose* ev)
        background.width = pixwidth - right_of_meter;
        background.height = pixheight;
 
-       if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) {
+       eventarea.x = area->x;
+       eventarea.y = area->y;
+       eventarea.width = area->width;
+       eventarea.height = area->height;
+
+       if (gdk_rectangle_intersect (&background, &eventarea, &intersection)) {
                cairo_set_source (cr, bgpattern->cobj());
                cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
                cairo_fill (cr);
        }
 
-       if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) {
+       if (gdk_rectangle_intersect (&pixrect, &eventarea, &intersection)) {
                cairo_set_source (cr, fgpattern->cobj());
                cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
                cairo_fill (cr);
@@ -683,10 +693,6 @@ FastMeter::horizontal_expose (GdkEventExpose* ev)
                last_peak_rect.width = 0;
                last_peak_rect.height = 0;
        }
-
-       cairo_destroy (cr);
-
-       return TRUE;
 }
 
 void
@@ -717,13 +723,15 @@ FastMeter::set (float lvl, float peak)
 
        current_level = lvl;
 
-       if (current_level == old_level && current_peak == old_peak && (hold_state == 0 || peak != -1)) {
+       const float pixscale = (orientation == Vertical) ? pixheight : pixwidth;
+#define PIX(X) floor(pixscale * (X))
+       if (PIX(current_level) == PIX(old_level) && PIX(current_peak) == PIX(old_peak) && (hold_state == 0 || peak != -1)) {
                return;
        }
 
        Glib::RefPtr<Gdk::Window> win;
 
-       if ((win = get_window()) == 0) {
+       if (! (win = get_window())) {
                queue_draw ();
                return;
        }
@@ -794,7 +802,10 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
                        queue = true;
                }
                rect.x = 1;
-               rect.y = max(1, 1 + pixheight - (gint) floor (pixheight * current_peak));
+               rect.y = max(1, 1 + pixheight - (int) floor (pixheight * current_peak));
+               if (_styleflags & 2) { // LED stripes
+                       rect.y = max(0, (rect.y & (~1)));
+               }
                if (bright_hold || (_styleflags & 2)) {
                        rect.height = max(0, min(3, pixheight - last_peak_rect.y -1 ));
                } else {