unify BarController with Slider/Pixfader.

1 files changed, 49 insertions, 442 deletions

diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 2b9aba1016..5e715c6a28 100644
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -13,8 +13,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include <string>
@@ -40,54 +38,31 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 BarController::BarController (Gtk::Adjustment& adj,
-			      boost::shared_ptr<PBD::Controllable> mc)
-
-	: adjustment (adj)
-	, binding_proxy (mc)
-	, spinner (adjustment)
-	, _hovering (false)
-{			  
-	_style = LeftToRight;
-	grabbed = false;
-	switching = false;
-	switch_on_release = false;
-	use_parent = false;
-	logarithmic = false;
-
-	layout = darea.create_pango_layout("");
+		boost::shared_ptr<PBD::Controllable> mc)
+	: _slider (&adj, 60, 16)
+	, _logarithmic (false)
+	, _switching (false)
+	, _switch_on_release (false)
+{
 
+	add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
 	set (.5, .5, 1.0, 1.0);
-	set_border_width(0);
-
-	initial_value = adjustment.get_value ();
-
-	adjustment.signal_value_changed().connect (mem_fun (*this, &Gtk::Widget::queue_draw));
-	adjustment.signal_changed().connect (mem_fun (*this, &Gtk::Widget::queue_draw));
+	set_border_width (0);
+	_slider.set_controllable (mc);
 
-	darea.add_events (Gdk::BUTTON_RELEASE_MASK|
-			  Gdk::BUTTON_PRESS_MASK|
-			  Gdk::POINTER_MOTION_MASK|
-			  Gdk::ENTER_NOTIFY_MASK|
-			  Gdk::LEAVE_NOTIFY_MASK|
-			  Gdk::SCROLL_MASK);
-
-	darea.signal_expose_event().connect (mem_fun (*this, &BarController::expose));
-	darea.signal_motion_notify_event().connect (mem_fun (*this, &BarController::motion));
-	darea.signal_button_press_event().connect (mem_fun (*this, &BarController::button_press), false);
-	darea.signal_button_release_event().connect (mem_fun (*this, &BarController::button_release), false);
-	darea.signal_scroll_event().connect (mem_fun (*this, &BarController::scroll));
-	darea.signal_enter_notify_event().connect (mem_fun (*this, &BarController::on_enter_notify_event));
-	darea.signal_leave_notify_event().connect (mem_fun (*this, &BarController::on_leave_notify_event));
+	_slider.StartGesture.connect (sigc::mem_fun(*this, &BarController::passtrhu_gesture_start));
+	_slider.StopGesture.connect (sigc::mem_fun(*this, &BarController::passtrhu_gesture_stop));
+	_slider.OnExpose.connect (sigc::mem_fun(*this, &BarController::before_expose));
 
+	Gtk::SpinButton& spinner = _slider.get_spin_button();
 	spinner.signal_activate().connect (mem_fun (*this, &BarController::entry_activated));
 	spinner.signal_focus_out_event().connect (mem_fun (*this, &BarController::entry_focus_out));
 	spinner.signal_input().connect (mem_fun (*this, &BarController::entry_input));
 	spinner.signal_output().connect (mem_fun (*this, &BarController::entry_output));
 	spinner.set_digits (9);
 	spinner.set_numeric (true);
-	
-	add (darea);
-
+	spinner.set_name ("BarControlSpinner");
+	add (_slider);
 	show_all ();
 }
 
@@ -96,435 +71,68 @@ BarController::~BarController ()
 }
 
 bool
-BarController::on_enter_notify_event (GdkEventCrossing*)
-{
-	_hovering = true;
-	Keyboard::magic_widget_grab_focus ();
-	queue_draw ();
-	return false;
-}
-
-bool
-BarController::on_leave_notify_event (GdkEventCrossing*)
-{
-	_hovering = false;
-	Keyboard::magic_widget_drop_focus();
-	queue_draw ();
-	return false;
-}
-
-void
-BarController::drop_grab ()
-{
-	if (grabbed) {
-		grabbed = false;
-		darea.remove_modal_grab();
-		StopGesture ();
-	}
-}
-
-bool
-BarController::button_press (GdkEventButton* ev)
+BarController::on_button_press_event (GdkEventButton* ev)
 {
-	double fract;
-
-	if (binding_proxy.button_press_handler (ev)) {
-		return true;
+	if (get_child() != &_slider) {
+		return false;
 	}
-
-	switch (ev->button) {
-	case 1:
-		if (ev->type == GDK_2BUTTON_PRESS) {
-			switch_on_release = true;
-			drop_grab ();
-		} else {
-			switch_on_release = false;
-			darea.add_modal_grab();
-			grabbed = true;
-			grab_x = ev->x;
-			grab_window = ev->window;
-			StartGesture ();
-		}
+	if (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) {
+		_switch_on_release = true;
 		return true;
-		break;
-
-	case 2:
-		fract = ev->x / (darea.get_width() - 2.0);
-		adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower()));
-
-	case 3:
-		break;
-
-	case 4:
-	case 5:
-		break;
+	} else {
+		_switch_on_release = false;
 	}
-
 	return false;
 }
 
 bool
