clean up pixfader API, prepare for merge w/BarController

2 files changed, 131 insertions, 110 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/pixfader.h b/libs/gtkmm2ext/gtkmm2ext/pixfader.h
index bc08f9bca9..272c7a7b20 100644
--- a/libs/gtkmm2ext/gtkmm2ext/pixfader.h
+++ b/libs/gtkmm2ext/gtkmm2ext/pixfader.h
@@ -33,18 +33,22 @@ namespace Gtkmm2ext {
 
 class LIBGTKMM2EXT_API PixFader : public Gtk::DrawingArea
 {
-  public:
-        PixFader (Gtk::Adjustment& adjustment, int orientation, int span, int girth);
+	public:
+	PixFader (Gtk::Adjustment& adjustment, int orientation, int span, int girth);
 	virtual ~PixFader ();
 
+	sigc::signal<void> StartGesture;
+	sigc::signal<void> StopGesture;
+	sigc::signal<void> OnExpose;
+
 	void set_default_value (float);
-	void set_text (const std::string&);
+	void set_text (const std::string&, bool);
 
-  protected:
+	protected:
 	Glib::RefPtr<Pango::Layout> _layout;
 	std::string                 _text;
-	int   _text_width;
-	int   _text_height;
+	int _text_width;
+	int _text_height;
 
 	Gtk::Adjustment& adjustment;
 
@@ -61,17 +65,36 @@ class LIBGTKMM2EXT_API PixFader : public Gtk::DrawingArea
 
 	void on_state_changed (Gtk::StateType);
 	void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
-	Gdk::Color get_parent_bg ();
 
 	enum Orientation {
 		VERT,
 		HORIZ,
 	};
 
-  private:
-	int span, girth;
+	private:
+	int _span;
+	int _girth;
 	int _orien;
-	cairo_pattern_t* pattern;
+	cairo_pattern_t* _pattern;
+	bool _hovering;
+	GdkWindow* _grab_window;
+	double _grab_loc;
+	double _grab_start;
+	int _last_drawn;
+	bool _dragging;
+	float _default_value;
+	int _unity_loc;
+	bool _centered_text;
+
+	sigc::connection _parent_style_change;
+	Widget * _current_parent;
+	Gdk::Color get_parent_bg ();
+
+	void create_patterns();
+	void adjustment_changed ();
+	void set_adjustment_from_event (GdkEventButton *);
+	void update_unity_position ();
+	int  display_span ();
 
 	struct FaderImage {
 		cairo_pattern_t* pattern;
@@ -118,27 +141,9 @@ class LIBGTKMM2EXT_API PixFader : public Gtk::DrawingArea
 			double abr, double abg, double abb,
 			int w, int h);
 
-	bool _hovering;
-
-	GdkWindow* grab_window;
-	double grab_loc;
-	double grab_start;
-	int last_drawn;
-	bool dragging;
-	float default_value;
-	int unity_loc;
-
-	void adjustment_changed ();
-	int display_span ();
-	void set_adjustment_from_event (GdkEventButton *);
-	void update_unity_position ();
-
-	sigc::connection _parent_style_change;
-	Widget * _current_parent;
-	void create_patterns();
 };
 
 
 } /* namespace */
 
- #endif /* __gtkmm2ext_pixfader_h__ */
+#endif /* __gtkmm2ext_pixfader_h__ */
diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index 744f234a85..bbc6316754 100644
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -42,16 +42,17 @@ std::list<PixFader::FaderImage*> PixFader::_patterns;
 
 PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int fader_girth)
 	: adjustment (adj)
-	, span (fader_length)
-	, girth (fader_girth)
+	, _span (fader_length)
+	, _girth (fader_girth)
 	, _orien (orientation)
-	, pattern (0)
+	, _pattern (0)
 	, _hovering (false)
