fix merge conflict from master

4 files changed, 425 insertions, 73 deletions

diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc
index 6ea1a6dd4b..d826def7ff 100644
--- a/libs/gtkmm2ext/fastmeter.cc
+++ b/libs/gtkmm2ext/fastmeter.cc
@@ -44,6 +44,9 @@ bool FastMeter::no_rgba_overlay = false;
 FastMeter::Pattern10Map FastMeter::vm_pattern_cache;
 FastMeter::PatternBgMap FastMeter::vb_pattern_cache;
 
+FastMeter::Pattern10Map FastMeter::hm_pattern_cache;
+FastMeter::PatternBgMap FastMeter::hb_pattern_cache;
+
 FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
 		int clr0, int clr1, int clr2, int clr3,
 		int clr4, int clr5, int clr6, int clr7,
@@ -51,19 +54,25 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
 		int bgc0, int bgc1,
 		int bgh0, int bgh1,
 		float stp0, float stp1,
-		float stp2, float stp3
+		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;
@@ -96,10 +105,18 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
 	if (!len) {
 		len = 250;
 	}
-	fgpattern = request_vertical_meter(dimen, len, _clr, _stp, true);
-	bgpattern = request_vertical_background (dimen, len, _bgc, false);
-	pixheight = len;
-	pixwidth = dimen;
+	if (orientation == Vertical) {
+		pixheight = len;
+		pixwidth = dimen;
+		fgpattern = request_vertical_meter(pixwidth + 2, pixheight + 2, _clr, _stp, _styleflags);
+		bgpattern = request_vertical_background (pixwidth + 2, pixheight + 2, _bgc, false);
+
+	} else {
+		pixheight = dimen;
+		pixwidth = len;
+		fgpattern = request_horizontal_meter(pixwidth + 2, pixheight + 2, _clr, _stp, _styleflags);
+		bgpattern = request_horizontal_background (pixwidth + 2, pixheight + 2, _bgc, false);
+	}
 
 	pixrect.width = pixwidth;
 	pixrect.height = pixheight;
@@ -107,7 +124,7 @@ 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 ()
@@ -116,11 +133,12 @@ FastMeter::~FastMeter ()
 
 Cairo::RefPtr<Cairo::Pattern>
 FastMeter::generate_meter_pattern (
-		int width, int height, int *clr, float *stp, bool shade)
+		int width, int height, int *clr, float *stp, int styleflags, bool horiz)
 {
 	guint8 r,g,b,a;
 	double knee;
-	double soft = 1.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);
 
