switch from JACK_Slave to Engine_Slave
[ardour.git] / gtk2_ardour / audio_clock.cc
index 166a76efcea142b7f5d85d7f2493fc0a5804597d..6680e95b1514cfce5113e0c1ac705064137b2066 100644 (file)
 #include "pbd/enumwriter.h"
 
 #include <gtkmm/style.h>
+#include <sigc++/bind.h>
 
 #include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/rgb_macros.h"
 
-#include "ardour/ardour.h"
+#include "ardour/profile.h"
 #include "ardour/session.h"
+#include "ardour/slave.h"
 #include "ardour/tempo.h"
-#include "ardour/profile.h"
-#include <sigc++/bind.h>
+#include "ardour/types.h"
 
 #include "ardour_ui.h"
 #include "audio_clock.h"
@@ -52,22 +53,40 @@ using Gtkmm2ext::Keyboard;
 
 sigc::signal<void> AudioClock::ModeChanged;
 vector<AudioClock*> AudioClock::clocks;
-const double AudioClock::info_font_scale_factor = 0.6;
-const double AudioClock::separator_height = 2.0;
+const double AudioClock::info_font_scale_factor = 0.50;
+const double AudioClock::separator_height = 0.0;
 const double AudioClock::x_leading_padding = 6.0;
 
+#define BBT_BAR_CHAR "|"
+#define BBT_SCANF_FORMAT "%" PRIu32 "%*c%" PRIu32 "%*c%" PRIu32
+#define INFO_FONT_SIZE ((int)lrint(font_size * info_font_scale_factor))
+#define TXTSPAN "<span font-family=\"Sans\" foreground=\"white\">"
+
 AudioClock::AudioClock (const string& clock_name, bool transient, const string& widget_name,
                        bool allow_edit, bool follows_playhead, bool duration, bool with_info)
-       : _name (clock_name)
+       : ops_menu (0)
+       , _name (clock_name)
        , is_transient (transient)
        , is_duration (duration)
        , editable (allow_edit)
        , _follows_playhead (follows_playhead)
        , _off (false)
-       , ops_menu (0)
+       , em_width (0)
+       , _edit_by_click_field (false)
+       , _negative_allowed (false)
+       , edit_is_negative (false)
        , editing_attr (0)
        , foreground_attr (0)
+       , first_height (0)
+       , first_width (0)
+       , style_resets_first (true)
+       , layout_height (0)
+       , layout_width (0)
+       , info_height (0)
+       , upper_height (0)
        , mode_based_info_ratio (1.0)
+       , corner_radius (4)
+       , font_size (10240)
        , editing (false)
        , bbt_reference_time (-1)
        , last_when(0)
@@ -75,7 +94,6 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
        , last_sdelta (0)
        , dragging (false)
        , drag_field (Field (0))
-
 {
        set_flags (CAN_FOCUS);
 
@@ -98,6 +116,7 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
        }
 
        ColorsChanged.connect (sigc::mem_fun (*this, &AudioClock::set_colors));
+       DPIReset.connect (sigc::mem_fun (*this, &AudioClock::dpi_reset));
 }
 
 AudioClock::~AudioClock ()
@@ -114,13 +133,25 @@ AudioClock::set_widget_name (const string& str)
        } else {
                set_name (str + " clock");
        }
+
+       if (is_realized()) {
+               set_colors ();
+       }
 }
 
 
 void
 AudioClock::on_realize ()
 {
+       Gtk::Requisition req;
+
        CairoWidget::on_realize ();
+       
+       set_clock_dimensions (req);
+
+       first_width = req.width;
+       first_height = req.height;
+
        set_font ();
        set_colors ();
 }
@@ -129,7 +160,7 @@ void
 AudioClock::set_font ()
 {
        Glib::RefPtr<Gtk::Style> style = get_style ();
-       Pango::FontDescription font; 
+       Pango::FontDescription font;
        Pango::AttrFontDesc* font_attr;
 
        if (!is_realized()) {
@@ -138,6 +169,8 @@ AudioClock::set_font ()
                font = style->get_font();
        }
 
+       font_size = font.get_size();
+
        font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 
        normal_attributes.change (*font_attr);
@@ -146,13 +179,29 @@ AudioClock::set_font ()
        /* now a smaller version of the same font */
 
        delete font_attr;
-       font.set_size ((int) lrint (font.get_size() * info_font_scale_factor));
+       font.set_size (INFO_FONT_SIZE);
        font.set_weight (Pango::WEIGHT_NORMAL);
        font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
+
        info_attributes.change (*font_attr);
-       
+
+       /* and an even smaller one */
+
        delete font_attr;
+
+       /* get the figure width for the font. This doesn't have to super
+        * accurate since we only use it to measure the (roughly 1 character)
+        * offset from the position Pango tells us for the "cursor"
+        */
+
+       Glib::RefPtr<Pango::Layout> tmp = Pango::Layout::create (get_pango_context());
+       int ignore_height;
+
+       tmp->set_text ("8");
+       tmp->get_pixel_size (em_width, ignore_height);
+
+       /* force redraw of markup with new font-size */
+       set (last_when, true);
 }
 
 void
@@ -170,40 +219,54 @@ AudioClock::set_colors ()
        uint32_t bg_color;
        uint32_t text_color;
        uint32_t editing_color;
+       uint32_t cursor_color;
 
        if (active_state()) {
                bg_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 active: background", get_name()));
                text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 active: text", get_name()));
                editing_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 active: edited text", get_name()));
+               cursor_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 active: cursor", get_name()));
        } else {
                bg_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: background", get_name()));
                text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text", get_name()));
                editing_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: edited text", get_name()));
+               cursor_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: cursor", get_name()));
        }
 
-       /* store for bg in ::render() */
+       /* store for bg and cursor in render() */
 
        UINT_TO_RGBA (bg_color, &r, &g, &b, &a);
-       r = lrint ((r/256.0) * 65535.0);
-       g = lrint ((g/256.0) * 65535.0);
-       b = lrint ((b/256.0) * 65535.0);
-       bg_r = r/256.0;
-       bg_g = g/256.0;
-       bg_b = b/256.0;
-       bg_a = a/256.0;
+
+       bg_r = r/255.0;
+       bg_g = g/255.0;
+       bg_b = b/255.0;
+       bg_a = a/255.0;
+
+       UINT_TO_RGBA (cursor_color, &r, &g, &b, &a);
+
+       cursor_r = r/255.0;
+       cursor_g = g/255.0;
+       cursor_b = b/255.0;
+       cursor_a = a/255.0;
+
+       /* rescale for Pango colors ... sigh */
+
+       r = lrint (r * 65535.0);
+       g = lrint (g * 65535.0);
+       b = lrint (b * 65535.0);
 
        UINT_TO_RGBA (text_color, &r, &g, &b, &a);
-       r = lrint ((r/256.0) * 65535.0);
-       g = lrint ((g/256.0) * 65535.0);
-       b = lrint ((b/256.0) * 65535.0);
+       r = lrint ((r/255.0) * 65535.0);
+       g = lrint ((g/255.0) * 65535.0);
+       b = lrint ((b/255.0) * 65535.0);
        foreground_attr = new Pango::AttrColor (Pango::Attribute::create_attr_foreground (r, g, b));
 
        UINT_TO_RGBA (editing_color, &r, &g, &b, &a);
-       r = lrint ((r/256.0) * 65535.0);
-       g = lrint ((g/256.0) * 65535.0);
-       b = lrint ((b/256.0) * 65535.0);
+       r = lrint ((r/255.0) * 65535.0);
+       g = lrint ((g/255.0) * 65535.0);
+       b = lrint ((b/255.0) * 65535.0);
        editing_attr = new Pango::AttrColor (Pango::Attribute::create_attr_foreground (r, g, b));
