add configurable colors to stereo panner, plus keybindings for zero width (0), 1 (alt-up) or -1 (alt-down), plus M when its mono

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

18 files changed, 182 insertions, 32 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 2d3f9180d2..e1db820fa9 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Ardour>
+  <UI>
+    <Option name="ui-rc-file" value="ardour3_ui_dark.rc"/>
+  </UI>
   <Canvas>
     <Option name="active crossfade" value="3967af79"/>
     <Option name="audio bus base" value="73829968"/>
+    <Option name="audio master bus base" value="00000000"/>
     <Option name="audio track base" value="9daac468"/>
     <Option name="automation line" value="44bc59ff"/>
     <Option name="automation track fill" value="a0a0ce68"/>
     <Option name="automation track outline" value="282828ff"/>
     <Option name="cd marker bar" value="9496a3ff"/>
-    <Option name="clipped waveform" value="ff0000e5"/>
     <Option name="crossfade editor base" value="282d49ff"/>
-    <Option name="crossfade editor line shading" value="00a0d154"/>
     <Option name="crossfade editor line" value="000000ff"/>
+    <Option name="crossfade editor line shading" value="00a0d154"/>
     <Option name="crossfade editor point fill" value="00ff00ff"/>
     <Option name="crossfade editor point outline" value="0000ffff"/>
     <Option name="crossfade editor wave" value="ffffff28"/>
+    <Option name="selected crossfade editor wave fill" value="00000000"/>
     <Option name="crossfade line" value="000000ff"/>
     <Option name="edit point" value="0000ffff"/>
     <Option name="entered automation line" value="dd6363ff"/>
@@ -24,13 +28,13 @@
     <Option name="entered gain line" value="dd6363ff"/>
     <Option name="entered marker" value="dd6363ff"/>
     <Option name="frame handle" value="7c00ff96"/>
-    <Option name="gain line inactive" value="9fbca4c5"/>
     <Option name="gain line" value="00bc20ff"/>
+    <Option name="gain line inactive" value="9fbca4c5"/>
     <Option name="ghost track base" value="44007c7f"/>
     <Option name="ghost track midi outline" value="00000000"/>
-    <Option name="ghost track wave clip" value="ff000000"/>
-    <Option name="ghost track wave fill" value="00000000"/>
     <Option name="ghost track wave" value="02fd004c"/>
+    <Option name="ghost track wave fill" value="00000000"/>
+    <Option name="ghost track wave clip" value="ff000000"/>
     <Option name="ghost track zero line" value="e500e566"/>
     <Option name="image track" value="ddddd8ff"/>
     <Option name="inactive crossfade" value="e8ed3d77"/>
@@ -39,18 +43,18 @@
     <Option name="location marker" value="c4f411ff"/>
     <Option name="location punch" value="7c3a3aff"/>
     <Option name="location range" value="497a59ff"/>
-    <Option name="marker bar separator" value="aaaaaaff"/>
     <Option name="marker bar" value="99a1adff"/>
+    <Option name="marker bar separator" value="aaaaaaff"/>
     <Option name="marker drag line" value="004f00f9"/>
     <Option name="marker label" value="000000ff"/>
     <Option name="marker track" value="ddddd8ff"/>
     <Option name="measure line bar" value="d7d9d99c"/>
     <Option name="measure line beat" value="b5b5b576"/>
     <Option name="meter bar" value="626470ff"/>
+    <Option name="meter fill min" value="0000ffff"/>
     <Option name="meter fill clip" value="ff0000ff"/>
-    <Option name="meter fill max" value="00fd5dff"/>
     <Option name="meter fill mid" value="73f9baff"/>
-    <Option name="meter fill min" value="0000ffff"/>
+    <Option name="meter fill max" value="00fd5dff"/>
     <Option name="midi meter fill min" value="effaa100"/>
     <Option name="midi meter fill clip" value="f83913ff"/>
     <Option name="midi meter fill mid" value="8fc78e00"/>