@@ -133,54 +151,55 @@ FastMeter::generate_meter_pattern (
 	cairo_pattern_add_color_stop_rgb (pat, 0.0,
 	                                  r/255.0, g/255.0, b/255.0);
 
-	knee = ((float)height * stp[3] / 115.0f); // -0dB
+	knee = offs + stp[3] / 115.0f; // -0dB
 
 	UINT_TO_RGBA (clr[8], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee,
 	                                  r/255.0, g/255.0, b/255.0);
 
 	UINT_TO_RGBA (clr[7], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee + soft,
 	                                  r/255.0, g/255.0, b/255.0);
 
-	knee = ((float)height * stp[2]/ 115.0f); // -3dB || -2dB
+	knee = offs + stp[2]/ 115.0f; // -3dB || -2dB
 
 	UINT_TO_RGBA (clr[6], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee,
 	                                  r/255.0, g/255.0, b/255.0);
 
 	UINT_TO_RGBA (clr[5], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee + soft,
 	                                  r/255.0, g/255.0, b/255.0);
 
-	knee = ((float)height * stp[1] / 115.0f); // -9dB
+	knee = offs + stp[1] / 115.0f; // -9dB
 
 	UINT_TO_RGBA (clr[4], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee,
 	                                  r/255.0, g/255.0, b/255.0);
 
 	UINT_TO_RGBA (clr[3], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee + soft,
 	                                  r/255.0, g/255.0, b/255.0);
 
-	knee = ((float)height * stp[0] / 115.0f); // -18dB
+	knee = offs + stp[0] / 115.0f; // -18dB
 
 	UINT_TO_RGBA (clr[2], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee,
 	                                  r/255.0, g/255.0, b/255.0);
 
 	UINT_TO_RGBA (clr[1], &r, &g, &b, &a);
-	cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+	cairo_pattern_add_color_stop_rgb (pat, 1.0 - knee + soft,
 	                                  r/255.0, g/255.0, b/255.0);
 
 	UINT_TO_RGBA (clr[0], &r, &g, &b, &a); // bottom
 	cairo_pattern_add_color_stop_rgb (pat, 1.0,
 	                                  r/255.0, g/255.0, b/255.0);
 
-	if (shade && !no_rgba_overlay) {
+	if ((styleflags & 1) && !no_rgba_overlay) {
 		cairo_pattern_t* shade_pattern = cairo_pattern_create_linear (0.0, 0.0, width, 0.0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 0, 1.0, 1.0, 1.0, 0.2);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 1, 0.0, 0.0, 0.0, 0.3);
+		cairo_pattern_add_color_stop_rgba (shade_pattern, 0,   0.0, 0.0, 0.0, 0.15);
+		cairo_pattern_add_color_stop_rgba (shade_pattern, 0.4, 1.0, 1.0, 1.0, 0.05);
+		cairo_pattern_add_color_stop_rgba (shade_pattern, 1,   0.0, 0.0, 0.0, 0.25);
 
 		cairo_surface_t* surface;
 		cairo_t* tc = 0;
@@ -189,19 +208,49 @@ 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 (pat);
 		cairo_pattern_destroy (shade_pattern);
 
-		pat = cairo_pattern_create_for_surface (surface);
+		if (styleflags & 2) { // LED stripes
+			cairo_save (tc);
+			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) {
+				cairo_move_to(tc, 0, y);
+				cairo_line_to(tc, width, y);
+				cairo_stroke (tc);
+			}
+			cairo_restore (tc);
+		}
 
+		pat = cairo_pattern_create_for_surface (surface);
 		cairo_destroy (tc);
 		cairo_surface_destroy (surface);
 	}
 
+	if (horiz) {
+		cairo_surface_t* surface;
+		cairo_t* tc = 0;
+		surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, height, width);
+		tc = cairo_create (surface);
+
+		cairo_matrix_t m;
+		cairo_matrix_init_rotate (&m, -M_PI/2.0);
+		cairo_matrix_translate (&m, -height, 0);
+		cairo_pattern_set_matrix (pat, &m);
+		cairo_set_source (tc, pat);
+		cairo_rectangle (tc, 0, 0, height, width);
+		cairo_fill (tc);
+		cairo_pattern_destroy (pat);
+		pat = cairo_pattern_create_for_surface (surface);
+		cairo_destroy (tc);
+		cairo_surface_destroy (surface);
+	}
 	Cairo::RefPtr<Cairo::Pattern> p (new Cairo::Pattern (pat, false));
 
 	return p;
@@ -210,7 +259,7 @@ FastMeter::generate_meter_pattern (
 
 Cairo::RefPtr<Cairo::Pattern>
 FastMeter::generate_meter_background (
-		int width, int height, int *clr, bool shade)
+		int width, int height, int *clr, bool shade, bool horiz)
 {
 	guint8 r0,g0,b0,r1,g1,b1,a;
 
@@ -251,6 +300,25 @@ FastMeter::generate_meter_background (
 		cairo_surface_destroy (surface);
 	}
 
+	if (horiz) {
+		cairo_surface_t* surface;
+		cairo_t* tc = 0;
+		surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, height, width);
+		tc = cairo_create (surface);
+
+		cairo_matrix_t m;
+		cairo_matrix_init_rotate (&m, -M_PI/2.0);
+		cairo_matrix_translate (&m, -height, 0);
+		cairo_pattern_set_matrix (pat, &m);
+		cairo_set_source (tc, pat);
+		cairo_rectangle (tc, 0, 0, height, width);
+		cairo_fill (tc);
+		cairo_pattern_destroy (pat);
+		pat = cairo_pattern_create_for_surface (surface);
+		cairo_destroy (tc);
+		cairo_surface_destroy (surface);
+	}
+
 	Cairo::RefPtr<Cairo::Pattern> p (new Cairo::Pattern (pat, false));
 
 	return p;