-       
+
        normal_attributes.change (*foreground_attr);
        info_attributes.change (*foreground_attr);
        editing_attributes.change (*foreground_attr);
@@ -215,11 +278,6 @@ AudioClock::set_colors ()
                _layout->set_attributes (editing_attributes);
        }
 
-       if (_left_layout) {
-               _left_layout->set_attributes (info_attributes);
-               _right_layout->set_attributes (info_attributes);
-       }
-
        queue_draw ();
 }
 
@@ -227,14 +285,23 @@ void
 AudioClock::render (cairo_t* cr)
 {
        /* main layout: rounded rect, plus the text */
-       
+
        if (_need_bg) {
                cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
-               Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, 9);
+               if (corner_radius) {
+                       if (_left_layout) {
+                               Gtkmm2ext::rounded_top_half_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
+                       } else {
+                               Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
+                       }
+               } else {
+                       cairo_rectangle (cr, 0, 0, get_width(), upper_height);
+               }
                cairo_fill (cr);
        }
 
-       cairo_move_to (cr, x_leading_padding, (upper_height - layout_height) / 2.0);
+       cairo_move_to (cr, (get_width() - layout_width) / 2.0, (upper_height - layout_height) / 2.0);
+
        pango_cairo_show_layout (cr, _layout->gobj());
 
        if (_left_layout) {
@@ -250,27 +317,103 @@ AudioClock::render (cairo_t* cr)
                        double left_rect_width = round (((get_width() - separator_height) * mode_based_info_ratio) + 0.5);
 
                        if (_need_bg) {
-                               Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h, 9);
+                               if (corner_radius) {
+                                       Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height,
+                                                       left_rect_width + (separator_height == 0 ? corner_radius : 0),
+                                                       h, corner_radius);
+                               } else {
+                                       cairo_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h);
+                               }
                                cairo_fill (cr);
                        }
 
                        cairo_move_to (cr, x_leading_padding, upper_height + separator_height + ((h - info_height)/2.0));
                        pango_cairo_show_layout (cr, _left_layout->gobj());
-                       
+
                        if (_need_bg) {
-                               Gtkmm2ext::rounded_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, 
-                                                             get_width() - separator_height - left_rect_width, h, 9);
-                               cairo_fill (cr);        
+                               if (corner_radius) {
+                                       Gtkmm2ext::rounded_bottom_half_rectangle (cr, left_rect_width + separator_height,
+                                                       upper_height + separator_height,
+                                                       get_width() - separator_height - left_rect_width,
+                                                       h, corner_radius);
+                               } else {
+                                       cairo_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height,
+                                                        get_width() - separator_height - left_rect_width, h);
+                               }
+                               cairo_fill (cr);
                        }
 
