X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Ffastmeter.cc;h=c144a963bbd673df7e6734a1b998140f3a8278c6;hb=dcf852aae41a2d407f770324f30a5b5138a51039;hp=c79b120624476002d91aec03dc7c2bd57f2fdc7a;hpb=12c9055659152f58300bdddb51f077941c2af5bc;p=ardour.git diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc index c79b120624..c144a963bb 100644 --- a/libs/gtkmm2ext/fastmeter.cc +++ b/libs/gtkmm2ext/fastmeter.cc @@ -25,14 +25,16 @@ #include +#include +#include #include #include #include #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) = ((u)>>8)&0xff; (*(b)) = (u)&0xff; } #define UINT_TO_RGBA(u,r,g,b,a) { UINT_TO_RGB(((u)>>8),r,g,b); (*(a)) = (u)&0xff; } + using namespace Gtk; -using namespace Gdk; using namespace Glib; using namespace Gtkmm2ext; using namespace std; @@ -57,17 +59,22 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len, float stp2, float stp3, int styleflags ) + : pixheight(0) + , pixwidth(0) + , _styleflags(styleflags) + , orientation(o) + , hold_cnt(hold) + , hold_state(0) + , bright_hold(false) + , current_level(0) + , current_peak(0) + , highlight(false) { - orientation = o; - hold_cnt = hold; - hold_state = 0; - bright_hold = false; - current_peak = 0; - current_level = 0; last_peak_rect.width = 0; last_peak_rect.height = 0; + last_peak_rect.x = 0; + last_peak_rect.y = 0; - highlight = false; no_rgba_overlay = ! Glib::getenv("NO_METER_SHADE").empty(); _clr[0] = clr0; @@ -92,9 +99,7 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len, _stp[2] = stp2; _stp[3] = stp3; - _styleflags = styleflags; - - set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK); + set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); pixrect.x = 1; pixrect.y = 1; @@ -121,20 +126,28 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len, request_width = pixrect.width + 2; request_height= pixrect.height + 2; - queue_draw (); + clear (); } 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 FastMeter::generate_meter_pattern ( int width, int height, int *clr, float *stp, int styleflags, bool horiz) { guint8 r,g,b,a; double knee; - const double soft = 2.5 / (double) height; + const double soft = 3.0 / (double) height; const double offs = -1.0 / (double) height; cairo_pattern_t* pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, height); @@ -205,13 +218,22 @@ FastMeter::generate_meter_pattern ( cairo_set_source (tc, pat); cairo_rectangle (tc, 0, 0, width, height); cairo_fill (tc); + cairo_pattern_destroy (pat); + + cairo_set_source (tc, shade_pattern); + cairo_rectangle (tc, 0, 0, width, height); + cairo_fill (tc); + cairo_pattern_destroy (shade_pattern); if (styleflags & 2) { // LED stripes cairo_save (tc); cairo_set_line_width(tc, 1.0); - cairo_set_source_rgba(tc, .0, .0, .0, .3); + cairo_set_source_rgba(tc, .0, .0, .0, 0.4); //cairo_set_operator (tc, CAIRO_OPERATOR_SOURCE); - for (float y=.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); @@ -219,15 +241,7 @@ FastMeter::generate_meter_pattern ( cairo_restore (tc); } - cairo_set_source (tc, shade_pattern); - cairo_rectangle (tc, 0, 0, width, height); - cairo_fill (tc); - - cairo_pattern_destroy (pat); - cairo_pattern_destroy (shade_pattern); - pat = cairo_pattern_create_for_surface (surface); - cairo_destroy (tc); cairo_surface_destroy (surface); } @@ -357,7 +371,7 @@ FastMeter::request_vertical_background( height = min(height, max_pattern_metric_size); height += 2; - const PatternBgMapKey key (width, height, bgc[0], bgc[1]); + const PatternBgMapKey key (width, height, bgc[0], bgc[1], shade); PatternBgMap::iterator i; if ((i = vb_pattern_cache.find (key)) != vb_pattern_cache.end()) { return i->second; @@ -405,7 +419,7 @@ FastMeter::request_horizontal_background( width = min(width, max_pattern_metric_size); width += 2; - const PatternBgMapKey key (width, height, bgc[0], bgc[1]); + const PatternBgMapKey key (width, height, bgc[0], bgc[1], shade); PatternBgMap::iterator i; if ((i = hb_pattern_cache.find (key)) != hb_pattern_cache.end()) { return i->second; @@ -476,6 +490,7 @@ FastMeter::on_size_allocate (Gtk::Allocation &alloc) } else { horizontal_size_allocate (alloc); } + queue_draw (); } void @@ -500,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 @@ -525,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 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); @@ -568,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); @@ -586,11 +601,14 @@ 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)); - if (bright_hold) { - last_peak_rect.height = max(0, min(4, pixheight - last_peak_rect.y -1 )); + 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 { - last_peak_rect.height = max(0, min(2, pixheight - last_peak_rect.y -1 )); + last_peak_rect.height = max(0, min(2, pixheight - last_peak_rect.y - 1 )); } cairo_set_source (cr, fgpattern->cobj()); @@ -606,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 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); @@ -641,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); @@ -659,8 +673,8 @@ FastMeter::horizontal_expose (GdkEventExpose* ev) last_peak_rect.y = 1; last_peak_rect.height = pixheight; const int xpos = floor (pixwidth * current_peak); - if (bright_hold) { - last_peak_rect.width = min(4, xpos ); + if (bright_hold || (_styleflags & 2)) { + last_peak_rect.width = min(3, xpos ); } else { last_peak_rect.width = min(2, xpos ); } @@ -679,10 +693,6 @@ FastMeter::horizontal_expose (GdkEventExpose* ev) last_peak_rect.width = 0; last_peak_rect.height = 0; } - - cairo_destroy (cr); - - return TRUE; } void @@ -691,6 +701,8 @@ FastMeter::set (float lvl, float peak) float old_level = current_level; float old_peak = current_peak; + if (pixwidth <= 0 || pixheight <=0) return; + if (peak == -1) { if (lvl >= current_peak) { current_peak = lvl; @@ -711,7 +723,9 @@ 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; } @@ -788,9 +802,12 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr& win, float ol queue = true; } rect.x = 1; - rect.y = max(1, 1 + pixheight - (gint) floor (pixheight * current_peak)); - if (bright_hold) { - rect.height = max(0, min(4, pixheight - last_peak_rect.y -1 )); + 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 { rect.height = max(0, min(2, pixheight - last_peak_rect.y -1 )); } @@ -810,7 +827,6 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr& win, float ol void FastMeter::queue_horizontal_redraw (const Glib::RefPtr& win, float old_level) { -#if 1 GdkRectangle rect; gint new_right = (gint) floor (pixwidth * current_level); @@ -861,8 +877,8 @@ FastMeter::queue_horizontal_redraw (const Glib::RefPtr& win, float rect.y = 1; rect.height = pixheight; const int xpos = floor (pixwidth * current_peak); - if (bright_hold) { - rect.width = min(4, xpos); + if (bright_hold || (_styleflags & 2)) { + rect.width = min(3, xpos); } else { rect.width = min(2, xpos); } @@ -877,9 +893,6 @@ FastMeter::queue_horizontal_redraw (const Glib::RefPtr& win, float gdk_region_destroy(region); region = 0; } -#else - queue_draw (); -#endif } void @@ -890,9 +903,9 @@ FastMeter::set_highlight (bool onoff) } highlight = onoff; if (orientation == Vertical) { - bgpattern = request_vertical_background (request_width, request_height, highlight ? _bgh : _bgc, highlight); + bgpattern = request_vertical_background (pixwidth + 2, pixheight + 2, highlight ? _bgh : _bgc, highlight); } else { - bgpattern = request_horizontal_background (request_width, request_height, highlight ? _bgh : _bgc, highlight); + bgpattern = request_horizontal_background (pixwidth + 2, pixheight + 2, highlight ? _bgh : _bgc, highlight); } queue_draw (); }