@@ -58,6 +62,7 @@
     <Option name="meter marker" value="f2425bff"/>
     <Option name="midi bus base" value="00000000"/>
     <Option name="midi frame base" value="393d3766"/>
+    <Option name="midi note inactive channel" value="00000000"/>
     <Option name="midi note color min" value="eef9a0ff"/>
     <Option name="midi note color mid" value="8ec78dff"/>
     <Option name="midi note color max" value="00f456ff"/>
@@ -84,19 +89,29 @@
     <Option name="range drag bar rect" value="969696c6"/>
     <Option name="range drag rect" value="82c696c6"/>
     <Option name="range marker bar" value="7d7f8cff"/>
+    <Option name="recording rect" value="cc2828ff"/>
     <Option name="recorded waveform fill" value="ff0000ff"/>
     <Option name="recorded waveform outline" value="0f0f1fff"/>
-    <Option name="recording rect" value="cc2828ff"/>
-    <Option name="region base" value="99a7b5a0"/>
     <Option name="rubber band rect" value="c6c6c659"/>
     <Option name="selected crossfade editor line" value="00dbdbff"/>
-    <Option name="selected crossfade editor wave fill" value="00000000"/>
     <Option name="selected crossfade editor wave" value="f9ea14a0"/>
     <Option name="selected region base" value="51518aa0"/>
     <Option name="selected waveform fill" value="51518ac8"/>
     <Option name="selected waveform outline" value="0f0f0fcc"/>
     <Option name="selection rect" value="e8f4d377"/>
     <Option name="selection" value="636363b2"/>
+    <Option name="stereo panner outline" value="0a84acff"/>
+    <Option name="stereo panner fill" value="68bad4c9"/>
+    <Option name="stereo panner text" value="1c0e7fff"/>
+    <Option name="stereo panner bg" value="4c5161ff"/>
+    <Option name="stereo panner mono outline" value="0a84acff"/>
+    <Option name="stereo panner mono fill" value="68bad4c9"/>
+    <Option name="stereo panner mono text" value="1c0e7fff"/>
+    <Option name="stereo panner mono bg" value="4c5161ff"/>
+    <Option name="stereo panner inverted outline" value="0a84acff"/>
+    <Option name="stereo panner inverted fill" value="68bad4c9"/>
+    <Option name="stereo panner inverted text" value="1c0e7fff"/>
+    <Option name="stereo panner inverted bg" value="4c5161ff"/>
     <Option name="tempo bar" value="70727fff"/>
     <Option name="tempo marker" value="f2425bff"/>
     <Option name="time axis frame" value="000000ff"/>
@@ -110,8 +125,10 @@
     <Option name="trim handle" value="1900ff44"/>
     <Option name="verbose canvas cursor" value="f4f214bc"/>
     <Option name="vestigial frame" value="0000000f"/>
-    <Option name="waveform fill" value="3d4753dc"/>
+    <Option name="region base" value="99a7b5a0"/>
     <Option name="waveform outline" value="0f0f0fc8"/>
+    <Option name="clipped waveform" value="ff0000e5"/>
+    <Option name="waveform fill" value="3d4753dc"/>
     <Option name="zero line" value="b5b5b5ff"/>
     <Option name="zoom rect" value="c6d1b26d"/>
   </Canvas>
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 7e450a70c5..c7c38f8d5a 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -102,9 +102,6 @@ namespace ARDOUR {
 	class Location;
 }
 