@@ -258,18 +326,16 @@ FastMeter::generate_meter_background (
 
 Cairo::RefPtr<Cairo::Pattern>
 FastMeter::request_vertical_meter(
-		int width, int height, int *clr, float *stp, bool shade)
+		int width, int height, int *clr, float *stp, int styleflags)
 {
-	if (height < min_pattern_metric_size)
-		height = min_pattern_metric_size;
-	if (height > max_pattern_metric_size)
-		height = max_pattern_metric_size;
+	height = max(height, min_pattern_metric_size);
+	height = min(height, max_pattern_metric_size);
 
 	const Pattern10MapKey key (width, height,
 			stp[0], stp[1], stp[2], stp[3],
 			clr[0], clr[1], clr[2], clr[3],
 			clr[4], clr[5], clr[6], clr[7],
-			clr[8], clr[9]);
+			clr[8], clr[9], styleflags);
 
 	Pattern10Map::iterator i;
 	if ((i = vm_pattern_cache.find (key)) != vm_pattern_cache.end()) {
@@ -278,7 +344,7 @@ FastMeter::request_vertical_meter(
 	// TODO flush pattern cache if it gets too large
 
 	Cairo::RefPtr<Cairo::Pattern> p = generate_meter_pattern (
-		width, height, clr, stp, shade);
+		width, height, clr, stp, styleflags, false);
 	vm_pattern_cache[key] = p;
 
 	return p;
@@ -288,12 +354,11 @@ Cairo::RefPtr<Cairo::Pattern>
 FastMeter::request_vertical_background(
 		int width, int height, int *bgc, bool shade)
 {
-	if (height < min_pattern_metric_size)
-		height = min_pattern_metric_size;
-	if (height > max_pattern_metric_size)
-		height = max_pattern_metric_size;
+	height = max(height, min_pattern_metric_size);
+	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;
@@ -301,12 +366,62 @@ FastMeter::request_vertical_background(
 	// TODO flush pattern cache if it gets too large
 
 	Cairo::RefPtr<Cairo::Pattern> p = generate_meter_background (
-		width, height, bgc, shade);
+		width, height, bgc, shade, false);
 	vb_pattern_cache[key] = p;
 
 	return p;
 }
 
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::request_horizontal_meter(
+		int width, int height, int *clr, float *stp, int styleflags)
+{
+	width = max(width, min_pattern_metric_size);
+	width = min(width, max_pattern_metric_size);
+
+	const Pattern10MapKey key (width, height,
+			stp[0], stp[1], stp[2], stp[3],
+			clr[0], clr[1], clr[2], clr[3],
+			clr[4], clr[5], clr[6], clr[7],
+			clr[8], clr[9], styleflags);
+
+	Pattern10Map::iterator i;
+	if ((i = hm_pattern_cache.find (key)) != hm_pattern_cache.end()) {
+		return i->second;
+	}
+	// TODO flush pattern cache if it gets too large
+
+	Cairo::RefPtr<Cairo::Pattern> p = generate_meter_pattern (
+		height, width, clr, stp, styleflags, true);
+
+	hm_pattern_cache[key] = p;
+	return p;
+}
+
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::request_horizontal_background(
+		int width, int height, int *bgc, bool shade)
+{
+	width = max(width, min_pattern_metric_size);
+	width = min(width, max_pattern_metric_size);
+	width += 2;
+
+	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;
+	}
+	// TODO flush pattern cache if it gets too large
+
+	Cairo::RefPtr<Cairo::Pattern> p = generate_meter_background (
+		height, width, bgc, shade, true);
+
+	hb_pattern_cache[key] = p;
+
+	return p;
+}
+
+
 
 void
 FastMeter::set_hold_count (long val)
