Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

git-svn-id: svn://localhost/ardour2/branches/3.0@9654 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 533 insertions, 534 deletions

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index a0c5849066..7fe204fbfd 100644
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -1,20 +1,19 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis
+  Copyright (C) 2000-2007 Paul Davis
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    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.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  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.
 */
 
 #include <iostream>
@@ -58,75 +57,75 @@ bool StereoPanner::have_colors = false;
 using namespace ARDOUR;
 
 StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner)
-        : _panner (panner)
-        , position_control (_panner->pannable()->pan_azimuth_control)
-        , width_control (_panner->pannable()->pan_width_control)
-        , dragging (false)
-        , dragging_position (false)
-        , dragging_left (false)
-        , dragging_right (false)
-        , drag_start_x (0)
-        , last_drag_x (0)
-        , accumulated_delta (0)
-        , detented (false)
-        , drag_data_window (0)
-        , drag_data_label (0)
-        , position_binder (position_control)
-        , width_binder (width_control)
+	: _panner (panner)
+	, position_control (_panner->pannable()->pan_azimuth_control)
+	, width_control (_panner->pannable()->pan_width_control)
+	, dragging (false)
+	, dragging_position (false)
+	, dragging_left (false)
+	, dragging_right (false)
+	, drag_start_x (0)
+	, last_drag_x (0)
+	, accumulated_delta (0)
+	, detented (false)
+	, drag_data_window (0)
+	, drag_data_label (0)
+	, position_binder (position_control)
+	, width_binder (width_control)
 {
-        if (!have_colors) {
-                set_colors ();
-                have_colors = true;
-        }
+	if (!have_colors) {
+		set_colors ();
+		have_colors = true;
+	}
 
-        position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
-        width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
+	position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
+	width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
 
-        set_flags (Gtk::CAN_FOCUS);
+	set_flags (Gtk::CAN_FOCUS);
 
-        add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|
-                    Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|
-                    Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|
-                    Gdk::SCROLL_MASK|
-                    Gdk::POINTER_MOTION_MASK);
+	add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|
+	            Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|
+	            Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|
+	            Gdk::SCROLL_MASK|
+	            Gdk::POINTER_MOTION_MASK);
 
-        ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler));
+	ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler));
 }
 
 StereoPanner::~StereoPanner ()
 {
-        delete drag_data_window;
+	delete drag_data_window;
 }
 
 void
 StereoPanner::set_drag_data ()
 {
-        if (!drag_data_label) {
-                return;
-        }
-
-        double pos = position_control->get_value(); // 0..1
-        
-        /* We show the position of the center of the image relative to the left & right.
-           This is expressed as a pair of percentage values that ranges from (100,0) 
-           (hard left) through (50,50) (hard center) to (0,100) (hard right).
-
-           This is pretty wierd, but its the way audio engineers expect it. Just remember that
-           the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
-        */
-
-        char buf[64];
-        snprintf (buf, sizeof (buf), "L:%3d R:%3d Width:%d%%", (int) rint (100.0 * (1.0 - pos)),
-                  (int) rint (100.0 * pos),
-                  (int) floor (100.0 * width_control->get_value()));
-        drag_data_label->set_markup (buf);
+	if (!drag_data_label) {
+		return;
+	}
+
+	double pos = position_control->get_value(); // 0..1
+
+	/* We show the position of the center of the image relative to the left & right.
+	   This is expressed as a pair of percentage values that ranges from (100,0)
+	   (hard left) through (50,50) (hard center) to (0,100) (hard right).
+
+	   This is pretty wierd, but its the way audio engineers expect it. Just remember that
+	   the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
+	*/
+
+	char buf[64];
+	snprintf (buf, sizeof (buf), "L:%3d R:%3d Width:%d%%", (int) rint (100.0 * (1.0 - pos)),
+	          (int) rint (100.0 * pos),
+	          (int) floor (100.0 * width_control->get_value()));
+	drag_data_label->set_markup (buf);
 }
 
 void
 StereoPanner::value_change ()
 {
-        set_drag_data ();
-        queue_draw ();
+	set_drag_data ();
+	queue_draw ();
 }
 
 bool