-	, last_drawn (-1)
-	, dragging (false)
+	, _last_drawn (-1)
+	, _dragging (false)
+	, _centered_text (true)
 	, _current_parent (0)
 {
-	default_value = adjustment.get_value();
+	_default_value = adjustment.get_value();
 	update_unity_position ();
 
 	add_events (
@@ -67,15 +68,16 @@ PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int
 	adjustment.signal_changed().connect (mem_fun (*this, &PixFader::adjustment_changed));
 
 	if (_orien == VERT) {
-		DrawingArea::set_size_request(girth, span);
+		DrawingArea::set_size_request(_girth, _span);
 	} else {
-		DrawingArea::set_size_request(span, girth);
+		DrawingArea::set_size_request(_span, _girth);
 	}
 }
 
 PixFader::~PixFader ()
 {
 	if (_parent_style_change) _parent_style_change.disconnect();
+	if (_layout) _layout.clear (); // drop reference to existing layout
 }
 
 cairo_pattern_t*
@@ -108,13 +110,6 @@ PixFader::create_patterns ()
 	bg = c.get_green_p ();
 	bb = c.get_blue_p ();
 
-	if ( _layout && !_text.empty()) {
-		_layout->get_pixel_size (_text_width, _text_height);
-	} else {
-		_text_width = 0;
-		_text_height = 0;
-	}
-
 	cairo_surface_t* surface;
 	cairo_t* tc = 0;
 
@@ -122,7 +117,7 @@ PixFader::create_patterns ()
 		return;
 	}
 
-	if ((pattern = find_pattern (fr, fg, fb, br, bg, bb, get_width(), get_height())) != 0) {
+	if ((_pattern = find_pattern (fr, fg, fb, br, bg, bb, get_width(), get_height())) != 0) {
 		/* found it - use it */
 		return;
 	}
@@ -155,7 +150,7 @@ PixFader::create_patterns ()
 
 		cairo_pattern_destroy (shade_pattern);
 
-		pattern = cairo_pattern_create_for_surface (surface);
+		_pattern = cairo_pattern_create_for_surface (surface);
 
 	} else {
 
@@ -182,12 +177,12 @@ PixFader::create_patterns ()
 		cairo_fill (tc);
 		cairo_pattern_destroy (shade_pattern);
 
-		pattern = cairo_pattern_create_for_surface (surface);
+		_pattern = cairo_pattern_create_for_surface (surface);
 	}
 
 	/* cache it for others to use */
 
-	_patterns.push_back (new FaderImage (pattern, fr, fg, fb, br, bg, bb, get_width(), get_height()));
+	_patterns.push_back (new FaderImage (_pattern, fr, fg, fb, br, bg, bb, get_width(), get_height()));
 
 	cairo_destroy (tc);
 	cairo_surface_destroy (surface);
@@ -203,11 +198,11 @@ PixFader::on_expose_event (GdkEventExpose* ev)
 	cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
 	cairo_clip (cr);
 