@@ -325,6 +440,16 @@ FastMeter::set_hold_count (long val)
 void
 FastMeter::on_size_request (GtkRequisition* req)
 {
+	if (orientation == Vertical) {
+		vertical_size_request (req);
+	} else {
+		horizontal_size_request (req);
+	}
+}
+
+void
+FastMeter::vertical_size_request (GtkRequisition* req)
+{
 	req->height = request_height;
 	req->height = max(req->height, min_pattern_metric_size);
 	req->height = min(req->height, max_pattern_metric_size);
@@ -334,8 +459,30 @@ FastMeter::on_size_request (GtkRequisition* req)
 }
 
 void
+FastMeter::horizontal_size_request (GtkRequisition* req)
+{
+	req->width = request_width;
+	req->width = max(req->width, min_pattern_metric_size);
+	req->width = min(req->width, max_pattern_metric_size);
+	req->width += 2;
+
+	req->height  = request_height;
+}
+
+void
 FastMeter::on_size_allocate (Gtk::Allocation &alloc)
 {
+	if (orientation == Vertical) {
+		vertical_size_allocate (alloc);
+	} else {
+		horizontal_size_allocate (alloc);
+	}
+	queue_draw ();
+}
+
+void
+FastMeter::vertical_size_allocate (Gtk::Allocation &alloc)
+{
 	if (alloc.get_width() != request_width) {
 		alloc.set_width (request_width);
 	}
@@ -349,7 +496,7 @@ FastMeter::on_size_allocate (Gtk::Allocation &alloc)
 	}
 
 	if (pixheight != h) {
-		fgpattern = request_vertical_meter (request_width, h, _clr, _stp, true);
+		fgpattern = request_vertical_meter (request_width, h, _clr, _stp, _styleflags);
 		bgpattern = request_vertical_background (request_width, h, highlight ? _bgh : _bgc, highlight);
 		pixheight = h - 2;
 		pixwidth  = request_width - 2;
@@ -358,10 +505,39 @@ FastMeter::on_size_allocate (Gtk::Allocation &alloc)
 	DrawingArea::on_size_allocate (alloc);
 }
 
+void
+FastMeter::horizontal_size_allocate (Gtk::Allocation &alloc)
+{
+	if (alloc.get_height() != request_height) {
+		alloc.set_height (request_height);
+	}
+
+	int w = alloc.get_width();
+	w = max (w, min_pattern_metric_size + 2);
+	w = min (w, max_pattern_metric_size + 2);
+
+	if (w != alloc.get_width()) {
+		alloc.set_width (w);
+	}
+
+	if (pixwidth != w) {
+		fgpattern = request_horizontal_meter (w, request_height, _clr, _stp, _styleflags);
+		bgpattern = request_horizontal_background (w, request_height, highlight ? _bgh : _bgc, highlight);
+		pixwidth = w - 2;
+		pixheight  = request_height - 2;
+	}
+
+	DrawingArea::on_size_allocate (alloc);
+}
+
 bool
 FastMeter::on_expose_event (GdkEventExpose* ev)
 {
-	return vertical_expose (ev);
+	if (orientation == Vertical) {
+		return vertical_expose (ev);
+	} else {
+		return horizontal_expose (ev);
+	}
 }
 
 bool
@@ -378,7 +554,7 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
 	cairo_clip (cr);
 
 	cairo_set_source_rgb (cr, 0, 0, 0); // black
-	rounded_rectangle (cr, 0, 0, pixrect.width + 2, pixheight + 2, 2);
+	rounded_rectangle (cr, 0, 0, pixwidth + 2, pixheight + 2, 2);
 	cairo_stroke (cr);
 
 	top_of_meter = (gint) floor (pixheight * current_level);
@@ -413,14 +589,87 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
 		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 ));