@@ -134,146 +133,146 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
 {
 	Glib::RefPtr<Gdk::Window> win (get_window());
 	Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
-        Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
-       
-        int width, height;
-        double pos = position_control->get_value (); /* 0..1 */
-        double swidth = width_control->get_value (); /* -1..+1 */
-        double fswidth = fabs (swidth);
-        uint32_t o, f, t, b, r;
-       State state;
-        const double corner_radius = 5.0;
-
-        width = get_width();
-        height = get_height ();
-
-        if (swidth == 0.0) {
-                state = Mono;
-        } else if (swidth < 0.0) {
-                state = Inverted;
-        } else { 
-                state = Normal;
-        }
-
-        o = colors[state].outline;
-        f = colors[state].fill;
-        t = colors[state].text;
-        b = colors[state].background;
-        r = colors[state].rule;
-
-        /* background */
-
-        context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
-        rounded_rectangle (context, 0, 0, width, height, corner_radius);
-        context->fill ();
-
-        /* the usable width is reduced from the real width, because we need space for 
-           the two halves of LR boxes that will extend past the actual left/right
-           positions (indicated by the vertical line segment above them).
-        */
-
-        double usable_width = width - lr_box_size;
-
-        /* compute the centers of the L/R boxes based on the current stereo width */
-
-        if (fmod (usable_width,2.0) == 0) {
-                /* even width, but we need odd, so that there is an exact center.
-                   So, offset cairo by 1, and reduce effective width by 1 
-                */
-                usable_width -= 1.0;
-                context->translate (1.0, 0.0);
-        }
-
-        double center = (lr_box_size/2.0) + (usable_width * pos);
-        const double pan_spread = (fswidth * usable_width)/2.0;
-        const double half_lr_box = lr_box_size/2.0;
-        int left;
-        int right;
-
-        left = center - pan_spread;  // center of left box
-        right = center + pan_spread; // center of right box
-
-        /* center line */
-
-        context->set_line_width (1.0);
-        context->move_to ((usable_width + lr_box_size)/2.0, 0);
-        context->rel_line_to (0, height);
-        context->set_source_rgba (UINT_RGBA_R_FLT(r), UINT_RGBA_G_FLT(r), UINT_RGBA_B_FLT(r), UINT_RGBA_A_FLT(r));
-        context->stroke ();
-
-        /* compute & draw the line through the box */
-        
-        context->set_line_width (2);
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->move_to (left, top_step+(pos_box_size/2.0)+step_down);
-        context->line_to (left, top_step+(pos_box_size/2.0));
-        context->line_to (right, top_step+(pos_box_size/2.0));
-        context->line_to (right, top_step+(pos_box_size/2.0) + step_down);
-        context->stroke ();
-
-        /* left box */
-
-        rounded_rectangle (context, left - half_lr_box,
-                           half_lr_box+step_down, 
-                           lr_box_size, lr_box_size, corner_radius);
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->stroke_preserve ();
-        context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
+
+	int width, height;
+	double pos = position_control->get_value (); /* 0..1 */
+	double swidth = width_control->get_value (); /* -1..+1 */
+	double fswidth = fabs (swidth);
+	uint32_t o, f, t, b, r;
+	State state;
+	const double corner_radius = 5.0;
+
+	width = get_width();
+	height = get_height ();
+
+	if (swidth == 0.0) {
+		state = Mono;
+	} else if (swidth < 0.0) {
+		state = Inverted;
+	} else {
+		state = Normal;
+	}
+
+	o = colors[state].outline;
+	f = colors[state].fill;
+	t = colors[state].text;
+	b = colors[state].background;
+	r = colors[state].rule;
+
+	/* background */
+
+	context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
+	rounded_rectangle (context, 0, 0, width, height, corner_radius);
 	context->fill ();
-        
-        /* add text */
-
-        context->move_to (left - half_lr_box + 3,
-                          (lr_box_size/2) + step_down + 13);
-        context->select_font_face ("sans-serif", Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD);
-
-        if (state != Mono) {
-                context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
-                if (swidth < 0.0) {
-                        context->show_text (_("R"));
-                } else {
-                        context->show_text (_("L"));
-                }
-        }
-
-        /* right box */
-
-        rounded_rectangle (context, right - half_lr_box,
-                           half_lr_box+step_down, 
-                           lr_box_size, lr_box_size, corner_radius);
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->stroke_preserve ();
-        context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+
+	/* the usable width is reduced from the real width, because we need space for
+	   the two halves of LR boxes that will extend past the actual left/right
+	   positions (indicated by the vertical line segment above them).
+	*/
+
+	double usable_width = width - lr_box_size;
+
+	/* compute the centers of the L/R boxes based on the current stereo width */
+
+	if (fmod (usable_width,2.0) == 0) {
+		/* even width, but we need odd, so that there is an exact center.
+		   So, offset cairo by 1, and reduce effective width by 1
+		*/
+		usable_width -= 1.0;
+		context->translate (1.0, 0.0);
+	}
+
+	double center = (lr_box_size/2.0) + (usable_width * pos);
+	const double pan_spread = (fswidth * usable_width)/2.0;
+	const double half_lr_box = lr_box_size/2.0;
+	int left;
+	int right;
+
+	left = center - pan_spread;  // center of left box
+	right = center + pan_spread; // center of right box
+
+	/* center line */
+
+	context->set_line_width (1.0);
+	context->move_to ((usable_width + lr_box_size)/2.0, 0);
+	context->rel_line_to (0, height);
+	context->set_source_rgba (UINT_RGBA_R_FLT(r), UINT_RGBA_G_FLT(r), UINT_RGBA_B_FLT(r), UINT_RGBA_A_FLT(r));
+	context->stroke ();
+
+	/* compute & draw the line through the box */
+
+	context->set_line_width (2);
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->move_to (left, top_step+(pos_box_size/2.0)+step_down);
+	context->line_to (left, top_step+(pos_box_size/2.0));
+	context->line_to (right, top_step+(pos_box_size/2.0));
+	context->line_to (right, top_step+(pos_box_size/2.0) + step_down);
+	context->stroke ();
+
+	/* left box */
+
+	rounded_rectangle (context, left - half_lr_box,
+	                   half_lr_box+step_down,
+	                   lr_box_size, lr_box_size, corner_radius);
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->stroke_preserve ();
+	context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
 	context->fill ();
 
-        /* add text */
-
-        context->move_to (right - half_lr_box + 3, (lr_box_size/2)+step_down + 13);
-        context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
-        
-        if (state == Mono) {
-                context->show_text (_("M"));
-        } else {
-                if (swidth < 0.0) {
-                        context->show_text (_("L"));
-                } else {
-                        context->show_text (_("R"));
-                }
-        }
-        
-        /* draw the central box */
-
-        context->set_line_width (2.0);
+	/* add text */
+
+	context->move_to (left - half_lr_box + 3,
+	                  (lr_box_size/2) + step_down + 13);
+	context->select_font_face ("sans-serif", Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD);
+
+	if (state != Mono) {
+		context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
+		if (swidth < 0.0) {
+			context->show_text (_("R"));
+		} else {
+			context->show_text (_("L"));
+		}
+	}
+
+	/* right box */
+
+	rounded_rectangle (context, right - half_lr_box,
+	                   half_lr_box+step_down,
+	                   lr_box_size, lr_box_size, corner_radius);
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->stroke_preserve ();
+	context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	context->fill ();
+
+	/* add text */
+
+	context->move_to (right - half_lr_box + 3, (lr_box_size/2)+step_down + 13);
+	context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
+
+	if (state == Mono) {
+		context->show_text (_("M"));
+	} else {
+		if (swidth < 0.0) {
+			context->show_text (_("L"));
+		} else {
+			context->show_text (_("R"));
+		}
+	}
+
+	/* draw the central box */
+
+	context->set_line_width (2.0);
 	context->move_to (center + (pos_box_size/2.0), top_step); /* top right */
-        context->rel_line_to (0.0, pos_box_size); /* lower right */
-        context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */
-        context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */
-        context->rel_line_to (0.0, -pos_box_size); /* upper left */
-        context->close_path ();
-
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->stroke_preserve ();
-        context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	context->rel_line_to (0.0, pos_box_size); /* lower right */
+	context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */
+	context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */
+	context->rel_line_to (0.0, -pos_box_size); /* upper left */
+	context->close_path ();
+
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->stroke_preserve ();
+	context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
 	context->fill ();
 
 	return true;
@@ -282,347 +281,347 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
 bool
 StereoPanner::on_button_press_event (GdkEventButton* ev)
 {
-        drag_start_x = ev->x;
-        last_drag_x = ev->x;
-        
-        dragging_position = false;
-        dragging_left = false;
-        dragging_right = false;
-        dragging = false;
-        accumulated_delta = 0;
-        detented = false;
-
-        /* Let the binding proxies get first crack at the press event
-         */
-
-        if (ev->y < 20) {
-                if (position_binder.button_press_handler (ev)) {
-                        return true;
-                }
-        } else {
-                if (width_binder.button_press_handler (ev)) {
-                        return true;
-                }
-        }
-        
-        if (ev->button != 1) {
-                return false;
-        }
-
-        if (ev->type == GDK_2BUTTON_PRESS) {
-                int width = get_width();
-
-                if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
-                        /* handled by button release */
-                        return true;
-                }
-
-                if (ev->y < 20) {
-                        
-                        /* upper section: adjusts position, constrained by width */
-
-                        const double w = fabs (width_control->get_value ());
-                        const double max_pos = 1.0 - (w/2.0);
-                        const double min_pos = w/2.0;
-
-                        if (ev->x <= width/3) {
-                                /* left side dbl click */
-                                if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
-                                        /* 2ndary-double click on left, collapse to hard left */
-                                        width_control->set_value (0);
-                                        position_control->set_value (0);
-                                } else {
-                                        position_control->set_value (min_pos);
-                                }
-                        } else if (ev->x > 2*width/3) {
-                                if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
-                                        /* 2ndary-double click on right, collapse to hard right */
-                                        width_control->set_value (0);
-                                        position_control->set_value (1.0);
-                                } else {
-                                        position_control->set_value (max_pos);
-                                }
-                        } else {
-                                position_control->set_value (0.5);
-                        }
-
-                } else {
-
-                        /* lower section: adjusts width, constrained by position */
-
-                        const double p = position_control->get_value ();
-                        const double max_width = 2.0 * min ((1.0 - p), p);
-
-                        if (ev->x <= width/3) {
-                                /* left side dbl click */
-                                width_control->set_value (max_width); // reset width to 100%
-                        } else if (ev->x > 2*width/3) {
-                                /* right side dbl click */
-                                width_control->set_value (-max_width); // reset width to inverted 100%
-                        } else {
-                                /* center dbl click */
-                                width_control->set_value (0); // collapse width to 0%
-                        }
-                }
-
-                dragging = false;
-
-        } else if (ev->type == GDK_BUTTON_PRESS) {
-
-                if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
-                        /* handled by button release */
-                        return true;
-                }
-
-                if (ev->y < 20) {
-                        /* top section of widget is for position drags */
-                        dragging_position = true;
-                        StartPositionGesture ();
-                } else {
-                        /* lower section is for dragging width */
-                        
-                        double pos = position_control->get_value (); /* 0..1 */
-                        double swidth = width_control->get_value (); /* -1..+1 */
-                        double fswidth = fabs (swidth);
-                        int usable_width = get_width() - lr_box_size;
-                        double center = (lr_box_size/2.0) + (usable_width * pos);
-                        int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box
-                        int right = lrint (center +  (fswidth * usable_width / 2.0)); // center of rightmost box
-                        const int half_box = lr_box_size/2;
-                        
-                        if (ev->x >= (left - half_box) && ev->x < (left + half_box)) {
-                                if (swidth < 0.0) {
-                                        dragging_right = true;
-                                } else {
-                                        dragging_left = true;
-                                }
-                        } else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) {
-                                if (swidth < 0.0) {
-                                        dragging_left = true;
-                                } else {
-                                        dragging_right = true;
-                                }
-                        }
-                        StartWidthGesture ();
-                }
-
-                dragging = true;
-        }
-
-        return true;
+	drag_start_x = ev->x;
+	last_drag_x = ev->x;
+
+	dragging_position = false;
+	dragging_left = false;
+	dragging_right = false;
+	dragging = false;
+	accumulated_delta = 0;
+	detented = false;
+
+	/* Let the binding proxies get first crack at the press event
+	 */
+
+	if (ev->y < 20) {
+		if (position_binder.button_press_handler (ev)) {
+			return true;
+		}
+	} else {
+		if (width_binder.button_press_handler (ev)) {
+			return true;
+		}
+	}
+
+	if (ev->button != 1) {
+		return false;
+	}
+
+	if (ev->type == GDK_2BUTTON_PRESS) {
+		int width = get_width();
+
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+			/* handled by button release */
+			return true;
+		}
+
+		if (ev->y < 20) {
+
+			/* upper section: adjusts position, constrained by width */
+
+			const double w = fabs (width_control->get_value ());
+			const double max_pos = 1.0 - (w/2.0);
+			const double min_pos = w/2.0;
+
+			if (ev->x <= width/3) {
+				/* left side dbl click */
+				if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
+					/* 2ndary-double click on left, collapse to hard left */
+					width_control->set_value (0);
+					position_control->set_value (0);
+				} else {
+					position_control->set_value (min_pos);
+				}
+			} else if (ev->x > 2*width/3) {
+				if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
+					/* 2ndary-double click on right, collapse to hard right */
+					width_control->set_value (0);
+					position_control->set_value (1.0);
+				} else {
+					position_control->set_value (max_pos);
+				}
+			} else {
+				position_control->set_value (0.5);
+			}
+
+		} else {
+
+			/* lower section: adjusts width, constrained by position */
+
+			const double p = position_control->get_value ();
+			const double max_width = 2.0 * min ((1.0 - p), p);
+
+			if (ev->x <= width/3) {
+				/* left side dbl click */
+				width_control->set_value (max_width); // reset width to 100%
+			} else if (ev->x > 2*width/3) {
+				/* right side dbl click */
+				width_control->set_value (-max_width); // reset width to inverted 100%
+			} else {
+				/* center dbl click */
+				width_control->set_value (0); // collapse width to 0%
+			}
+		}
+
+		dragging = false;
+
+	} else if (ev->type == GDK_BUTTON_PRESS) {
+
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+			/* handled by button release */
+			return true;
+		}
+
+		if (ev->y < 20) {
+			/* top section of widget is for position drags */
+			dragging_position = true;
+			StartPositionGesture ();
+		} else {
+			/* lower section is for dragging width */
+
+			double pos = position_control->get_value (); /* 0..1 */
+			double swidth = width_control->get_value (); /* -1..+1 */
+			double fswidth = fabs (swidth);
+			int usable_width = get_width() - lr_box_size;
+			double center = (lr_box_size/2.0) + (usable_width * pos);
+			int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box
+			int right = lrint (center +  (fswidth * usable_width / 2.0)); // center of rightmost box
+			const int half_box = lr_box_size/2;
+
+			if (ev->x >= (left - half_box) && ev->x < (left + half_box)) {
+				if (swidth < 0.0) {
+					dragging_right = true;
+				} else {
+					dragging_left = true;
+				}
+			} else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) {
+				if (swidth < 0.0) {
+					dragging_left = true;
+				} else {
+					dragging_right = true;
+				}
+			}
+			StartWidthGesture ();
+		}
+
+		dragging = true;
+	}
+
+	return true;
 }
 
 bool
 StereoPanner::on_button_release_event (GdkEventButton* ev)
 {
-        if (ev->button != 1) {
-                return false;
-        }
-
-        bool dp = dragging_position;
-
-        dragging = false;
-        dragging_position = false;
-        dragging_left = false;
-        dragging_right = false;
-        accumulated_delta = 0;
-        detented = false;
-
-        if (drag_data_window) {
-                drag_data_window->hide ();
-        }
-        
-        if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
-                /* reset to default */
-                position_control->set_value (0.5);
-                width_control->set_value (1.0);
-        } else {
-                if (dp) {
-                        StopPositionGesture ();
-                } else {
-                        StopWidthGesture ();
-                }
-        }
-
-        return true;
+	if (ev->button != 1) {
+		return false;
+	}
+
+	bool dp = dragging_position;
+
+	dragging = false;
+	dragging_position = false;
+	dragging_left = false;
+	dragging_right = false;
+	accumulated_delta = 0;
+	detented = false;
+
+	if (drag_data_window) {
+		drag_data_window->hide ();
+	}
+
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+		/* reset to default */
+		position_control->set_value (0.5);
+		width_control->set_value (1.0);
+	} else {
+		if (dp) {
+			StopPositionGesture ();
+		} else {
+			StopWidthGesture ();
+		}
+	}
+
+	return true;
 }
 
 bool
 StereoPanner::on_scroll_event (GdkEventScroll* ev)
 {
-        double one_degree = 1.0/180.0; // one degree as a number from 0..1, since 180 degrees is the full L/R axis
-        double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-        double wv = width_control->get_value(); // 0..1.0 ; 0 = left
-        double step;
-        
-        if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
-                step = one_degree;
-        } else {
-                step = one_degree * 5.0;
-        }
-
-        switch (ev->direction) {
-        case GDK_SCROLL_LEFT:
-                wv += step;
-                width_control->set_value (wv);
-                break;
-        case GDK_SCROLL_UP:
-                pv -= step;
-                position_control->set_value (pv);
-                break;
-        case GDK_SCROLL_RIGHT:
-                wv -= step;
-                width_control->set_value (wv);
-                break;
-        case GDK_SCROLL_DOWN:
-                pv += step;
-                position_control->set_value (pv);
-                break;
-        }
-
-        return true;
+	double one_degree = 1.0/180.0; // one degree as a number from 0..1, since 180 degrees is the full L/R axis
+	double pv = position_control->get_value(); // 0..1.0 ; 0 = left
+	double wv = width_control->get_value(); // 0..1.0 ; 0 = left
+	double step;
+
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+		step = one_degree;
+	} else {
+		step = one_degree * 5.0;
+	}
+
+	switch (ev->direction) {
+	case GDK_SCROLL_LEFT:
+		wv += step;
+		width_control->set_value (wv);
+		break;
+	case GDK_SCROLL_UP:
+		pv -= step;
+		position_control->set_value (pv);
+		break;
+	case GDK_SCROLL_RIGHT:
+		wv -= step;
+		width_control->set_value (wv);
+		break;
+	case GDK_SCROLL_DOWN:
+		pv += step;
+		position_control->set_value (pv);
+		break;
+	}
+
+	return true;
 }
 
 bool
 StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
 {
-        if (!dragging) {
-                return false;
-        }
-
-        if (!drag_data_window) {
-                drag_data_window = new Window (WINDOW_POPUP);
-                drag_data_window->set_name (X_("ContrastingPopup"));
-                drag_data_window->set_position (WIN_POS_MOUSE);
-                drag_data_window->set_decorated (false);
-                
-                drag_data_label = manage (new Label);
-                drag_data_label->set_use_markup (true);
-
-                drag_data_window->set_border_width (6);
-                drag_data_window->add (*drag_data_label);
-                drag_data_label->show ();
-                
-                Window* toplevel = dynamic_cast<Window*> (get_toplevel());
-                if (toplevel) {
-                        drag_data_window->set_transient_for (*toplevel);
-                }
-        }
-
-        if (!drag_data_window->is_visible ()) {
-                /* move the popup window vertically down from the panner display */
-                int rx, ry;
-                get_window()->get_origin (rx, ry);
-                drag_data_window->move (rx, ry+get_height());
-                drag_data_window->present ();
-        }
-
-        int w = get_width();
-        double delta = (ev->x - last_drag_x) / (double) w;
-        double current_width = width_control->get_value ();
-        
-        if (dragging_left) {
-                delta = -delta;
-        }
-
-        if (dragging_left || dragging_right) {
-
-                /* maintain position as invariant as we change the width */
-
-
-                /* create a detent close to the center */
-
-                if (!detented && fabs (current_width) < 0.02) {
-                        detented = true;
-                        /* snap to zero */
-                        width_control->set_value (0);
-                }
-                
-                if (detented) {
-
-                        accumulated_delta += delta;
-
-                        /* have we pulled far enough to escape ? */
-
-                        if (fabs (accumulated_delta) >= 0.025) {
-                                width_control->set_value (current_width + accumulated_delta);
-                                detented = false;
-                                accumulated_delta = false;
-                        }
-                                
-                } else {
-                        width_control->set_value (current_width + delta);
-                }
-
-        } else if (dragging_position) {
-
-                double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-                position_control->set_value (pv + delta);
-        }
-
-        last_drag_x = ev->x;
-        return true;
+	if (!dragging) {
+		return false;
+	}
+
+	if (!drag_data_window) {
+		drag_data_window = new Window (WINDOW_POPUP);
+		drag_data_window->set_name (X_("ContrastingPopup"));
+		drag_data_window->set_position (WIN_POS_MOUSE);
+		drag_data_window->set_decorated (false);
+
+		drag_data_label = manage (new Label);
+		drag_data_label->set_use_markup (true);
+
+		drag_data_window->set_border_width (6);
+		drag_data_window->add (*drag_data_label);
+		drag_data_label->show ();
+
+		Window* toplevel = dynamic_cast<Window*> (get_toplevel());
+		if (toplevel) {
+			drag_data_window->set_transient_for (*toplevel);
+		}
+	}
+
+	if (!drag_data_window->is_visible ()) {
+		/* move the popup window vertically down from the panner display */
+		int rx, ry;
+		get_window()->get_origin (rx, ry);
+		drag_data_window->move (rx, ry+get_height());
+		drag_data_window->present ();
+	}
+
+	int w = get_width();
+	double delta = (ev->x - last_drag_x) / (double) w;
+	double current_width = width_control->get_value ();
+
+	if (dragging_left) {
+		delta = -delta;
+	}
+
+	if (dragging_left || dragging_right) {
+
+		/* maintain position as invariant as we change the width */
+
+
+		/* create a detent close to the center */
+
+		if (!detented && fabs (current_width) < 0.02) {
+			detented = true;
+			/* snap to zero */
+			width_control->set_value (0);
+		}
+
+		if (detented) {
+
+			accumulated_delta += delta;
+
+			/* have we pulled far enough to escape ? */
+
+			if (fabs (accumulated_delta) >= 0.025) {
+				width_control->set_value (current_width + accumulated_delta);
+				detented = false;
+				accumulated_delta = false;
+			}
+
+		} else {
+			width_control->set_value (current_width + delta);
+		}
+
+	} else if (dragging_position) {
+
+		double pv = position_control->get_value(); // 0..1.0 ; 0 = left
+		position_control->set_value (pv + delta);
+	}
+
+	last_drag_x = ev->x;
+	return true;
 }
 
 bool
 StereoPanner::on_key_press_event (GdkEventKey* ev)
 {
-        double one_degree = 1.0/180.0;
-        double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-        double wv = width_control->get_value(); // 0..1.0 ; 0 = left
-        double step;
-
-        if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
-                step = one_degree;
-        } else {
-                step = one_degree * 5.0;
-        }
-
-        /* up/down control width because we consider pan position more "important"
-           (and thus having higher "sense" priority) than width.
-        */
-
-        switch (ev->keyval) {
-        case GDK_Up:
-                if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
-                        width_control->set_value (1.0);
-                } else {
-                        width_control->set_value (wv + step);
-                }
-                break;
-        case GDK_Down:
-                if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
-                        width_control->set_value (-1.0);
-                } else {
-                        width_control->set_value (wv - step);
-                }
-
-        case GDK_Left:
-                pv -= step;
-                position_control->set_value (pv);
-                break;
-        case GDK_Right:
-                pv += step;
-                position_control->set_value (pv);
-                break;
-
-                break;
-        case GDK_0:
-        case GDK_KP_0:
-                width_control->set_value (0.0);
-                break;
-
-        default: 
-                return false;
-        }
-                
-        return true;
+	double one_degree = 1.0/180.0;
+	double pv = position_control->get_value(); // 0..1.0 ; 0 = left
+	double wv = width_control->get_value(); // 0..1.0 ; 0 = left
+	double step;
+
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+		step = one_degree;
+	} else {
+		step = one_degree * 5.0;
+	}
+
+	/* up/down control width because we consider pan position more "important"
+	   (and thus having higher "sense" priority) than width.
+	*/
+
+	switch (ev->keyval) {
+	case GDK_Up:
+		if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+			width_control->set_value (1.0);
+		} else {
+			width_control->set_value (wv + step);
+		}
+		break;
+	case GDK_Down:
+		if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+			width_control->set_value (-1.0);
+		} else {
+			width_control->set_value (wv - step);
+		}
+
+	case GDK_Left:
+		pv -= step;
+		position_control->set_value (pv);
+		break;
+	case GDK_Right:
+		pv += step;
+		position_control->set_value (pv);
+		break;
+
+		break;
+	case GDK_0:
+	case GDK_KP_0:
+		width_control->set_value (0.0);
+		break;
+
+	default:
+		return false;
+	}
+
+	return true;
 }
 
 bool
 StereoPanner::on_key_release_event (GdkEventKey* ev)
 {
-        return false;
+	return false;
 }
 
 bool
@@ -643,28 +642,28 @@ StereoPanner::on_leave_notify_event (GdkEventCrossing*)
 void
 StereoPanner::set_colors ()
 {
-        colors[Normal].fill = ARDOUR_UI::config()->canvasvar_StereoPannerFill.get();
-        colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get();
-        colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get();
-        colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get();
-        colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-        colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get();
-        colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get();
-        colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get();
-        colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get();
-        colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-        colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get();
-        colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get();
-        colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get();
-        colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get();
-        colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+	colors[Normal].fill = ARDOUR_UI::config()->canvasvar_StereoPannerFill.get();
+	colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get();
+	colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get();
+	colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get();
+	colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+
+	colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get();
+	colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get();
+	colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get();
+	colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get();
+	colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+
+	colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get();
+	colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get();
+	colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get();
+	colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get();
+	colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
 }
 
 void
 StereoPanner::color_handler ()
 {
-        set_colors ();
-        queue_draw ();
+	set_colors ();
+	queue_draw ();
 }