-BarController::button_release (GdkEventButton* ev)
+BarController::on_button_release_event (GdkEventButton* ev)
 {
-	drop_grab ();
-	
-	switch (ev->button) {
-	case 1:
-		if (switch_on_release) {
-			Glib::signal_idle().connect (mem_fun (*this, &BarController::switch_to_spinner));
-			return true;
-		}
-
-		if ((ev->state & (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier)) == Keyboard::TertiaryModifier) {
-			adjustment.set_value (initial_value);
-		} else {
-			double scale;
-
-			if ((ev->state & (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) == (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) {
-				scale = 0.01;
-			} else if (ev->state & Keyboard::PrimaryModifier) {
-				scale = 0.1;
-			} else {
-				scale = 1.0;
-			}
-
-			mouse_control (ev->x, ev->window, scale);
-		}
-		break;
-
-	case 2:
-		break;
-		
-	case 3:
+	if (get_child() != &_slider) {
 		return false;
-		
-	default:
-		break;
-	}
-
-	return true;
-}
-
-bool
-BarController::scroll (GdkEventScroll* ev)
-{
-	double scale;
-
-	if ((ev->state & (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) == (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) {
-		scale = 0.01;
-	} else if (ev->state & Keyboard::PrimaryModifier) {
-		scale = 0.1;
-	} else {
-		scale = 1.0;
-	}
-
-	switch (ev->direction) {
-	case GDK_SCROLL_UP:
-	case GDK_SCROLL_RIGHT:
-		adjustment.set_value (adjustment.get_value() + (scale * adjustment.get_step_increment()));
-		break;
-
-	case GDK_SCROLL_DOWN:
-	case GDK_SCROLL_LEFT:
-		adjustment.set_value (adjustment.get_value() - (scale * adjustment.get_step_increment()));
-		break;
 	}
-
-	return true;
-}
-
-bool
-BarController::motion (GdkEventMotion* ev)
-{
-	double scale;
-	
-	if (!grabbed) {
+	if (ev->button == 1 && _switch_on_release) {
+		Glib::signal_idle().connect (mem_fun (*this, &BarController::switch_to_spinner));
 		return true;
 	}
-
-	if ((ev->state & (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier)) == Keyboard::TertiaryModifier) {
-		return TRUE;
-	}
-
-	if ((ev->state & (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) == (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) {
-		scale = 0.01;
-	} else if (ev->state & Keyboard::PrimaryModifier) {
-		scale = 0.1;
-	} else {
-		scale = 1.0;
-	}
-
-	return mouse_control (ev->x, ev->window, scale);
-}
-
-gint
-BarController::mouse_control (double x, GdkWindow* window, double scaling)
-{
-	double fract = 0.0;
-	double delta;
-
-	if (window != grab_window) {
-		grab_x = x;
-		grab_window = window;
-		return TRUE;
-	}
-
-	delta = x - grab_x;
-	grab_x = x;
-        
-	switch (_style) {
-	case Line:
-	case Blob:
-	case LeftToRight:
-        case CenterOut:
-		fract = scaling * (delta / (darea.get_width() - 2));
-		fract = min (1.0, fract);
-		fract = max (-1.0, fract);
-		adjustment.set_value (adjustment.get_value() + fract * (adjustment.get_upper() - adjustment.get_lower()));
-		break;
-	default:
-		fract = 0.0;
-	}
-	
-	
-	return TRUE;
-}
-
-Gdk::Color
-BarController::get_parent_bg ()
-{
-        Widget* parent;
-
-	parent = get_parent ();
-
-        while (parent) {
-		static const char* has_cairo_widget_background_info = "has_cairo_widget_background_info";
-		void* p = g_object_get_data (G_OBJECT(parent->gobj()), has_cairo_widget_background_info);
-
-		if (p) {
-			Glib::RefPtr<Gtk::Style> style = parent->get_style();
-			return style->get_bg (get_state());
-		}
-		
-		if (!parent->get_has_window()) {
-			parent = parent->get_parent();
-		} else {
-			break;
-		}
-        }
-
-        if (parent && parent->get_has_window()) {
-		return parent->get_style ()->get_bg (parent->get_state());
-        } 
-
-	return get_style ()->get_bg (get_state());
-}
-
-bool
-BarController::expose (GdkEventExpose* /*event*/)
-{
-	Glib::RefPtr<Gdk::Window> win (darea.get_window());
-	Cairo::RefPtr<Cairo::Context> context = win->create_cairo_context();
-	cairo_t* cr = context->cobj();
-
-	Gdk::Color fg_col = get_style()->get_fg (get_state());
-
-	double fract = ((adjustment.get_value() - adjustment.get_lower()) /
-		 (adjustment.get_upper() - adjustment.get_lower()));
-	
-	gint w = darea.get_width() ;
-	gint h = darea.get_height();
-	gint bar_start, bar_width;
-	double radius = 4;
-
-	switch (_style) {
-	case Line:
-		bar_start = (gint) floor ((w-1) * fract);
-		bar_width = 1;
-		break;
-
-	case Blob:
-		// ????
-		break;
-
-	case CenterOut:
-        bar_width = (w*fract);
-        bar_start = (w/2) - bar_width/2; // center, back up half the bar width
- 		break;
-
-	case LeftToRight:
-		bar_start = 1;
-		bar_width = floor((w-2)*fract);
-
-		break;
-
-	case RightToLeft:
-		break;
-	case TopToBottom:
-		break;
-	case BottomToTop:
-		break;
-	}
-
-	//fill in the bg rect ... 
-	Gdk::Color c = get_parent_bg(); //get_style()->get_bg (Gtk::STATE_PRELIGHT);  //why prelight?  Shouldn't we be using the parent's color?  maybe   get_parent_bg  ?
-	CairoWidget::set_source_rgb_a (cr, c);
-	cairo_rectangle (cr, 0, 0, w, h);
-	cairo_fill(cr);
-
-	//"slot"
-	cairo_set_source_rgba (cr, 0.17, 0.17, 0.17, 1.0);
-	Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, radius-0.5);
-	cairo_fill(cr);
-
-	//mask off the corners
-	Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, radius-0.5);
-	cairo_clip(cr);
-	
-		//background gradient
-		if ( !CairoWidget::flat_buttons() ) {
-			cairo_pattern_t *bg_gradient = cairo_pattern_create_linear (0.0, 0.0, 0, h);
-			cairo_pattern_add_color_stop_rgba (bg_gradient, 0, 0, 0, 0, 0.4);
-			cairo_pattern_add_color_stop_rgba (bg_gradient, 0.2, 0, 0, 0, 0.2);
-			cairo_pattern_add_color_stop_rgba (bg_gradient, 1, 0, 0, 0, 0.0);
-			cairo_set_source (cr, bg_gradient);
-			Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, radius-1.5);
-			cairo_fill (cr);
-			cairo_pattern_destroy(bg_gradient);
-		}
-		
-		//fg color
-		CairoWidget::set_source_rgb_a (cr, fg_col, 1.0);
-		Gtkmm2ext::rounded_rectangle (cr, bar_start, 1, bar_width, h-2, radius - 1.5);
-		cairo_fill(cr);
-
-		//fg gradient
-		if (!CairoWidget::flat_buttons() ) {
-			cairo_pattern_t * fg_gradient = cairo_pattern_create_linear (0.0, 0.0, 0, h);
-			cairo_pattern_add_color_stop_rgba (fg_gradient, 0, 0, 0, 0, 0.0);
-			cairo_pattern_add_color_stop_rgba (fg_gradient, 0.1, 0, 0, 0, 0.0);
-			cairo_pattern_add_color_stop_rgba (fg_gradient, 1, 0, 0, 0, 0.3);
-			cairo_set_source (cr, fg_gradient);
-			Gtkmm2ext::rounded_rectangle (cr, bar_start, 1, bar_width, h-2, radius - 1.5);
-			cairo_fill (cr);
-			cairo_pattern_destroy(fg_gradient);
-		}
-		
-	cairo_reset_clip(cr);
-
-	//black border
-	cairo_set_line_width (cr, 1.0);
-	cairo_set_source_rgba (cr, 0, 0, 0, 1.0);
-	Gtkmm2ext::rounded_rectangle (cr, 0.5, 0.5, w-1, h-1, radius);
-	cairo_stroke(cr);
-
-	/* draw the unity-position line if it's not at either end*/
-/*	if (unity_loc > 0) {
-		context->set_line_width (1);
-		cairo_set_source_rgba (cr, 1,1,1, 1.0);
-		if ( _orien == VERT) {
-			if (unity_loc < h ) {
-				context->move_to (2.5, unity_loc + radius + .5);
-				context->line_to (girth-2.5, unity_loc + radius + .5);
-				context->stroke ();
-			}
-		} else {
-			if ( unity_loc < w ){
-				context->move_to (unity_loc - radius + .5, 3.5);
-				context->line_to (unity_loc - radius + .5, girth-3.5);
-				context->stroke ();
-			}
-		}
-	}*/
-	
-	if (!darea.get_sensitive()) {
-		rounded_rectangle (context, 0, 0, darea.get_width(), darea.get_height(), 3);
-		context->set_source_rgba (0.505, 0.517, 0.525, 0.6);
-		context->fill ();
-	} else if (_hovering) {
-		Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, radius);
-		cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.1);
-		cairo_fill (cr);
-	}
-
-	/* draw label */
-
-	double xpos = -1;
-	std::string const label = get_label (xpos);
-	if (!label.empty()) {
-		
-		int twidth, theight;
-		layout->set_text (label);
-		layout->get_pixel_size (twidth, theight);
-
-		if (fract > 0.5) {
-			cairo_set_source_rgba (cr, 0.17, 0.17, 0.17, 1.0);
-			context->move_to ( 5, (darea.get_height()/2) - (theight/2));
-		} else {
-			c = get_style()->get_text (get_state());
-			CairoWidget::set_source_rgb_a (cr, c, 0.7);
-			context->move_to ( w-twidth-5, (darea.get_height()/2) - (theight/2));
-		}
-		layout->show_in_cairo_context (context);
-	}
-	
-	return true;
-}
-
-void
-BarController::set_style (barStyle s)
-{
-	_style = s;
-	darea.queue_draw ();
+	return false;
 }
 
 gint
 BarController::switch_to_bar ()
 {
-	if (switching) {
-		return FALSE;
-	}
-
-	switching = true;
-
-	if (get_child() == &darea) {
+	if (_switching || get_child() == &_slider) {
 		return FALSE;
 	}
-
+	_switching = true;
 	remove ();
-	add (darea);
-	darea.show ();
-
-	switching = false;
-
+	add (_slider);
+	_slider.show ();
+	_slider.queue_draw ();
+	_switching = false;
 	SpinnerActive (false); /* EMIT SIGNAL */
-	
 	return FALSE;
 }
 
 gint
 BarController::switch_to_spinner ()
 {
-	if (switching) {
+	if (_switching || get_child() != &_slider) {
 		return FALSE;
 	}
 
-	switching = true;
-
-	if (get_child() == &spinner) {
-		return FALSE;
+	_switching = true;
+	Gtk::SpinButton& spinner = _slider.get_spin_button();
+	if (spinner.get_parent()) {
+		spinner.get_parent()->remove(spinner);
 	}
-
 	remove ();
 	add (spinner);
 	spinner.show ();
 	spinner.select_region (0, spinner.get_text_length());
 	spinner.grab_focus ();
-
-	switching = false;
-
+	_switching = false;
 	SpinnerActive (true); /* EMIT SIGNAL */
-
 	return FALSE;
 }
 
@@ -542,17 +150,17 @@ BarController::entry_focus_out (GdkEventFocus* /*ev*/)
 }
 
 void
-BarController::set_use_parent (bool yn)
+BarController::before_expose ()
 {
-	use_parent = yn;
-	queue_draw ();
+	double xpos = -1;
+	_slider.set_text (get_label (xpos), false);
 }
 
 void
 BarController::set_sensitive (bool yn)
 {
 	Alignment::set_sensitive (yn);
-	darea.set_sensitive (yn);
+	_slider.set_sensitive (yn);
 }
 
 /* 
@@ -570,11 +178,12 @@ BarController::set_sensitive (bool yn)
 int
 BarController::entry_input (double* new_value)
 {
-	if (!logarithmic) {
+	if (!_logarithmic) {
 		return false;
 	}
 
 	// extract a double from the string and take its log
+	Gtk::SpinButton& spinner = _slider.get_spin_button();
 	Entry *entry = dynamic_cast<Entry *>(&spinner);
 	double value;
 
@@ -604,18 +213,19 @@ BarController::entry_input (double* new_value)
 bool
 BarController::entry_output ()
 {
-	if (!logarithmic) {
+	if (!_logarithmic) {
 		return false;
 	}
 
+	char buf[128];
+	Gtk::SpinButton& spinner = _slider.get_spin_button();
+
 	// generate the exponential and turn it into a string
 	// convert to correct locale. 
 	
 	stringstream stream;
 	string str;
 
-	char buf[128];
-
 	{
 		// Switch to user's preferred locale so that
 		// if they use different LC_NUMERIC conventions,
@@ -630,6 +240,3 @@ BarController::entry_output ()
 	
 	return true;
 }
-
-
-