-                       cairo_move_to (cr, x_leading_padding + left_rect_width + separator_height, upper_height + separator_height + ((h - info_height)/2.0));
+
+                       if (_right_layout->get_alignment() == Pango::ALIGN_RIGHT) {
+                               /* right-align does not work per se beacuse layout width is unset.
+                                * Using _right_layout->set_width([value >=0]) would also enable
+                                * word-wrapping which is not wanted here.
+                                * The solution is to custom align the layout depending on its size.
+                                * if it is larger than the available space it will be cropped on the
+                                * right edge rather than override text on the left side.
+                                */
+                               int x, rw, rh;
+                               _right_layout->get_pixel_size(rw, rh);
+                               x = get_width() - rw - separator_height - x_leading_padding;
+                               if (x < x_leading_padding + left_rect_width + separator_height) {
+                                       /* rather cut off the right end than overlap with the text on the left */
+                                       x = x_leading_padding + left_rect_width + separator_height;
+                               }
+                               cairo_move_to (cr, x, upper_height + separator_height + ((h - info_height)/2.0));
+                       } else {
+                               cairo_move_to (cr, x_leading_padding + left_rect_width + separator_height, upper_height + separator_height + ((h - info_height)/2.0));
+                       }
                        pango_cairo_show_layout (cr, _right_layout->gobj());
 
                } else {
                        /* no info to display, or just one */
 
                        if (_need_bg) {
-                               Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, get_width(), h, 9);
+                               if (corner_radius) {
+                                       Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius);
+                               } else {
+                                       cairo_rectangle (cr, 0, upper_height + separator_height, get_width(), h);
+                               }
+                               cairo_fill (cr);
+                       }
+               }
+       }
+
+       if (editing) {
+               if (!insert_map.empty()) {
+
+                       int xcenter = (get_width() - layout_width) /2;
+
+                       if (input_string.length() < insert_map.size()) {
+                               Pango::Rectangle cursor;
+
+                               if (input_string.empty()) {
+                                       /* nothing entered yet, put cursor at the end
+                                          of string
+                                       */
+                                       cursor = _layout->get_cursor_strong_pos (edit_string.length() - 1);
+                               } else {
+                                       cursor = _layout->get_cursor_strong_pos (insert_map[input_string.length()]);
+                               }
+
+                               cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
+                               cairo_rectangle (cr,
+                                                min (get_width() - 2.0,
+                                                     (double) xcenter + cursor.get_x()/PANGO_SCALE + em_width),
+                                                (upper_height - layout_height)/2.0,
+                                                2.0, cursor.get_height()/PANGO_SCALE);
+                               cairo_fill (cr);
+                       } else {
+                               /* we've entered all possible digits, no cursor */
+                       }
+
+               } else {
+                       if (input_string.empty()) {
+                               cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
+                               cairo_rectangle (cr,
+                                                (get_width()/2.0),
+                                                (upper_height - layout_height)/2.0,
+                                                2.0, upper_height);
                                cairo_fill (cr);
                        }
                }
@@ -281,7 +424,7 @@ void
 AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 {
        CairoWidget::on_size_allocate (alloc);
-       
+
        if (_left_layout) {
                upper_height = (get_height()/2.0) - 1.0;
        } else {
@@ -290,11 +433,11 @@ AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 }
 
 void
-AudioClock::on_size_request (Gtk::Requisition* req)
+AudioClock::set_clock_dimensions (Gtk::Requisition& req)
 {
        Glib::RefPtr<Pango::Layout> tmp;
        Glib::RefPtr<Gtk::Style> style = get_style ();
-       Pango::FontDescription font; 
+       Pango::FontDescription font;
 
        tmp = Pango::Layout::create (get_pango_context());
 
@@ -306,18 +449,29 @@ AudioClock::on_size_request (Gtk::Requisition* req)
 
        tmp->set_font_description (font);
 
-       /* this string is the longest thing we will ever display,
-          and also includes the BBT "|" that may descends below
-          the baseline a bit, and a comma for the minsecs mode
-          where we printf a fractional value (XXX or should)
-       */
+       /* this string is the longest thing we will ever display */
+       tmp->set_text (" 88:88:88,888");
+       tmp->get_pixel_size (req.width, req.height);
 
-       tmp->set_text (" 88|88:88:88,88"); 
+       layout_height = req.height;
+       layout_width = req.width;
+}
 
-       tmp->get_pixel_size (req->width, req->height);
+void
+AudioClock::on_size_request (Gtk::Requisition* req)
+{
+       /* even for non fixed width clocks, the size we *ask* for never changes,
+          even though the size we receive might. so once we've computed it,
+          just return it.
+       */
 
-       layout_height = req->height;
-       layout_width = req->width;
+       if (first_width) {
+               req->width = first_width;
+               req->height = first_height;
+               return;
+       }
+
+       set_clock_dimensions (*req);
 
        /* now tackle height, for which we need to know the height of the lower
         * layout
@@ -325,9 +479,22 @@ AudioClock::on_size_request (Gtk::Requisition* req)
 
        if (_left_layout) {
 
+               Glib::RefPtr<Pango::Layout> tmp;
+               Glib::RefPtr<Gtk::Style> style = get_style ();
+               Pango::FontDescription font;
                int w;
+               
+               tmp = Pango::Layout::create (get_pango_context());
+               
+               if (!is_realized()) {
+                       font = get_font_for_style (get_name());
+               } else {
+                       font = style->get_font();
+               }
+               
+               tmp->set_font_description (font);
 
-               font.set_size ((int) lrint (font.get_size() * info_font_scale_factor));
+               font.set_size (INFO_FONT_SIZE);
                font.set_weight (Pango::WEIGHT_NORMAL);
                tmp->set_font_description (font);
 
@@ -335,15 +502,13 @@ AudioClock::on_size_request (Gtk::Requisition* req)
                   as possible that might change the height.
                */
                tmp->set_text ("qyhH|"); /* one ascender, one descender */
-               
+
                tmp->get_pixel_size (w, info_height);
-               
+
                /* silly extra padding that seems necessary to correct the info
                 * that pango just gave us. I have no idea why.
                 */
 
-               info_height += 4;
-
                req->height += info_height;
                req->height += separator_height;
        }
@@ -354,7 +519,7 @@ AudioClock::show_edit_status (int length)
 {
        editing_attr->set_start_index (edit_string.length() - length);
        editing_attr->set_end_index (edit_string.length());
-       
+
        editing_attributes.change (*foreground_attr);
        editing_attributes.change (*editing_attr);
 
@@ -362,17 +527,76 @@ AudioClock::show_edit_status (int length)
 }
 
 void
-AudioClock::start_edit ()
+AudioClock::start_edit (Field f)
 {
-       edit_string = _layout->get_text ();
-       pre_edit_string = edit_string;
-       input_string.clear ();
-       editing = true;
+       if (!editing) {
+               pre_edit_string = _layout->get_text ();
+               if (!insert_map.empty()) {
+                       edit_string = pre_edit_string;
+               } else {
+                       edit_string.clear ();
+                       _layout->set_text ("");
+               }
+               
+               input_string.clear ();
+               editing = true;
+               edit_is_negative = false;
+               
+               if (f) {
+                       input_string = get_field (f);
+                       show_edit_status (merge_input_and_edit_string ());
+                       _layout->set_text (edit_string);
+               }
+               
+               queue_draw ();
 
-       queue_draw ();
+               Keyboard::magic_widget_grab_focus ();
+               grab_focus ();
+       }
+}
 
-       Keyboard::magic_widget_grab_focus ();
-       grab_focus ();
+string
+AudioClock::get_field (Field f)
+{
+       switch (f) {
+       case Timecode_Hours:
+               return edit_string.substr (1, 2);
+               break;
+       case Timecode_Minutes:
+               return edit_string.substr (4, 2);
+               break;
+       case Timecode_Seconds:
+               return edit_string.substr (7, 2);
+               break;
+       case Timecode_Frames:
+               return edit_string.substr (10, 2);
+               break;
+       case MS_Hours:
+               return edit_string.substr (1, 2);
+               break;
+       case MS_Minutes:
+               return edit_string.substr (4, 2);
+               break;
+       case MS_Seconds:
+               return edit_string.substr (7, 2);
+               break;
+       case MS_Milliseconds:
+               return edit_string.substr (10, 3);
+               break;
+       case Bars:
+               return edit_string.substr (1, 3);
+               break;
+       case Beats:
+               return edit_string.substr (5, 2);
+               break;
+       case Ticks:
+               return edit_string.substr (8, 4);
+               break;
+       case AudioFrames:
+               return edit_string;
+               break;
+       }
+       return "";
 }
 
 void
@@ -381,39 +605,40 @@ AudioClock::end_edit (bool modify)
        if (modify) {
 
                bool ok = true;
-               
+
                switch (_mode) {
                case Timecode:
                        ok = timecode_validate_edit (edit_string);
                        break;
-                       
+
                case BBT:
                        ok = bbt_validate_edit (edit_string);
                        break;
-                       
+
                case MinSec:
+                       ok = minsec_validate_edit (edit_string);
                        break;
-                       
+
                case Frames:
                        break;
                }
-               
+
                if (!ok) {
                        edit_string = pre_edit_string;
                        input_string.clear ();
                        _layout->set_text (edit_string);
-                       show_edit_status (1);
+                       show_edit_status (0);
                        /* edit attributes remain in use */
                } else {
 
                        editing = false;
-                       framepos_t pos;
+                       framepos_t pos = 0; /* stupid gcc */
 
                        switch (_mode) {
                        case Timecode:
                                pos = frames_from_timecode_string (edit_string);
                                break;
-                               
+
                        case BBT:
                                if (is_duration) {
                                        pos = frame_duration_from_bbt_string (0, edit_string);
@@ -421,11 +646,11 @@ AudioClock::end_edit (bool modify)
                                        pos = frames_from_bbt_string (0, edit_string);
                                }
                                break;
-                               
+
                        case MinSec:
                                pos = frames_from_minsec_string (edit_string);
                                break;
-                               
+
                        case Frames:
                                pos = frames_from_audioframes_string (edit_string);
                                break;
@@ -439,6 +664,7 @@ AudioClock::end_edit (bool modify)
        } else {
 
                editing = false;
+               edit_is_negative = false;
                _layout->set_attributes (normal_attributes);
                _layout->set_text (pre_edit_string);
        }
@@ -453,17 +679,22 @@ AudioClock::end_edit (bool modify)
 void
 AudioClock::drop_focus ()
 {
-       /* move focus back to the default widget in the top level window */
-       
        Keyboard::magic_widget_drop_focus ();
-       Widget* top = get_toplevel();
-       if (top->is_toplevel ()) {
-               Window* win = dynamic_cast<Window*> (top);
-               win->grab_focus ();
+
+       if (has_focus()) {
+
+               /* move focus back to the default widget in the top level window */
+
+               Widget* top = get_toplevel();
+
+               if (top->is_toplevel ()) {
+                       Window* win = dynamic_cast<Window*> (top);
+                       win->grab_focus ();
+               }
        }
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_frames_distance (const std::string& str)
 {
        framecnt_t f;
@@ -475,7 +706,7 @@ AudioClock::parse_as_frames_distance (const std::string& str)
        return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_minsec_distance (const std::string& str)
 {
        framecnt_t sr = _session->frame_rate();
@@ -493,7 +724,7 @@ AudioClock::parse_as_minsec_distance (const std::string& str)
        case 4:
                sscanf (str.c_str(), "%" PRId32, &msecs);
                return msecs * (sr / 1000);
-               
+
        case 5:
                sscanf (str.c_str(), "%1" PRId32 "%" PRId32, &secs, &msecs);
                return (secs * sr) + (msecs * (sr/1000));
@@ -517,7 +748,7 @@ AudioClock::parse_as_minsec_distance (const std::string& str)
        case 10:
                sscanf (str.c_str(), "%1" PRId32 "%2" PRId32 "%2" PRId32 "%" PRId32, &hrs, &mins, &secs, &msecs);
                return (hrs * 3600 * sr) + (mins * 60 * sr) + (secs * sr) + (msecs * (sr/1000));
-       
+
        default:
                break;
        }
@@ -525,7 +756,7 @@ AudioClock::parse_as_minsec_distance (const std::string& str)
        return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_timecode_distance (const std::string& str)
 {
        double fps = _session->timecode_frames_per_second();
@@ -534,7 +765,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
        int secs;
        int mins;
        int hrs;
-       
+
        switch (str.length()) {
        case 0:
                return 0;
@@ -550,7 +781,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
        case 4:
                sscanf (str.c_str(), "%2" PRId32 "%" PRId32, &secs, &frames);
                return (secs * sr) + lrint ((frames/(float)fps) * sr);
-               
+
        case 5:
                sscanf (str.c_str(), "%1" PRId32 "%2" PRId32 "%" PRId32, &mins, &secs, &frames);
                return (mins * 60 * sr) + (secs * sr) + lrint ((frames/(float)fps) * sr);
@@ -566,7 +797,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
        case 8:
                sscanf (str.c_str(), "%2" PRId32 "%2" PRId32 "%2" PRId32 "%" PRId32, &hrs, &mins, &secs, &frames);
                return (hrs * 3600 * sr) + (mins * 60 * sr) + (secs * sr) + lrint ((frames/(float)fps) * sr);
-       
+
        default:
                break;
        }
@@ -574,33 +805,27 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
        return 0;
 }
 
-framecnt_t 
-AudioClock::parse_as_bbt_distance (const std::string& str)
+framecnt_t
+AudioClock::parse_as_bbt_distance (const std::string&)
 {
        return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_distance (const std::string& instr)
 {
-       string str = instr;
-
-       /* the input string is in reverse order */
-
-       std::reverse (str.begin(), str.end());
-
        switch (_mode) {
        case Timecode:
-               return parse_as_timecode_distance (str);
+               return parse_as_timecode_distance (instr);
                break;
        case Frames:
-               return parse_as_frames_distance (str);
+               return parse_as_frames_distance (instr);
                break;
        case BBT:
-               return parse_as_bbt_distance (str);
+               return parse_as_bbt_distance (instr);
                break;
        case MinSec:
-               return parse_as_minsec_distance (str);
+               return parse_as_minsec_distance (instr);
                break;
        }
        return 0;
@@ -609,6 +834,35 @@ AudioClock::parse_as_distance (const std::string& instr)
 void
 AudioClock::end_edit_relative (bool add)
 {
+       bool ok = true;
+
+       switch (_mode) {
+       case Timecode:
+               ok = timecode_validate_edit (edit_string);
+               break;
+
+       case BBT:
+               ok = bbt_validate_edit (edit_string);
+               break;
+
+       case MinSec:
+               ok = minsec_validate_edit (edit_string);
+               break;
+
+       case Frames:
+               break;
+       }
+
+       if (!ok) {
+               edit_string = pre_edit_string;
+               input_string.clear ();
+               _layout->set_text (edit_string);
+               show_edit_status (0);
+               /* edit attributes remain in use */
+               queue_draw ();
+               return;
+       }
+
        framecnt_t frames = parse_as_distance (input_string);
 
        editing = false;
@@ -622,7 +876,7 @@ AudioClock::end_edit_relative (bool add)
                } else {
                        framepos_t c = current_time();
 
-                       if (c > frames) {
+                       if (c > frames || _negative_allowed) {
                                set (c - frames, true);
                        } else {
                                set (0, true);
@@ -636,9 +890,25 @@ AudioClock::end_edit_relative (bool add)
        drop_focus ();
 }
 
+void
+AudioClock::session_property_changed (const PropertyChange&)
+{
+       set (last_when, true);
+}
+
 void
 AudioClock::session_configuration_changed (std::string p)
 {
+       if (_negative_allowed) {
+               /* session option editor clock */
+               return;
+       }
+
+       if (p == "sync-source" || p == "external-sync") {
+               set (current_time(), true);
+               return;
+       }
+
        if (p != "timecode-offset" && p != "timecode-offset-negative") {
                return;
        }
@@ -660,110 +930,173 @@ AudioClock::session_configuration_changed (std::string p)
 }
 
 void
-AudioClock::set (framepos_t when, bool force, framecnt_t offset, char which)
+AudioClock::set (framepos_t when, bool force, framecnt_t offset)
 {
        if ((!force && !is_visible()) || _session == 0) {
                return;
        }
 
-       bool const pdelta = Config->get_primary_clock_delta_edit_cursor ();
-       bool const sdelta = Config->get_secondary_clock_delta_edit_cursor ();
-
-       if (offset && which == 'p' && pdelta) {
-               when = (when > offset) ? when - offset : offset - when;
-       } else if (offset && which == 's' && sdelta) {
-               when = (when > offset) ? when - offset : offset - when;
+       if (is_duration) {
+               when = when - offset;
        }
 
        if (when == last_when && !force) {
-               return;
-       }
-
-       if (which == 'p' && pdelta && !last_pdelta) {
-               set_name("TransportClockDisplayDelta");
-               last_pdelta = true;
-       } else if (which == 'p' && !pdelta && last_pdelta) {
-               set_name("TransportClockDisplay");
-               last_pdelta = false;
-       } else if (which == 's' && sdelta && !last_sdelta) {
-               set_name("SecondaryClockDisplayDelta");
-               last_sdelta = true;
-       } else if (which == 's' && !sdelta && last_sdelta) {
-               set_name("SecondaryClockDisplay");
-               last_sdelta = false;
+               if (_mode != Timecode && _mode != MinSec) {
+                       /* may need to force display of TC source
+                        * time, so don't return early.
+                        */
+                       return;
+               }
        }
 
        if (!editing) {
+               if (_right_layout) {
+                       _right_layout->set_alignment(Pango::ALIGN_LEFT);
+               }
 
                switch (_mode) {
                case Timecode:
+                       if (_right_layout) {
+                               _right_layout->set_alignment(Pango::ALIGN_RIGHT);
+                       }
                        set_timecode (when, force);
                        break;
-                       
+
                case BBT:
                        set_bbt (when, force);
                        break;
-                       
+
                case MinSec:
+                       if (_right_layout) {
+                               _right_layout->set_alignment(Pango::ALIGN_RIGHT);
+                       }
                        set_minsec (when, force);
                        break;
-                       
+
                case Frames:
                        set_frames (when, force);
                        break;
                }
        }
 
-       if (when != last_when || force) {
-               queue_draw ();
+       queue_draw ();
+       last_when = when;
+}
+
+void
+AudioClock::set_slave_info ()
+{
+       if (!_left_layout || !_right_layout) {
+               return;
        }
 
-       last_when = when;
+       SyncSource sync_src = Config->get_sync_source();
+
+       if (_session->config.get_external_sync()) {
+               Slave* slave = _session->slave();
+
+               switch (sync_src) {
+               case Engine:
+                       _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
+                                               INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+                       _right_layout->set_text ("");
+                       break;
+               case MIDIClock:
+                       if (slave) {
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
+                                                       INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+                               _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
+                                                       INFO_FONT_SIZE, slave->approximate_current_delta()));
+                       } else {
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
+                                                       INFO_FONT_SIZE, _("--pending--")));
+                               _right_layout->set_text ("");
+                       }
+                       break;
+               case LTC:
+               case MTC:
+                       if (slave) {
+                               bool matching;
+                               TimecodeSlave* tcslave;
+                               if ((tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
+                                       matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
+                                       _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span><span foreground=\"%3\">%4</span></span>",
+                                                                                 INFO_FONT_SIZE, sync_source_to_string(sync_src, true)[0], (matching?"green":"red"),
+                                                                                 dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position()));
+                                       _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
+                                                                                  INFO_FONT_SIZE, slave->approximate_current_delta()));
+                               }
+                       } else {
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>",
+                                                       INFO_FONT_SIZE, _("--pending--")));
+                               _right_layout->set_text ("");
+                       }
+                       break;
+               }
+       } else {
+               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "INT/%2</span></span>",
+                                       INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+               _right_layout->set_text ("");
+       }
 }
 
 void
 AudioClock::set_frames (framepos_t when, bool /*force*/)
 {
        char buf[32];
+       bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012");
+               _layout->set_text (" ----------");
 
                if (_left_layout) {
                        _left_layout->set_text ("");
                        _right_layout->set_text ("");
                }
-               
+
                return;
        }
-       
-       snprintf (buf, sizeof (buf), "%10" PRId64, when);
+
+       if (when < 0) {
+               when = -when;
+               negative = true;
+       }
+
+       if (negative) {
+               snprintf (buf, sizeof (buf), "-%10" PRId64, when);
+       } else {
+               snprintf (buf, sizeof (buf), " %10" PRId64, when);
+       }
+
        _layout->set_text (buf);
 
        if (_left_layout) {
                framecnt_t rate = _session->frame_rate();
 
-               if (fmod (rate, 1000.0) == 0.000) {
-                       sprintf (buf, "%" PRId64 "K", rate/1000);
+               if (fmod (rate, 100.0) == 0.0) {
+                       sprintf (buf, "%.1fkHz", rate/1000.0);
                } else {
-                       sprintf (buf, "%" PRId64, rate);
+                       sprintf (buf, "%" PRId64 "Hz", rate);
                }
 
-               _left_layout->set_text (buf);
+               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2 </span><span foreground=\"green\">%3</span></span>",
+                               INFO_FONT_SIZE, _("SR"), buf));
 
                float vid_pullup = _session->config.get_video_pullup();
 
                if (vid_pullup == 0.0) {
-                       _right_layout->set_text (_("none"));
+                       _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2 </span><span foreground=\"green\">off</span></span>",
+                                       INFO_FONT_SIZE, _("Pull")));
                } else {
-                       sprintf (buf, "%-6.4f", vid_pullup);
-                       _right_layout->set_text (buf);
+                       sprintf (buf, _("%+.4f%%"), vid_pullup);
+                       _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2 </span><span foreground=\"green\">%3</span></span>",
+                                       INFO_FONT_SIZE, _("Pull"), buf));
                }
        }
 }
 
 void