+		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());
-		cairo_rectangle (cr, 1, last_peak_rect.y, pixwidth, last_peak_rect.height);
+		cairo_rectangle (cr, last_peak_rect.x, last_peak_rect.y, last_peak_rect.width, last_peak_rect.height);
+
+		if (bright_hold && !no_rgba_overlay) {
+			cairo_fill_preserve (cr);
+			cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.3);
+		}
+		cairo_fill (cr);
+
+	} else {
+		last_peak_rect.width = 0;
+		last_peak_rect.height = 0;
+	}
+
+	cairo_destroy (cr);
+
+	return TRUE;
+}
+
+bool
+FastMeter::horizontal_expose (GdkEventExpose* ev)
+{
+	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);
+
+	cairo_set_source_rgb (cr, 0, 0, 0); // black
+	rounded_rectangle (cr, 0, 0, pixwidth + 2, pixheight + 2, 2);
+	cairo_stroke (cr);
+
+	right_of_meter = (gint) floor (pixwidth * current_level);
+
+	/* reset the height & origin of the rect that needs to show the pixbuf
+	 */
+
+	pixrect.width = right_of_meter;
+
+	background.x = 1 + right_of_meter;
+	background.y = 1;
+	background.width = pixwidth - right_of_meter;
+	background.height = pixheight;
+
+	if (gdk_rectangle_intersect (&background, &ev->area, &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)) {
+		cairo_set_source (cr, fgpattern->cobj());
+		cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
+		cairo_fill (cr);
+	}
+
+	// draw peak bar
+
+	if (hold_state) {
+		last_peak_rect.y = 1;
+		last_peak_rect.height = pixheight;
+		const int xpos = floor (pixwidth * current_peak);
+		if (bright_hold || (_styleflags & 2)) {
+			last_peak_rect.width = min(3, xpos );
+		} else {
+			last_peak_rect.width = min(2, xpos );
+		}
+		last_peak_rect.x = 1 + max(0, xpos - last_peak_rect.width);
+
+		cairo_set_source (cr, fgpattern->cobj());
+		cairo_rectangle (cr, last_peak_rect.x, last_peak_rect.y, last_peak_rect.width, last_peak_rect.height);
 
 		if (bright_hold && !no_rgba_overlay) {
 			cairo_fill_preserve (cr);
@@ -444,6 +693,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;
@@ -475,7 +726,11 @@ FastMeter::set (float lvl, float peak)
 		return;
 	}
 
-	queue_vertical_redraw (win, old_level);
+	if (orientation == Vertical) {
+		queue_vertical_redraw (win, old_level);
+	} else {
+		queue_horizontal_redraw (win, old_level);
+	}
 }
 
 void
@@ -538,8 +793,8 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
 		}
 		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 ));
+		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 ));
 		}
@@ -557,13 +812,88 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
 }
 
 void