-extern sigc::signal<void>  ColorsChanged;
-extern sigc::signal<void>  DPIReset;
-
 class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 {
   public:
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index d316e74160..abfd83184c 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -28,6 +28,7 @@
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
 #include "automation_streamview.h"
+#include "global_signals.h"
 #include "gui_thread.h"
 #include "route_time_axis.h"
 #include "automation_line.h"
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index d012ab98f5..79f7404391 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -94,6 +94,18 @@ CANVAS_VARIABLE(canvasvar_SelectedWaveFormFill, "selected waveform fill")
 CANVAS_VARIABLE(canvasvar_SelectedWaveForm, "selected waveform outline")
 CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
 CANVAS_VARIABLE(canvasvar_Selection, "selection")
+CANVAS_VARIABLE(canvasvar_StereoPannerOutline, "stereo panner outline")
+CANVAS_VARIABLE(canvasvar_StereoPannerFill, "stereo panner fill")
+CANVAS_VARIABLE(canvasvar_StereoPannerText, "stereo panner text")
+CANVAS_VARIABLE(canvasvar_StereoPannerBackground, "stereo panner bg")
+CANVAS_VARIABLE(canvasvar_StereoPannerMonoOutline, "stereo panner mono outline")
+CANVAS_VARIABLE(canvasvar_StereoPannerMonoFill, "stereo panner mono fill")
+CANVAS_VARIABLE(canvasvar_StereoPannerMonoText, "stereo panner mono text")
+CANVAS_VARIABLE(canvasvar_StereoPannerMonoBackground, "stereo panner mono bg")
+CANVAS_VARIABLE(canvasvar_StereoPannerInvertedOutline, "stereo panner inverted outline")
+CANVAS_VARIABLE(canvasvar_StereoPannerInvertedFill, "stereo panner inverted fill")
+CANVAS_VARIABLE(canvasvar_StereoPannerInvertedText, "stereo panner inverted text")
+CANVAS_VARIABLE(canvasvar_StereoPannerInvertedBackground, "stereo panner inverted bg")
 CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
 CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
 CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "time axis frame")
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index 81f5f4173f..0c420e74ad 100644
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -25,6 +25,7 @@
 #include "canvas-simplerect.h"
 #include "canvas-curve.h"
 #include "crossfade_view.h"
+#include "global_signals.h"
 #include "gui_thread.h"
 #include "rgb_macros.h"
 #include "audio_time_axis.h"
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index adcaa63cad..f52f8852ca 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -31,6 +31,7 @@
 
 #include "ardour_ui.h"
 #include "editor.h"
+#include "global_signals.h"
 #include "waveview.h"
 #include "simplerect.h"
 #include "simpleline.h"
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 1bc9dc3f79..e7596d41d5 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -40,6 +40,7 @@
 
 #include "ardour_ui.h"
 #include "gain_meter.h"
+#include "global_signals.h"
 #include "logmeter.h"
 #include "gui_thread.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/global_signals.h b/gtk2_ardour/global_signals.h
new file mode 100644
index 0000000000..733e5ab411
--- /dev/null
+++ b/gtk2_ardour/global_signals.h
@@ -0,0 +1,9 @@
+#ifndef __gtk_ardour_global_signals_h__
+#define __gtk_ardour_global_signals_h__
+
+#include <sigc++/signal.h>
+
+extern sigc::signal<void>  ColorsChanged;
+extern sigc::signal<void>  DPIReset;
+
+#endif /* __gtk_ardour_global_signals_h__ */
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index e282b07485..217af7783d 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -31,6 +31,7 @@
 #include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "level_meter.h"
 #include "utils.h"
 #include "logmeter.h"
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index e47d83ae83..293bb6503a 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -35,6 +35,7 @@
 
 #include "ardour_ui.h"
 #include "canvas-simplerect.h"
+#include "global_signals.h"
 #include "gui_thread.h"
 #include "lineset.h"
 #include "midi_region_view.h"
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 9601c69318..d722976861 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -33,6 +33,7 @@
 #include "ardour/session.h"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "streamview.h"
 #include "region_view.h"
 #include "automation_region_view.h"
diff --git a/gtk2_ardour/rgb_macros.h b/gtk2_ardour/rgb_macros.h
index d5b5722687..8252349452 100644
--- a/gtk2_ardour/rgb_macros.h
+++ b/gtk2_ardour/rgb_macros.h
@@ -54,6 +54,10 @@
 #define UINT_RGBA_G(x) ((((guint)(x))>>16)&0xff)
 #define UINT_RGBA_B(x) ((((guint)(x))>>8)&0xff)
 #define UINT_RGBA_A(x) (((guint)(x))&0xff)