-	if (!pattern) {
+	if (!_pattern) {
 		create_patterns();
 	}
 
-	if (!pattern) {
+	if (!_pattern) {
 		/* this isn't supposed to be happen, but some wackiness whereby
 		 * the pixfader ends up with a 1xN or Nx1 size allocation
 		 * leads to it. the basic wackiness needs fixing but we
@@ -221,6 +216,7 @@ PixFader::on_expose_event (GdkEventExpose* ev)
 		return true;
 	}
 
+	OnExpose();
 	int ds = display_span ();
 	const float w = get_width();
 	const float h = get_height();
@@ -245,9 +241,9 @@ PixFader::on_expose_event (GdkEventExpose* ev)
 		}
 
 		if (!CairoWidget::flat_buttons() ) {
-			cairo_set_source (cr, pattern);
+			cairo_set_source (cr, _pattern);
 			cairo_matrix_init_translate (&matrix, 0, (h - ds));
-			cairo_pattern_set_matrix (pattern, &matrix);
+			cairo_pattern_set_matrix (_pattern, &matrix);
 		} else {
 			CairoWidget::set_source_rgb_a (cr, get_style()->get_bg (get_state()), 1);
 			cairo_fill (cr);
@@ -275,9 +271,9 @@ PixFader::on_expose_event (GdkEventExpose* ev)
 		 */
 
 		if (!CairoWidget::flat_buttons() ) {
-			cairo_set_source (cr, pattern);
+			cairo_set_source (cr, _pattern);
 			cairo_matrix_init_translate (&matrix, w - ds, 0);
-			cairo_pattern_set_matrix (pattern, &matrix);
+			cairo_pattern_set_matrix (_pattern, &matrix);
 		} else {
 			CairoWidget::set_source_rgb_a (cr, get_style()->get_bg (get_state()), 1);
 			cairo_fill (cr);
@@ -289,32 +285,40 @@ PixFader::on_expose_event (GdkEventExpose* ev)
 	}
 
 	/* draw the unity-position line if it's not at either end*/
-	if (unity_loc > 0) {
+	if (_unity_loc > 0) {
 		context->set_line_width (1);
 		context->set_line_cap (Cairo::LINE_CAP_ROUND);
 		Gdk::Color c = get_style()->get_fg (Gtk::STATE_ACTIVE);
 		context->set_source_rgba (c.get_red_p()*1.5, c.get_green_p()*1.5, c.get_blue_p()*1.5, 0.85);
 		if ( _orien == VERT) {
-			if (unity_loc < h ) {
-				context->move_to (1.5, unity_loc + CORNER_OFFSET + .5);
-				context->line_to (girth - 1.5, unity_loc + CORNER_OFFSET + .5);
+			if (_unity_loc < h ) {
+				context->move_to (1.5, _unity_loc + CORNER_OFFSET + .5);
+				context->line_to (_girth - 1.5, _unity_loc + CORNER_OFFSET + .5);
 				context->stroke ();
 			}
 		} else {
-			if ( unity_loc < w ){
-				context->move_to (unity_loc - CORNER_OFFSET + .5, 1.5);
-				context->line_to (unity_loc - CORNER_OFFSET + .5, girth - 1.5);
+			if ( _unity_loc < w ){
+				context->move_to (_unity_loc - CORNER_OFFSET + .5, 1.5);
+				context->line_to (_unity_loc - CORNER_OFFSET + .5, _girth - 1.5);
 				context->stroke ();
 			}
 		}
 	}
 
-	if ( !_text.empty() ) {
-		/* center text */
-		cairo_new_path (cr);
-		cairo_move_to (cr, (get_width() - _text_width)/2.0, get_height()/2.0 - _text_height/2.0);
+	if (_layout && !_text.empty() && _orien == HORIZ) {
+		cairo_save (cr);
+		if (_centered_text) {
+			/* center text */
+			cairo_move_to (cr, (w - _text_width)/2.0, h/2.0 - _text_height/2.0);
+		} else if (ds > .5 * w) {
+			cairo_move_to (cr, CORNER_OFFSET + 3, h/2.0 - _text_height/2.0);
+			cairo_set_operator(cr, CAIRO_OPERATOR_XOR);
+		} else {
+			cairo_move_to (cr, w - _text_width - CORNER_OFFSET - 3, h/2.0 - _text_height/2.0);
+		}
 		CairoWidget::set_source_rgb_a (cr, get_style()->get_text (get_state()), 1);
 		pango_cairo_show_layout (cr, _layout->gobj());
+		cairo_restore (cr);
 	}
 
 	if (!get_sensitive()) {
@@ -327,7 +331,7 @@ PixFader::on_expose_event (GdkEventExpose* ev)
 		cairo_fill (cr);
 	}
 
-	last_drawn = ds;
+	_last_drawn = ds;
 
 	return true;
 }
@@ -336,11 +340,11 @@ void
 PixFader::on_size_request (GtkRequisition* req)
 {
 	if (_orien == VERT) {
-		req->width = (girth ? girth : -1);
-		req->height = (span ? span : -1);
+		req->width = (_girth ? _girth : -1);
+		req->height = (_span ? _span : -1);
 	} else {
-		req->height = (girth ? girth : -1);
-		req->width = (span ? span : -1);
+		req->height = (_girth ? _girth : -1);
+		req->width = (_span ? _span : -1);
 	}
 }
 
@@ -350,11 +354,11 @@ PixFader::on_size_allocate (Gtk::Allocation& alloc)
 	DrawingArea::on_size_allocate(alloc);
 
 	if (_orien == VERT) {
-		girth = alloc.get_width ();
-		span = alloc.get_height ();
+		_girth = alloc.get_width ();
+		_span = alloc.get_height ();
 	} else {
-		girth = alloc.get_height ();
-		span = alloc.get_width ();
+		_girth = alloc.get_height ();
+		_span = alloc.get_width ();
 	}
 
 	if (is_realized()) {
@@ -369,7 +373,13 @@ bool
 PixFader::on_button_press_event (GdkEventButton* ev)
 {
 	if (ev->type != GDK_BUTTON_PRESS) {
-		return true;
+		if (_dragging) {
+			remove_modal_grab();
+			_dragging = false;
+			gdk_pointer_ungrab (GDK_CURRENT_TIME);
+			StopGesture ();
+		}
+		return false;
 	}
 
 	if (ev->button != 1 && ev->button != 2) {
@@ -377,10 +387,11 @@ PixFader::on_button_press_event (GdkEventButton* ev)
 	}
 
 	add_modal_grab ();
-	grab_loc = (_orien == VERT) ? ev->y : ev->x;
-	grab_start = (_orien == VERT) ? ev->y : ev->x;
-	grab_window = ev->window;
-	dragging = true;
+	StartGesture ();
+	_grab_loc = (_orien == VERT) ? ev->y : ev->x;
+	_grab_start = (_orien == VERT) ? ev->y : ev->x;
+	_grab_window = ev->window;
+	_dragging = true;
 	gdk_pointer_grab(ev->window,false,
 			GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK),
 			NULL,NULL,ev->time);
@@ -399,24 +410,27 @@ PixFader::on_button_release_event (GdkEventButton* ev)
 
 	switch (ev->button) {
 	case 1:
-		if (dragging) {
+		if (_dragging) {
 			remove_modal_grab();
-			dragging = false;
+			_dragging = false;
 			gdk_pointer_ungrab (GDK_CURRENT_TIME);
+			StopGesture ();
 
 			if (!_hovering) {
 				Keyboard::magic_widget_drop_focus();
 				queue_draw ();
 			}
 
-			if (ev_pos == grab_start) {
+			if (ev_pos == _grab_start) {
 
 				/* no motion - just a click */
 
 				if (ev->state & Keyboard::TertiaryModifier) {
-					adjustment.set_value (default_value);
+					adjustment.set_value (_default_value);
 				} else if (ev->state & Keyboard::GainFineScaleModifier) {
 					adjustment.set_value (adjustment.get_lower());
+				} else if (ev_pos == display_span()) {
+					; // click on current position, no move.
 				} else if ((_orien == VERT && ev_pos < display_span()) || (_orien == HORIZ && ev_pos > display_span())) {
 					/* above the current display height, remember X Window coords */
 					adjustment.set_value (adjustment.get_value() + adjustment.get_step_increment());
@@ -429,9 +443,10 @@ PixFader::on_button_release_event (GdkEventButton* ev)
 		break;
 
 	case 2:
-		if (dragging) {
+		if (_dragging) {
 			remove_modal_grab();
-			dragging = false;
+			_dragging = false;
+			StopGesture ();
 			set_adjustment_from_event (ev);
 			gdk_pointer_ungrab (GDK_CURRENT_TIME);
 			return true;
@@ -441,7 +456,6 @@ PixFader::on_button_release_event (GdkEventButton* ev)
 	default:
 		break;
 	}
-
 	return false;
 }
 
@@ -506,13 +520,13 @@ PixFader::on_scroll_event (GdkEventScroll* ev)
 bool
 PixFader::on_motion_notify_event (GdkEventMotion* ev)
 {
-	if (dragging) {
+	if (_dragging) {
 		double scale = 1.0;
 		double const ev_pos = (_orien == VERT) ? ev->y : ev->x;
 
-		if (ev->window != grab_window) {
-			grab_loc = ev_pos;
-			grab_window = ev->window;
+		if (ev->window != _grab_window) {
+			_grab_loc = ev_pos;
+			_grab_window = ev->window;
 			return true;
 		}
 
@@ -524,10 +538,10 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev)
 			}
 		}
 
-		double const delta = ev_pos - grab_loc;
-		grab_loc = ev_pos;
+		double const delta = ev_pos - _grab_loc;
+		_grab_loc = ev_pos;
 
-		double fract = (delta / span);
+		double fract = (delta / _span);
 
 		fract = min (1.0, fract);
 		fract = max (-1.0, fract);
@@ -547,7 +561,7 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev)
 void
 PixFader::adjustment_changed ()
 {
-	if (display_span() != last_drawn) {
+	if (display_span() != _last_drawn) {
 		queue_draw ();
 	}
 }
@@ -559,9 +573,9 @@ PixFader::display_span ()
 	float fract = (adjustment.get_value () - adjustment.get_lower()) / ((adjustment.get_upper() - adjustment.get_lower()));
 	int ds;
 	if (_orien == VERT) {
-		ds = (int)floor (span * (1.0 - fract));
+		ds = (int)floor (_span * (1.0 - fract));
 	} else {
-		ds = (int)floor (span * fract);
+		ds = (int)floor (_span * fract);
 	}
 
 	return ds;
@@ -571,9 +585,9 @@ void
 PixFader::update_unity_position ()
 {
 	if (_orien == VERT) {
-		unity_loc = (int) rint (span * (1 - ((default_value - adjustment.get_lower()) / (adjustment.get_upper() - adjustment.get_lower())))) - 1;
+		_unity_loc = (int) rint (_span * (1 - ((_default_value - adjustment.get_lower()) / (adjustment.get_upper() - adjustment.get_lower())))) - 1;
 	} else {
-		unity_loc = (int) rint ((default_value - adjustment.get_lower()) * span / (adjustment.get_upper() - adjustment.get_lower()));
+		_unity_loc = (int) rint ((_default_value - adjustment.get_lower()) * _span / (adjustment.get_upper() - adjustment.get_lower()));
 	}
 
 	queue_draw ();
@@ -591,7 +605,7 @@ PixFader::on_enter_notify_event (GdkEventCrossing*)
 bool
 PixFader::on_leave_notify_event (GdkEventCrossing*)
 {
-	if (!dragging) {
+	if (!_dragging) {
 		_hovering = false;
 		Keyboard::magic_widget_drop_focus();
 		queue_draw ();
@@ -602,7 +616,7 @@ PixFader::on_leave_notify_event (GdkEventCrossing*)
 void
 PixFader::set_adjustment_from_event (GdkEventButton* ev)
 {
-	double fract = (_orien == VERT) ? (1.0 - (ev->y / span)) : (ev->x / span);
+	double fract = (_orien == VERT) ? (1.0 - (ev->y / _span)) : (ev->x / _span);
 
 	fract = min (1.0, fract);
 	fract = max (0.0, fract);
@@ -613,26 +627,27 @@ PixFader::set_adjustment_from_event (GdkEventButton* ev)
 void
 PixFader::set_default_value (float d)
 {
-	default_value = d;
+	_default_value = d;
 	update_unity_position ();
 }
 
 void
-PixFader::set_text (const std::string& str)
+PixFader::set_text (const std::string& str, bool centered = true)
 {
-	_text = str;
-
-	if (!_layout && !_text.empty()) {
+	if (_layout && _text == str) {
+		return;
+	}
+	if (!_layout && !str.empty()) {
 		_layout = Pango::Layout::create (get_pango_context());
-		// XXX explicityly unref in dtor?
 	}
 
+	_text = str;
+	_centered_text = centered;
 	if (_layout) {
 		_layout->set_text (str);
 		_layout->get_pixel_size (_text_width, _text_height);
+		queue_resize ();
 	}
-
-	queue_resize ();
 }
 
 void
@@ -649,11 +664,12 @@ PixFader::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
 	if (_layout) {
 		std::string txt = _layout->get_text();
 		_layout.clear (); // drop reference to existing layout
-		set_text (txt);
+		_text = "";
+		set_text (txt, _centered_text);
 	}
 	/* patterns are cached and re-created as needed 
 	 * during 'expose' in the GUI thread */
-	pattern = 0;
+	_pattern = 0;
 	queue_draw ();
 }