-AudioClock::set_minsec (framepos_t when, bool force)
+AudioClock::set_minsec (framepos_t when, bool /*force*/)
 {
        char buf[32];
        framecnt_t left;
@@ -771,17 +1104,23 @@ AudioClock::set_minsec (framepos_t when, bool force)
        int mins;
        int secs;
        int millisecs;
+       bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012:\u2012\u2012:\u2012\u2012.\u2012\u2012\u2012");
+               _layout->set_text (" --:--:--.---");
 
                if (_left_layout) {
                        _left_layout->set_text ("");
                        _right_layout->set_text ("");
                }
-               
+
                return;
-       }       
+       }
+
+       if (when < 0) {
+               when = -when;
+               negative = true;
+       }
 
        left = when;
        hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
@@ -792,61 +1131,59 @@ AudioClock::set_minsec (framepos_t when, bool force)
        left -= (framecnt_t) floor (secs * _session->frame_rate());
        millisecs = floor (left * 1000.0 / (float) _session->frame_rate());
 
-       snprintf (buf, sizeof (buf), "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ".%03" PRIu32, hrs, mins, secs, millisecs);
+       if (negative) {
+               snprintf (buf, sizeof (buf), "-%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, hrs, mins, secs, millisecs);
+       } else {
+               snprintf (buf, sizeof (buf), " %02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, hrs, mins, secs, millisecs);
+       }
+
        _layout->set_text (buf);
+       set_slave_info();
 }
 
 void
-AudioClock::set_timecode (framepos_t when, bool force)
+AudioClock::set_timecode (framepos_t when, bool /*force*/)
 {
-       char buf[32];
        Timecode::Time TC;
-       
+       bool negative = false;
+
        if (_off) {
-               _layout->set_text ("\u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012");
+               _layout->set_text (" --:--:--:--");
                if (_left_layout) {
                        _left_layout->set_text ("");
                        _right_layout->set_text ("");
                }
-               
+
                return;
        }
 
+       if (when < 0) {
+               when = -when;
+               negative = true;
+       }
+
        if (is_duration) {
                _session->timecode_duration (when, TC);
        } else {
                _session->timecode_time (when, TC);
        }
-       
-       if (TC.negative) {
-               snprintf (buf, sizeof (buf), "-%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, TC.hours, TC.minutes, TC.seconds, TC.frames);
-       } else {
-               snprintf (buf, sizeof (buf), " %02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, TC.hours, TC.minutes, TC.seconds, TC.frames);
-       }
-
-       _layout->set_text (buf);
 
-       if (_right_layout) {
-               double timecode_frames = _session->timecode_frames_per_second();
-       
-               if (fmod(timecode_frames, 1.0) == 0.0) {
-                       sprintf (buf, "FPS %u %s", int (timecode_frames), (_session->timecode_drop_frames() ? "D" : ""));
-               } else {
-                       sprintf (buf, "%.2f %s", timecode_frames, (_session->timecode_drop_frames() ? "D" : ""));
-               }
+       TC.negative = TC.negative || negative;
 
-               _right_layout->set_text (buf);
-       }
+       _layout->set_text (Timecode::timecode_format_time(TC));
+
+       set_slave_info();
 }
 
 void
-AudioClock::set_bbt (framepos_t when, bool force)
+AudioClock::set_bbt (framepos_t when, bool /*force*/)
 {
        char buf[16];
        Timecode::BBT_Time BBT;
+       bool negative = false;
 
        if (_off) {
-               _layout->set_text ("\u2012\u2012|\u2012\u2012|\u2012\u2012\u2012\u2012");
+               _layout->set_text (" ---|--|----");
                if (_left_layout) {
                        _left_layout->set_text ("");
                        _right_layout->set_text ("");
@@ -854,6 +1191,11 @@ AudioClock::set_bbt (framepos_t when, bool force)
                return;
        }
 
+       if (when < 0) {
+               when = -when;
+               negative = true;
+       }
+
        /* handle a common case */
        if (is_duration) {
                if (when == 0) {
@@ -869,9 +1211,16 @@ AudioClock::set_bbt (framepos_t when, bool force)
                _session->tempo_map().bbt_time (when, BBT);
        }
 
-       snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%04" PRIu32, BBT.bars, BBT.beats, BBT.ticks);
+       if (negative) {
+               snprintf (buf, sizeof (buf), "-%03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32,
+                         BBT.bars, BBT.beats, BBT.ticks);
+       } else {
+               snprintf (buf, sizeof (buf), " %03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32,
+                         BBT.bars, BBT.beats, BBT.ticks);
+       }
+
        _layout->set_text (buf);
-                
+
        if (_right_layout) {
                framepos_t pos;
 
@@ -883,11 +1232,13 @@ AudioClock::set_bbt (framepos_t when, bool force)
 
                TempoMetric m (_session->tempo_map().metric_at (pos));
 
-               sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
-               _left_layout->set_text (buf);
+               sprintf (buf, "%-5.1f", m.tempo().beats_per_minute());
+               _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
+                                                         INFO_FONT_SIZE, buf, _("Tempo")));
 
-               sprintf (buf, "%g|%g", m.meter().beats_per_bar(), m.meter().note_divisor());
-               _right_layout->set_text (buf);
+               sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
+               _right_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
+                                                          INFO_FONT_SIZE, buf, _("Meter")));
        }
 }
 
@@ -899,6 +1250,7 @@ AudioClock::set_session (Session *s)
        if (_session) {
 
                _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
+               _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context());
 
                const XMLProperty* prop;
                XMLNode* node = _session->extra_xml (X_("ClockModes"));
@@ -926,50 +1278,6 @@ AudioClock::set_session (Session *s)
 
 bool
 AudioClock::on_key_press_event (GdkEventKey* ev)
-{
-       if (!editing) {
-               return false;
-       }
-       
-       /* return true for keys that we MIGHT use 
-          at release
-       */
-       switch (ev->keyval) {
-       case GDK_0:
-       case GDK_KP_0:
-       case GDK_1:
-       case GDK_KP_1:
-       case GDK_2:
-       case GDK_KP_2:
-       case GDK_3:
-       case GDK_KP_3:
-       case GDK_4:
-       case GDK_KP_4:
-       case GDK_5:
-       case GDK_KP_5:
-       case GDK_6:
-       case GDK_KP_6:
-       case GDK_7:
-       case GDK_KP_7:
-       case GDK_8:
-       case GDK_KP_8:
-       case GDK_9:
-       case GDK_KP_9:
-       case GDK_period:
-       case GDK_comma:
-       case GDK_KP_Decimal:
-       case GDK_Tab:
-       case GDK_Return:
-       case GDK_KP_Enter:
-       case GDK_Escape:
-               return true;
-       default:
-               return false;
-       }
-}
-
-bool
-AudioClock::on_key_release_event (GdkEventKey *ev)
 {
        if (!editing) {
                return false;
@@ -977,6 +1285,8 @@ AudioClock::on_key_release_event (GdkEventKey *ev)
 
        string new_text;
        char new_char = 0;
+       int highlight_length;
+       framepos_t pos;
 
        switch (ev->keyval) {
        case GDK_0:
@@ -1022,12 +1332,18 @@ AudioClock::on_key_release_event (GdkEventKey *ev)
 
        case GDK_minus:
        case GDK_KP_Subtract:
-               end_edit_relative (false);
+               if (_negative_allowed && input_string.empty()) {
+                               edit_is_negative = true;
+                               edit_string.replace(0,1,"-");
+                               _layout->set_text (edit_string);
+                               queue_draw ();
+               } else {
+                       end_edit_relative (false);
+               }
                return true;
                break;
 
        case GDK_plus:
-       case GDK_KP_Add:
                end_edit_relative (true);
                return true;
                break;
@@ -1044,68 +1360,136 @@ AudioClock::on_key_release_event (GdkEventKey *ev)
                ChangeAborted();  /*  EMIT SIGNAL  */
                return true;
 
+       case GDK_Delete:
+       case GDK_BackSpace:
+               if (!input_string.empty()) {
+                       /* delete the last key entered
+                       */
+                       input_string = input_string.substr (0, input_string.length() - 1);
+               }
+               goto use_input_string;
+
        default:
                return false;
        }
 
-       if (input_string.length() >= insert_max) {
-               /* eat the key event, but do no nothing with it */
+       if (!insert_map.empty() && (input_string.length() >= insert_map.size())) {
+               /* too many digits: eat the key event, but do nothing with it */
                return true;
        }
 
-       input_string.insert (input_string.begin(), new_char);
-       
-       string::reverse_iterator ri;
-       vector<int> insert_at;
-       int highlight_length;
-       
-       /* merge with pre-edit-string into edit string */
-       
+       input_string.push_back (new_char);
+
+  use_input_string:
+
        switch (_mode) {
        case Frames:
-               edit_string = input_string;
+               /* get this one in the right order, and to the right width */
+               if (ev->keyval == GDK_Delete || ev->keyval == GDK_BackSpace) {
+                       edit_string = edit_string.substr (0, edit_string.length() - 1);
+               } else {
+                       edit_string.push_back (new_char);
+               }
+               if (!edit_string.empty()) {
+                       char buf[32];
+                       sscanf (edit_string.c_str(), "%" PRId64, &pos);
+                       snprintf (buf, sizeof (buf), " %10" PRId64, pos);
+                       edit_string = buf;
+               }
+               /* highlight the whole thing */
                highlight_length = edit_string.length();
                break;
-               
+
        default:
-               edit_string = pre_edit_string;
-               
-               /* backup through the original string, till we have
-                * enough digits locations to put all the digits from
-                * the input string.
-                */
-               
-               for (ri = edit_string.rbegin(); ri != edit_string.rend(); ++ri) {
-                       if (isdigit (*ri)) {
-                               insert_at.push_back (edit_string.length() - (ri - edit_string.rbegin()) - 1);
-                               if (insert_at.size() == input_string.length()) {
-                                       break;
-                               }
-                       }
-               }
-               
-               if (insert_at.size() != input_string.length()) {
-                       error << "something went wrong " << endmsg;
+               highlight_length = merge_input_and_edit_string ();
+       }
+
+       if (edit_is_negative) {
+               edit_string.replace(0,1,"-");
+       } else {
+               if (!pre_edit_string.empty() && (pre_edit_string.at(0) == '-')) {
+                       edit_string.replace(0,1,"_");
                } else {
-                       for (int i = input_string.length() - 1; i >= 0; --i) {
-                               edit_string[insert_at[i]] = input_string[i];
-                       }
-                       
-                       highlight_length = edit_string.length() - insert_at.back();
+                       edit_string.replace(0,1," ");
                }
-               
-               break;
        }
-       
-       if (edit_string != _layout->get_text()) {
-               show_edit_status (highlight_length);
-               _layout->set_text (edit_string);
-               queue_draw ();
-       } 
+
+       show_edit_status (highlight_length);
+       _layout->set_text (edit_string);
+       queue_draw ();
 
        return true;
 }
 
+int
+AudioClock::merge_input_and_edit_string ()
+{
+       /* merge with pre-edit-string into edit string */
+
+       edit_string = pre_edit_string;
+
+       if (input_string.empty()) {
+               return 0;
+       }
+
+       string::size_type target;
+       for (string::size_type i = 0; i < input_string.length(); ++i) {
+               target = insert_map[input_string.length() - 1 - i];
+               edit_string[target] = input_string[i];
+       }
+       /* highlight from end to wherever the last character was added */
+       return edit_string.length() - insert_map[input_string.length()-1];
+}
+
+
+bool
+AudioClock::on_key_release_event (GdkEventKey *ev)
+{
+       if (!editing) {
+               return false;
+       }
+
+       /* return true for keys that we used on press
+          so that they cannot possibly do double-duty
+       */
+       switch (ev->keyval) {
+       case GDK_0:
+       case GDK_KP_0:
+       case GDK_1:
+       case GDK_KP_1:
+       case GDK_2:
+       case GDK_KP_2:
+       case GDK_3:
+       case GDK_KP_3:
+       case GDK_4:
+       case GDK_KP_4:
+       case GDK_5:
+       case GDK_KP_5:
+       case GDK_6:
+       case GDK_KP_6:
+       case GDK_7:
+       case GDK_KP_7:
+       case GDK_8:
+       case GDK_KP_8:
+       case GDK_9:
+       case GDK_KP_9:
+       case GDK_period:
+       case GDK_comma:
+       case GDK_KP_Decimal:
+       case GDK_Tab:
+       case GDK_Return:
+       case GDK_KP_Enter:
+       case GDK_Escape:
+       case GDK_minus:
+       case GDK_plus:
+       case GDK_KP_Add:
+       case GDK_KP_Subtract:
+               return true;
+       default:
+               return false;
+       }
+}
+
 AudioClock::Field
 AudioClock::index_to_field (int index) const
 {
@@ -1117,10 +1501,8 @@ AudioClock::index_to_field (int index) const
                        return Timecode_Minutes;
                } else if (index < 10) {
                        return Timecode_Seconds;
-               } else if (index < 13) {
-                       return Timecode_Frames;
                } else {
-                       return Field (0);
+                       return Timecode_Frames;
                }
                break;
        case BBT:
@@ -1128,13 +1510,10 @@ AudioClock::index_to_field (int index) const
                        return Bars;
                } else if (index < 7) {
                        return Beats;
-               } else if (index < 12) {
-                       return Ticks;
                } else {
-                       return Field (0);
+                       return Ticks;
                }
                break;
-
        case MinSec:
                if (index < 3) {
                        return Timecode_Hours;
@@ -1142,17 +1521,16 @@ AudioClock::index_to_field (int index) const
                        return MS_Minutes;
                } else if (index < 9) {
                        return MS_Seconds;
-               } else if (index < 12) {
-                       return MS_Milliseconds;
                } else {
-                       return Field (0);
+                       return MS_Milliseconds;
                }
                break;
-
        case Frames:
                return AudioFrames;
                break;
        }
+
+       return Field (0);
 }
 
 bool
@@ -1160,7 +1538,25 @@ AudioClock::on_button_press_event (GdkEventButton *ev)
 {
        switch (ev->button) {
        case 1:
-               if (editable) {
+               if (editable && !_off) {
+                       int index;
+                       int trailing;
+                       int y;
+                       int x;
+
+                       /* the text has been centered vertically, so adjust
+                        * x and y.
+                        */
+                       int xcenter = (get_width() - layout_width) /2;
+
+                       y = ev->y - ((upper_height - layout_height)/2);
+                       x = ev->x - xcenter;
+
+                       if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
+                               /* pretend it is a character on the far right */
+                               index = 99;
+                       }
+                       drag_field = index_to_field (index);
                        dragging = true;
                        /* make absolutely sure that the pointer is grabbed */
                        gdk_pointer_grab(ev->window,false ,
@@ -1169,18 +1565,9 @@ AudioClock::on_button_press_event (GdkEventButton *ev)
                        drag_accum = 0;
                        drag_start_y = ev->y;
                        drag_y = ev->y;
-                       
-                       int index;
-                       int trailing;
-
-                       if (_layout->xy_to_index (ev->x * PANGO_SCALE, ev->y * PANGO_SCALE, index, trailing)) {                 
-                               drag_field = index_to_field (index);
-                       } else {
-                               drag_field = Field (0);
-                       }
                }
                break;
-               
+
        default:
                return false;
                break;
@@ -1192,7 +1579,7 @@ AudioClock::on_button_press_event (GdkEventButton *ev)
 bool
 AudioClock::on_button_release_event (GdkEventButton *ev)
 {
-       if (editable) {
+       if (editable && !_off) {
                if (dragging) {
                        gdk_pointer_ungrab (GDK_CURRENT_TIME);
                        dragging = false;
@@ -1202,10 +1589,37 @@ AudioClock::on_button_release_event (GdkEventButton *ev)
                                return true;
                        } else {
                                if (ev->button == 1) {
-                                       start_edit ();
+
+                                       if (_edit_by_click_field) {
+
+                                               int xcenter = (get_width() - layout_width) /2;
+                                               int index = 0;
+                                               int trailing;
+                                               int y = ev->y - ((upper_height - layout_height)/2);
+                                               int x = ev->x - xcenter;
+                                               Field f;
+
+                                               if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
+                                                       return true;
+                                               }
+
+                                               f = index_to_field (index);
+
+                                               switch (f) {
+                                               case Timecode_Frames:
+                                               case MS_Milliseconds:
+                                               case Ticks:
+                                                       f = Field (0);
+                                                       break;
+                                               default:
+                                                       break;
+                                               }
+                                               start_edit (f);
+                                       } else {
+                                               start_edit ();
+                                       }
                                }
                        }
-
                }
        }
 
@@ -1238,15 +1652,26 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
        int index;
        int trailing;
 
-       if (_session == 0 || !editable) {
+       if (editing || _session == 0 || !editable || _off) {
                return false;
        }
 
-       if (!_layout->xy_to_index (ev->x * PANGO_SCALE, ev->y * PANGO_SCALE, index, trailing)) {
+       int y;
+       int x;
+
+       /* the text has been centered vertically, so adjust
+        * x and y.
+        */
+
+       int xcenter = (get_width() - layout_width) /2;
+       y = ev->y - ((upper_height - layout_height)/2);
+       x = ev->x - xcenter;
+
+       if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
                /* not in the main layout */
                return false;
        }
-       
+
        Field f = index_to_field (index);
        framepos_t frames = 0;
 
@@ -1262,36 +1687,36 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
                        ValueChanged (); /* EMIT_SIGNAL */
                }
                break;
-               
+
        case GDK_SCROLL_DOWN:
                frames = get_frame_step (f);
                if (frames != 0) {
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                frames *= 10;
                        }
-                       
-                       if ((double)current_time() - (double)frames < 0.0) {
+
+                       if (!_negative_allowed && (double)current_time() - (double)frames < 0.0) {
                                set (0, true);
                        } else {
                                set (current_time() - frames, true);
                        }
-                       
+
                        ValueChanged (); /* EMIT_SIGNAL */
                }
                break;
-               
+
        default:
                return false;
                break;
        }
-       
+
        return true;
 }
 
 bool
 AudioClock::on_motion_notify_event (GdkEventMotion *ev)
 {
-       if (_session == 0 || !dragging) {
+       if (editing || _session == 0 || !dragging) {
                return false;
        }
 
@@ -1321,7 +1746,7 @@ AudioClock::on_motion_notify_event (GdkEventMotion *ev)
                int dir;
                dir = (drag_accum < 0 ? 1:-1);
                pos = current_time();
-               frames = get_frame_step (drag_field,pos,dir);
+               frames = get_frame_step (drag_field, pos, dir);
 
                if (frames  != 0 &&  frames * drag_accum < current_time()) {
                        set ((framepos_t) floor (pos - drag_accum * frames), false); // minus because up is negative in GTK
@@ -1400,7 +1825,7 @@ AudioClock::get_frame_step (Field field, framepos_t pos, int dir)
 }
 
 framepos_t
-AudioClock::current_time (framepos_t pos) const
+AudioClock::current_time (framepos_t) const
 {
        return last_when;
 }
@@ -1435,8 +1860,14 @@ AudioClock::bbt_validate_edit (const string& str)
 {
        AnyTime any;
 
-       sscanf (str.c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks);
-       
+       if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks) != 3) {
+               return false;
+       }
+
+       if (any.bbt.ticks > Timecode::BBT_Time::ticks_per_beat) {
+               return false;
+       }
+
        if (!is_duration && any.bbt.bars == 0) {
                return false;
        }
@@ -1449,25 +1880,39 @@ AudioClock::bbt_validate_edit (const string& str)
 }
 
 bool
-AudioClock::timecode_validate_edit (const string& str)
+AudioClock::timecode_validate_edit (const string&)
 {
        Timecode::Time TC;
+       int hours;
+       char ignored[2];
+
+       if (sscanf (_layout->get_text().c_str(), "%[- _]%" PRId32 ":%" PRId32 ":%" PRId32 "%[:;]%" PRId32,
+                   ignored, &hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) {
+               return false;
+       }
+
+       if (hours < 0) {
+               TC.hours = hours * -1;
+               TC.negative = true;
+       } else {
+               TC.hours = hours;
+               TC.negative = false;
+       }
 
-       if (sscanf (_layout->get_text().c_str(), "%" PRId32 ":%" PRId32 ":%" PRId32 ":%" PRId32, 
-                   &TC.hours, &TC.minutes, &TC.seconds, &TC.frames) != 4) {
+       if (TC.negative && !_negative_allowed) {
                return false;
        }
 
-       if (TC.minutes > 59 || TC.seconds > 59) {
+       if (TC.hours > 23U || TC.minutes > 59U || TC.seconds > 59U) {
                return false;
        }
 
-       if (TC.frames > (long)rint(_session->timecode_frames_per_second()) - 1) {
+       if (TC.frames > (uint32_t) rint (_session->timecode_frames_per_second()) - 1) {
                return false;
        }
 
        if (_session->timecode_drop_frames()) {
-               if (TC.minutes % 10 && TC.seconds == 0 && TC.frames < 2) {
+               if (TC.minutes % 10 && TC.seconds == 0U && TC.frames < 2U) {
                        return false;
                }
        }
@@ -1475,6 +1920,22 @@ AudioClock::timecode_validate_edit (const string& str)
        return true;
 }
 
+bool
+AudioClock::minsec_validate_edit (const string& str)
+{
+       int hrs, mins, secs, millisecs;
+
+       if (sscanf (str.c_str(), "%d:%d:%d.%d", &hrs, &mins, &secs, &millisecs) != 4) {
+               return false;
+       }
+
+       if (hrs > 23 || mins > 59 || secs > 59 || millisecs > 999) {
+               return false;
+       }
+
+       return true;
+}
+
 framepos_t
 AudioClock::frames_from_timecode_string (const string& str) const
 {
@@ -1484,15 +1945,23 @@ AudioClock::frames_from_timecode_string (const string& str) const
 
        Timecode::Time TC;
        framepos_t sample;
+       char ignored[2];
+       int hours;
 
-       sscanf (str.c_str(), "%d:%d:%d:%d", &TC.hours, &TC.minutes, &TC.seconds, &TC.frames);
-
+       if (sscanf (str.c_str(), "%[- _]%d:%d:%d%[:;]%d", ignored, &hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) {
+               error << string_compose (_("programming error: %1 %2"), "badly formatted timecode clock string", str) << endmsg;
+               return 0;
+       }
+       TC.hours = abs(hours);
        TC.rate = _session->timecode_frames_per_second();
        TC.drop= _session->timecode_drop_frames();
 
        _session->timecode_to_sample (TC, sample, false /* use_offset */, false /* use_subframes */ );
-       
+
        // timecode_tester ();
+       if (edit_is_negative) {
+               sample = - sample;
+       }
 
        return sample;
 }
@@ -1507,7 +1976,11 @@ AudioClock::frames_from_minsec_string (const string& str) const
        int hrs, mins, secs, millisecs;
        framecnt_t sr = _session->frame_rate();
 
-       sscanf (str.c_str(), "%d:%d:%d:%d", &hrs, &mins, &secs, &millisecs);
+       if (sscanf (str.c_str(), "%d:%d:%d.%d", &hrs, &mins, &secs, &millisecs) != 4) {
+               error << string_compose (_("programming error: %1 %2"), "badly formatted minsec clock string", str) << endmsg;
+               return 0;
+       }
+
        return (framepos_t) floor ((hrs * 60.0f * 60.0f * sr) + (mins * 60.0f * sr) + (secs * sr) + (millisecs * sr / 1000.0));
 }
 
@@ -1522,7 +1995,9 @@ AudioClock::frames_from_bbt_string (framepos_t pos, const string& str) const
        AnyTime any;
        any.type = AnyTime::BBT;
 
-       sscanf (str.c_str(), "%" PRId32 "|%" PRId32 "|%" PRId32, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks);
+       if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks) != 3) {
+               return 0;
+       }
 
        if (is_duration) {
                any.bbt.bars++;
@@ -1538,13 +2013,15 @@ framepos_t
 AudioClock::frame_duration_from_bbt_string (framepos_t pos, const string& str) const
 {
        if (_session == 0) {
-               error << "AudioClock::current_time() called with BBT mode but without session!" << endmsg;
+               error << "AudioClock::frame_duration_from_bbt_string() called with BBT mode but without session!" << endmsg;
                return 0;
        }
 
        Timecode::BBT_Time bbt;
 
-       sscanf (str.c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, &bbt.bars, &bbt.beats, &bbt.ticks);
+       if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &bbt.bars, &bbt.beats, &bbt.ticks) != 3) {
+               return 0;
+       }
 
        return _session->tempo_map().bbt_duration_at(pos,bbt,1);
 }
@@ -1572,7 +2049,7 @@ AudioClock::build_ops_menu ()
        ops_items.push_back (MenuElem (_("Minutes:Seconds"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), MinSec)));
        ops_items.push_back (MenuElem (_("Samples"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Frames)));
 
-       if (editable && !is_duration && !_follows_playhead) {
+       if (editable && !_off && !is_duration && !_follows_playhead) {
                ops_items.push_back (SeparatorElem());
                ops_items.push_back (MenuElem (_("Set From Playhead"), sigc::mem_fun(*this, &AudioClock::set_from_playhead)));
                ops_items.push_back (MenuElem (_("Locate to This Time"), sigc::mem_fun(*this, &AudioClock::locate)));
@@ -1609,25 +2086,64 @@ AudioClock::set_mode (Mode m)
 
        _mode = m;
 
+       insert_map.clear();
+
+       _layout->set_text ("");
+
+       if (_left_layout) {
+
+               _left_layout->set_attributes (info_attributes);
+               _right_layout->set_attributes (info_attributes);
+               /* adjust info_height according to font size */
+               int ignored;
+               _left_layout->set_text (" 1234567890");
+               _left_layout->get_pixel_size (ignored, info_height);
+
+               _left_layout->set_text ("");
+               _right_layout->set_text ("");
+       }
+
        switch (_mode) {
        case Timecode:
-               insert_max = 9; // 8 digits + sign [-]2:2:2:2
-               mode_based_info_ratio = 0.5;
+               mode_based_info_ratio = 0.6;
+               insert_map.push_back (11);
+               insert_map.push_back (10);
+               insert_map.push_back (8);
+               insert_map.push_back (7);
+               insert_map.push_back (5);
+               insert_map.push_back (4);
+               insert_map.push_back (2);
+               insert_map.push_back (1);
                break;
-               
+
        case BBT:
-               insert_max = 8; // 8 digits, 2|2|4
                mode_based_info_ratio = 0.5;
+               insert_map.push_back (11);
+               insert_map.push_back (10);
+               insert_map.push_back (9);
+               insert_map.push_back (8);
+               insert_map.push_back (6);
+               insert_map.push_back (5);
+               insert_map.push_back (3);
+               insert_map.push_back (2);
+               insert_map.push_back (1);
                break;
-               
+
        case MinSec:
-               insert_max = 9; // 7 digits 2:2:2.3
-               mode_based_info_ratio = 1.0;
+               mode_based_info_ratio = 0.6;
+               insert_map.push_back (12);
+               insert_map.push_back (11);
+               insert_map.push_back (10);
+               insert_map.push_back (8);
+               insert_map.push_back (7);
+               insert_map.push_back (5);
+               insert_map.push_back (4);
+               insert_map.push_back (2);
+               insert_map.push_back (1);
                break;
-               
+
        case Frames:
-               insert_max = INT_MAX;
-               mode_based_info_ratio = 1.0;
+               mode_based_info_ratio = 0.45;
                break;
        }
 
@@ -1650,6 +2166,10 @@ void
 AudioClock::on_style_changed (const Glib::RefPtr<Gtk::Style>& old_style)
 {
        CairoWidget::on_style_changed (old_style);
+
+       Gtk::Requisition req;
+       set_clock_dimensions (req);
+
        set_font ();
        set_colors ();
 }
@@ -1668,11 +2188,11 @@ AudioClock::set_is_duration (bool yn)
        }
 
        is_duration = yn;
-       set (last_when, true, 0, 's');
+       set (last_when, true);
 }
 
 void
-AudioClock::set_off (bool yn) 
+AudioClock::set_off (bool yn)
 {
        if (_off == yn) {
                return;
@@ -1681,16 +2201,39 @@ AudioClock::set_off (bool yn)
        _off = yn;
 
        /* force a redraw. last_when will be preserved, but the clock text will
-        * change 
+        * change
         */
-       
+
        set (last_when, true);
 }
 
 void
 AudioClock::focus ()
 {
-       start_edit ();
+       start_edit (Field (0));
+}
+
+void
+AudioClock::set_corner_radius (double r)
+{
+       corner_radius = r;
+       first_width = 0;
+       first_height = 0;
+       queue_resize ();
 }
 
+void
+AudioClock::dpi_reset ()
+{
+       /* force recomputation of size even if we are fixed width
+        */
+       first_width = 0;
+       first_height = 0;
+       queue_resize ();
+}
 
+void
+AudioClock::set_negative_allowed (bool yn)
+{
+       _negative_allowed = yn;
+}