+FastMeter::queue_horizontal_redraw (const Glib::RefPtr<Gdk::Window>& win, float old_level)
+{
+	GdkRectangle rect;
+
+	gint new_right = (gint) floor (pixwidth * current_level);
+
+	rect.height = pixheight;
+	rect.y = 1;
+
+	if (current_level > old_level) {
+		rect.x = 1 + pixrect.width;
+		/* colored/pixbuf got larger, just draw the new section */
+		rect.width = new_right - pixrect.width;
+	} else {
+		/* it got smaller, compute the difference */
+		rect.x = 1 + new_right;
+		/* rect.height is the old.x (smaller) minus the new.x (larger) */
+		rect.width = pixrect.width - new_right;
+	}
+
+	GdkRegion* region = 0;
+	bool queue = false;
+
+	if (rect.height != 0) {
+
+		/* ok, first region to draw ... */
+
+		region = gdk_region_rectangle (&rect);
+		queue = true;
+	}
+
+	/* redraw the last place where the last peak hold bar was;
+	   the next expose will draw the new one whether its part of
+	   expose region or not.
+	*/
+
+	if (last_peak_rect.width * last_peak_rect.height != 0) {
+		if (!queue) {
+			region = gdk_region_new ();
+			queue = true;
+		}
+		gdk_region_union_with_rect (region, &last_peak_rect);
+	}
+
+	if (hold_state && current_peak > 0) {
+		if (!queue) {
+			region = gdk_region_new ();
+			queue = true;
+		}
+		rect.y = 1;
+		rect.height = pixheight;
+		const int xpos = floor (pixwidth * current_peak);
+		if (bright_hold || (_styleflags & 2)) {
+			rect.width = min(3, xpos);
+		} else {
+			rect.width = min(2, xpos);
+		}
+		rect.x = 1 + max(0, xpos - rect.width);
+		gdk_region_union_with_rect (region, &rect);
+	}
+
+	if (queue) {
+		gdk_window_invalidate_region (win->gobj(), region, true);
+	}
+	if (region) {
+		gdk_region_destroy(region);
+		region = 0;
+	}
+}
+
+void
 FastMeter::set_highlight (bool onoff)
 {
 	if (highlight == onoff) {
 		return;
 	}
 	highlight = onoff;
-	bgpattern = request_vertical_background (request_width, pixheight, highlight ? _bgh : _bgc, highlight);
+	if (orientation == Vertical) {
+		bgpattern = request_vertical_background (pixwidth + 2, pixheight + 2, highlight ? _bgh : _bgc, highlight);
+	} else {
+		bgpattern = request_horizontal_background (pixwidth + 2, pixheight + 2, highlight ? _bgh : _bgc, highlight);
+	}
 	queue_draw ();
 }
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
index 15c962deb4..8070748963 100644
--- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
+++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
@@ -47,7 +47,8 @@ class FastMeter : public Gtk::DrawingArea {
 			float stp0 = 55.0, // log_meter(-18);
 			float stp1 = 77.5, // log_meter(-9);
 			float stp2 = 92.5, // log_meter(-3); // 95.0, // log_meter(-2);
-			float stp3 = 100.0
+			float stp3 = 100.0,
+			int styleflags = 3
 			);
 	virtual ~FastMeter ();
 
@@ -67,7 +68,6 @@ protected:
 	bool on_expose_event (GdkEventExpose*);
 	void on_size_request (GtkRequisition*);
 	void on_size_allocate (Gtk::Allocation&);
-
 private:
 
 	Cairo::RefPtr<Cairo::Pattern> fgpattern;
@@ -79,6 +79,7 @@ private:
 	int _clr[10];
 	int _bgc[2];
 	int _bgh[2];
+	int _styleflags;
 
 	Orientation orientation;
 	GdkRectangle pixrect;
@@ -94,19 +95,30 @@ private:
 	bool highlight;
 
 	bool vertical_expose (GdkEventExpose*);
+	void vertical_size_request (GtkRequisition*);
+	void vertical_size_allocate (Gtk::Allocation&);
 	void queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>&, float);
 