+#define UINT_RGBA_R_FLT(x) ((((guint)(x))>>24)/255.0)
+#define UINT_RGBA_G_FLT(x) (((((guint)(x))>>16)&0xff)/255.0)
+#define UINT_RGBA_B_FLT(x) (((((guint)(x))>>8)&0xff)/255.0)
+#define UINT_RGBA_A_FLT(x) ((((guint)(x))&0xff)/255.0)
 #define UINT_RGBA_CHANGE_R(x, r) (((x)&(~(0xff<<24)))|(((r)&0xff)<<24))
 #define UINT_RGBA_CHANGE_G(x, g) (((x)&(~(0xff<<16)))|(((g)&0xff)<<16))
 #define UINT_RGBA_CHANGE_B(x, b) (((x)&(~(0xff<<8)))|(((b)&0xff)<<8))
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index e36d15bd18..31966681df 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -61,6 +61,7 @@
 #include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "route_time_axis.h"
 #include "automation_time_axis.h"
 #include "canvas_impl.h"
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index c08e16df66..8fc59ad194 100644
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -30,7 +30,11 @@
 #include "gtkmm2ext/keyboard.h"
 
 #include "ardour/panner.h"
+
+#include "ardour_ui.h"
+#include "global_signals.h"
 #include "stereo_panner.h"
+#include "rgb_macros.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -44,6 +48,10 @@ static const int lr_box_size = 15;
 static const int step_down = 10;
 static const int top_step = 2;
 
+StereoPanner::ColorScheme StereoPanner::colors[3];
+bool StereoPanner::have_colors = false;
+PBD::Signal0<void> StereoPanner::color_change;
+
 StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost::shared_ptr<PBD::Controllable> width)
         : position_control (position)
         , width_control (width)
@@ -52,6 +60,11 @@ StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost
         , drag_start_x (0)
         , last_drag_x (0)
 {
+        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());
         set_tooltip ();
@@ -63,6 +76,8 @@ StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost
                     Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|
                     Gdk::SCROLL_MASK|
                     Gdk::POINTER_MOTION_MASK);
+
+        color_change.connect (connections, invalidator (*this), boost::bind (&DrawingArea::queue_draw, this), gui_context());
 }
 
 StereoPanner::~StereoPanner ()
@@ -101,13 +116,29 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         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;
+        State state;
 
         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;
+
         /* background */
 
-        cairo_set_source_rgb (cr, 0.184, 0.172, 0.172);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
+        // 0.184, 0.172, 0.172);
         cairo_rectangle (cr, 0, 0, width, height);
         cairo_fill (cr);
 
@@ -123,7 +154,8 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         /* compute & draw the line through the box */
         
         cairo_set_line_width (cr, 2);
-	cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	// cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
         cairo_move_to (cr, left, top_step+(pos_box_size/2)+step_down);
         cairo_line_to (cr, left, top_step+(pos_box_size/2));
         cairo_line_to (cr, right, top_step+(pos_box_size/2));
@@ -144,9 +176,11 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
                          left,
                          (lr_box_size/2)+step_down, 
                          lr_box_size, lr_box_size);
-	cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	// cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
         cairo_stroke_preserve (cr);
-	cairo_set_source_rgba (cr, 0.4509, 0.7686, 0.8627, 0.8);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	// cairo_set_source_rgba (cr, 0.4509, 0.7686, 0.8627, 0.8);
 	cairo_fill (cr);
         
         /* add text */
@@ -154,9 +188,12 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         cairo_move_to (cr, 
                        left + 3,
                        (lr_box_size/2) + step_down + 13);
-	cairo_set_source_rgba (cr, 0.129, 0.054, 0.588, 1.0);
+	// cairo_set_source_rgba (cr, 0.129, 0.054, 0.588, 1.0);
         cairo_select_font_face (cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
-        cairo_show_text (cr, "L");
+        if (state != Mono) {
+                cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
+                cairo_show_text (cr, "L");
+        }
 
         /* right box */
 
@@ -164,9 +201,11 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
                          right,
                          (lr_box_size/2)+step_down, 
                          lr_box_size, lr_box_size);
-	cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	//cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
         cairo_stroke_preserve (cr);
-	cairo_set_source_rgba (cr, 0.4509, 0.7686, 0.8627, 0.8);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	// cairo_set_source_rgba (cr, 0.4509, 0.7686, 0.8627, 0.8);
 	cairo_fill (cr);
 
         /* add text */
@@ -174,16 +213,23 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         cairo_move_to (cr, 
                        right + 3,
                        (lr_box_size/2)+step_down + 13);
-	cairo_set_source_rgba (cr, 0.129, 0.054, 0.588, 1.0);
-        cairo_show_text (cr, "R");
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
+	// cairo_set_source_rgba (cr, 0.129, 0.054, 0.588, 1.0);
+        if (state == Mono) {
+                cairo_show_text (cr, "M");
+        } else {
+                cairo_show_text (cr, "R");
+        }
 
         /* draw the central box */
 
         cairo_set_line_width (cr, 1);
 	cairo_rectangle (cr, center - (pos_box_size/2), top_step, pos_box_size, pos_box_size);
-	cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	// cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0);
         cairo_stroke_preserve (cr);
-	cairo_set_source_rgba (cr, 0.4509, 0.7686, 0.8627, 0.8);
+        cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	// cairo_set_source_rgba (cr, 0.4509, 0.7686, 0.8627, 0.8);
 	cairo_fill (cr);
 
         /* done */
@@ -375,8 +421,12 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 
         switch (ev->keyval) {
         case GDK_Up:
-                wv += step;
-                width_control->set_value (wv);
+                if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+                        width_control->set_value (1.0);
+                } else {
+                        wv += step;
+                        width_control->set_value (wv);
+                }
                 break;
         case GDK_Left:
                 pv -= step;
@@ -387,11 +437,22 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
                 position_control->set_value (pv);
                 break;
         case GDK_Down:
-                wv -= step;
-                width_control->set_value (wv);
+                if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+                        width_control->set_value (-1.0);
+                } else {
+                        wv -= step;
+                        width_control->set_value (wv);
+                }
+
+                break;
+        case GDK_0:
+        case GDK_KP_0:
+                width_control->set_value (0.0);
                 break;
+
         default:
-                return forward_key_press (ev);
+                // return forward_key_press (ev);
+                break;
         }
                 
         return true;
@@ -417,3 +478,24 @@ StereoPanner::on_leave_notify_event (GdkEventCrossing*)
 	Keyboard::magic_widget_drop_focus ();
 	return false;
 }
+
+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[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[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();
+
+        color_change (); /* EMIT SIGNAL */
+}
diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index f469e35eea..991ccc88fc 100644
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -57,6 +57,24 @@ class StereoPanner : public Gtk::DrawingArea
 
         void value_change ();
         void set_tooltip ();
+        
+        struct ColorScheme { 
+            uint32_t outline;
+            uint32_t fill;
+            uint32_t text;
+            uint32_t background;
+        };
+
+        enum State { 
+                Normal,
+                Mono,
+                Inverted
+        };
+
+        static ColorScheme colors[3];
+        static void set_colors ();
+        static bool have_colors;
+        static PBD::Signal0<void> color_change;
 };
 
 #endif /* __gtk_ardour_stereo_panner_h__ */
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 9f56f8c692..3a6fcaac9c 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -30,6 +30,7 @@
 #include "ardour/session.h"
 
 #include "streamview.h"
+#include "global_signals.h"
 #include "region_view.h"
 #include "route_time_axis.h"
 #include "canvas-waveview.h"
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 923e61fa4c..8c2f92768b 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -35,6 +35,7 @@
 #include "theme_manager.h"
 #include "rgb_macros.h"
 #include "ardour_ui.h"
+#include "global_signals.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index b93831f69f..29cb3e613b 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -40,6 +40,7 @@
 #include "ardour/location.h"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "gui_thread.h"
 #include "public_editor.h"
 #include "time_axis_view.h"