+	bool horizontal_expose (GdkEventExpose*);
+	void horizontal_size_request (GtkRequisition*);
+	void horizontal_size_allocate (Gtk::Allocation&);
+	void queue_horizontal_redraw (const Glib::RefPtr<Gdk::Window>&, float);
+
 	static bool no_rgba_overlay;
 
 	static Cairo::RefPtr<Cairo::Pattern> generate_meter_pattern (
-		int w, int h, int *clr, float *stp, bool shade);
+		int, int, int *, float *, int, bool);
 	static Cairo::RefPtr<Cairo::Pattern> request_vertical_meter (
-		int w, int h, int *clr, float *stp, bool shade);
+		int, int, int *, float *, int);
+	static Cairo::RefPtr<Cairo::Pattern> request_horizontal_meter (
+		int, int, int *, float *, int);
 
 	static Cairo::RefPtr<Cairo::Pattern> generate_meter_background (
-		int w, int h, int *bgc, bool shade);
+		int, int, int *, bool, bool);
 	static Cairo::RefPtr<Cairo::Pattern> request_vertical_background (
-		int w, int h, int *bgc, bool shade);
+		int, int, int *, bool);
+	static Cairo::RefPtr<Cairo::Pattern> request_horizontal_background (
+		int, int, int *, bool);
 
 	struct Pattern10MapKey {
 		Pattern10MapKey (
@@ -114,38 +126,45 @@ private:
 				float stp0, float stp1, float stp2, float stp3,
 				int c0, int c1, int c2, int c3,
 				int c4, int c5, int c6, int c7,
-				int c8, int c9
+				int c8, int c9, int st
 				)
 			: dim(w, h)
 			, stp(stp0, stp1, stp2, stp3)
 			, cols(c0, c1, c2, c3, c4, c5, c6, c7, c8, c9)
+			, style(st)
 		{}
 		inline bool operator<(const Pattern10MapKey& rhs) const {
 			return (dim < rhs.dim)
 				|| (dim == rhs.dim && stp < rhs.stp)
-				|| (dim == rhs.dim && stp == rhs.stp && cols < rhs.cols);
+				|| (dim == rhs.dim && stp == rhs.stp && cols < rhs.cols)
+				|| (dim == rhs.dim && stp == rhs.stp && cols == rhs.cols && style < rhs.style);
 		}
 		boost::tuple<int, int> dim;
 		boost::tuple<float, float, float, float> stp;
 		boost::tuple<int, int, int, int, int, int, int, int, int, int> cols;
+		int style;
 	};
 	typedef std::map<Pattern10MapKey, Cairo::RefPtr<Cairo::Pattern> > Pattern10Map;
 
 	struct PatternBgMapKey {
-		PatternBgMapKey (int w, int h, int c0, int c1)
+		PatternBgMapKey (int w, int h, int c0, int c1, bool shade)
 			: dim(w, h)
 			, cols(c0, c1)
+			, sh(shade)
 		{}
 		inline bool operator<(const PatternBgMapKey& rhs) const {
-			return (dim < rhs.dim) || (dim == rhs.dim && cols < rhs.cols);
+			return (dim < rhs.dim) || (dim == rhs.dim && cols < rhs.cols) || (dim == rhs.dim && cols == rhs.cols && (sh && !rhs.sh));
 		}
 		boost::tuple<int, int> dim;
 		boost::tuple<int, int> cols;
+		bool sh;
 	};
 	typedef std::map<PatternBgMapKey, Cairo::RefPtr<Cairo::Pattern> > PatternBgMap;
 
 	static Pattern10Map vm_pattern_cache;
 	static PatternBgMap vb_pattern_cache;
+	static Pattern10Map hm_pattern_cache;
+	static PatternBgMap hb_pattern_cache;
 	static int min_pattern_metric_size; // min dimension for axis that displays the meter level
 	static int max_pattern_metric_size; // max dimension for axis that displays the meter level
 };
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 84988e1525..2c6b026a42 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -164,7 +164,7 @@ class Keyboard : public sigc::trackable, PBD::Stateful
 	    }
 	};
 
-	sigc::signal0<void> ShiftReleased;
+	sigc::signal0<void> ZoomVerticalModifierReleased;
 
   protected:
 	static Keyboard* _the_keyboard;
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index f694471d9a..5087f61a23 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -248,12 +248,15 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 		keyval = event->keyval;
 	}
 
-	if (keyval == GDK_Shift_L) {
+	if (event->state & ScrollZoomVerticalModifier) {
 		/* There is a special and rather hacky situation in Editor which makes
-		   it useful to know when a shift key has been released, so emit a signal
-		   here (see Editor::_stepping_axis_view)
+		   it useful to know when the modifier key for vertical zoom has been
+		   released, so emit a signal here (see Editor::_stepping_axis_view).
+		   Note that the state bit for the modifier key is set for the key-up
+		   event when the modifier is released, but not the key-down when it
+		   is pressed, so we get here on key-up, which is what we want.
 		*/
-		ShiftReleased (); /* EMIT SIGNAL */
+		ZoomVerticalModifierReleased (); /* EMIT SIGNAL */
 	}
 
 	if (event->type == GDK_KEY_PRESS) {