fix horiz alignment (corner-radius is added to layout)
[ardour.git] / gtk2_ardour / audio_clock.cc
index 6ab075b0ec7d2b23d16e8ccd5c4ecd1d4ab0e488..acd8770c2723434bd426fadfc76566661c3ac7fb 100644 (file)
 #include "pbd/enumwriter.h"
 
 #include <gtkmm/style.h>
-#include <gtkmm2ext/utils.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"
+#include "global_signals.h"
 #include "utils.h"
 #include "keyboard.h"
 #include "gui_thread.h"
@@ -46,367 +51,997 @@ using namespace std;
 
 using Gtkmm2ext::Keyboard;
 
-using PBD::atoi;
-using PBD::atof;
-
 sigc::signal<void> AudioClock::ModeChanged;
 vector<AudioClock*> AudioClock::clocks;
+const double AudioClock::info_font_scale_factor = 0.5;
+const double AudioClock::separator_height = 0.0;
+const double AudioClock::x_leading_padding = 6.0;
 
-const uint32_t AudioClock::field_length[(int) AudioClock::AudioFrames+1] = {
-       2,   /* Timecode_Hours */
-       2,   /* Timecode_Minutes */
-       2,   /* Timecode_Seconds */
-       2,   /* Timecode_Frames */
-       2,   /* MS_Hours */
-       2,   /* MS_Minutes */
-       2,   /* MS_Seconds */
-       3,   /* MS_Milliseconds */
-       3,   /* Bars */
-       2,   /* Beats */
-       4,   /* Tick */
-       10   /* Audio Frame */
-};
-
-AudioClock::AudioClock (const string& clock_name, bool transient, const string& widget_name, 
+#define BBT_BAR_CHAR "|"
+#define BBT_SCANF_FORMAT "%" PRIu32 "%*c%" PRIu32 "%*c%" PRIu32
+#define INFO_FONT_SIZE ((int)round(font_size * info_font_scale_factor))
+
+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),
-         is_transient (transient),
-         is_duration (duration),
-         editable (allow_edit),
-         _follows_playhead (follows_playhead),
-         colon1 (":"),
-         colon2 (":"),
-         colon3 (":"),
-         colon4 (":"),
-         colon5 (":"),
-         period1 ("."),
-         b1 ("|"),
-         b2 ("|"),
-         last_when(0),
-         _canonical_time_is_displayed (true),
-         _canonical_time (0)
+       : ops_menu (0)
+       , _name (clock_name)
+       , is_transient (transient)
+       , is_duration (duration)
+       , editable (allow_edit)
+       , _follows_playhead (follows_playhead)
+       , _off (false)
+       , _fixed_width (true)
+       , layout_x_offset (0)
+       , em_width (0)
+       , _edit_by_click_field (false)
+       , editing_attr (0)
+       , foreground_attr (0)
+       , first_height (0)
+       , first_width (0)
+       , layout_height (0)
+       , layout_width (0)
+       , info_height (0)
+       , upper_height (0)
+       , mode_based_info_ratio (1.0)
+       , corner_radius (9)
+       , font_size (10240)
+       , editing (false)
+       , bbt_reference_time (-1)
+       , last_when(0)
+       , last_pdelta (0)
+       , last_sdelta (0)
+       , dragging (false)
+       , drag_field (Field (0))
+
 {
-       /* XXX: these are leaked, but I don't suppose it's the end of the world */
-       
-       _eboxes[Timecode_Hours] = new EventBox;
-       _eboxes[Timecode_Minutes] = new EventBox;
-       _eboxes[Timecode_Seconds] = new EventBox;
-       _eboxes[Timecode_Frames] = new EventBox;
-       _eboxes[MS_Hours] = new EventBox;
-       _eboxes[MS_Minutes] = new EventBox;
-       _eboxes[MS_Seconds] = new EventBox;
-       _eboxes[MS_Milliseconds] = new EventBox;
-       _eboxes[Bars] = new EventBox;
-       _eboxes[Beats] = new EventBox;
-       _eboxes[Ticks] = new EventBox;
-       _eboxes[AudioFrames] = new EventBox;
-
-       _labels[Timecode_Hours] = new Label;
-       _labels[Timecode_Minutes] = new Label;
-       _labels[Timecode_Seconds] = new Label;
-       _labels[Timecode_Frames] = new Label;
-       _labels[MS_Hours] = new Label;
-       _labels[MS_Minutes] = new Label;
-       _labels[MS_Seconds] = new Label;
-       _labels[MS_Milliseconds] = new Label;
-       _labels[Bars] = new Label;
-       _labels[Beats] = new Label;
-       _labels[Ticks] = new Label;
-       _labels[AudioFrames] = new Label;
-       
-       last_when = 0;
-       last_pdelta = 0;
-       last_sdelta = 0;
-       key_entry_state = 0;
-       ops_menu = 0;
-       dragging = false;
-       bbt_reference_time = -1;
+       set_flags (CAN_FOCUS);
+
+       _layout = Pango::Layout::create (get_pango_context());
+       _layout->set_attributes (normal_attributes);
 
        if (with_info) {
-               frames_upper_info_label = manage (new Label);
-               frames_lower_info_label = manage (new Label);
-               timecode_upper_info_label = manage (new Label);
-               timecode_lower_info_label = manage (new Label);
-               bbt_upper_info_label = manage (new Label);
-               bbt_lower_info_label = manage (new Label);
-
-               frames_upper_info_label->set_name ("AudioClockFramesUpperInfo");
-               frames_lower_info_label->set_name ("AudioClockFramesLowerInfo");
-               timecode_upper_info_label->set_name ("AudioClockTimecodeUpperInfo");
-               timecode_lower_info_label->set_name ("AudioClockTimecodeLowerInfo");
-               bbt_upper_info_label->set_name ("AudioClockBBTUpperInfo");
-               bbt_lower_info_label->set_name ("AudioClockBBTLowerInfo");
-
-               Gtkmm2ext::set_size_request_to_display_given_text(*timecode_upper_info_label, "23.98",0,0);
-               Gtkmm2ext::set_size_request_to_display_given_text(*timecode_lower_info_label, "NDF",0,0);
-
-               Gtkmm2ext::set_size_request_to_display_given_text(*bbt_upper_info_label, "88|88",0,0);
-               Gtkmm2ext::set_size_request_to_display_given_text(*bbt_lower_info_label, "888.88",0,0);
-
-               frames_info_box.pack_start (*frames_upper_info_label, true, true);
-               frames_info_box.pack_start (*frames_lower_info_label, true, true);
-               timecode_info_box.pack_start (*timecode_upper_info_label, true, true);
-               timecode_info_box.pack_start (*timecode_lower_info_label, true, true);
-               bbt_info_box.pack_start (*bbt_upper_info_label, true, true);
-               bbt_info_box.pack_start (*bbt_lower_info_label, true, true);
+               _left_layout = Pango::Layout::create (get_pango_context());
+               _right_layout = Pango::Layout::create (get_pango_context());
+       }
+
+       set_widget_name (widget_name);
+
+       _mode = BBT; /* lie to force mode switch */
+       set_mode (Timecode);
+       set (last_when, true);
+
+       if (!is_transient) {
+               clocks.push_back (this);
+       }
+
+       ColorsChanged.connect (sigc::mem_fun (*this, &AudioClock::set_colors));
+       DPIReset.connect (sigc::mem_fun (*this, &AudioClock::dpi_reset));
+}
+
+AudioClock::~AudioClock ()
+{
+       delete foreground_attr;
+       delete editing_attr;
+}
 
+void
+AudioClock::set_widget_name (const string& str)
+{
+       if (str.empty()) {
+               set_name ("clock");
        } else {
-               frames_upper_info_label = 0;
-               frames_lower_info_label = 0;
-               timecode_upper_info_label = 0;
-               timecode_lower_info_label = 0;
-               bbt_upper_info_label = 0;
-               bbt_lower_info_label = 0;
+               set_name (str + " clock");
+       }
+
+       if (is_realized()) {
+               set_colors ();
        }
+}
 
-       frames_packer.set_homogeneous (false);
-       frames_packer.set_border_width (2);
-       frames_packer.pack_start (*_eboxes[AudioFrames], false, false);
 
-       if (with_info) {
-               frames_packer.pack_start (frames_info_box, false, false, 5);
+void
+AudioClock::on_realize ()
+{
+       CairoWidget::on_realize ();
+       set_font ();
+       set_colors ();
+}
+
+void
+AudioClock::set_font ()
+{
+       Glib::RefPtr<Gtk::Style> style = get_style ();
+       Pango::FontDescription font;
+       Pango::AttrFontDesc* font_attr;
+
+       if (!is_realized()) {
+               font = get_font_for_style (get_name());
+       } else {
+               font = style->get_font();
        }
 
-       frames_packer_hbox.pack_start (frames_packer, true, false);
+       font_size = font.get_size();
+
+       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
+
+       normal_attributes.change (*font_attr);
+       editing_attributes.change (*font_attr);
+
+       /* now a smaller version of the same font */
+
+       delete font_attr;
+       font.set_size ((int) lrint (font_size * info_font_scale_factor));
+       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 */
 
-       for (std::map<Field, EventBox*>::iterator i = _eboxes.begin(); i != _eboxes.end(); ++i) {
-               i->second->add (*_labels[i->first]);
+       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);
+}
+
+void
+AudioClock::set_active_state (Gtkmm2ext::ActiveState s)
+{
+       CairoWidget::set_active_state (s);
+       set_colors ();
+}
+
+void
+AudioClock::set_colors ()
+{
+       int r, g, b, a;
+
+       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()));
        }
 
-       timecode_packer.set_homogeneous (false);
-       timecode_packer.set_border_width (2);
-       timecode_packer.pack_start (*_eboxes[Timecode_Hours], false, false);
-       timecode_packer.pack_start (colon1, false, false);
-       timecode_packer.pack_start (*_eboxes[Timecode_Minutes], false, false);
-       timecode_packer.pack_start (colon2, false, false);
-       timecode_packer.pack_start (*_eboxes[Timecode_Seconds], false, false);
-       timecode_packer.pack_start (colon3, false, false);
-       timecode_packer.pack_start (*_eboxes[Timecode_Frames], false, false);
+       /* store for bg and cursor in render() */
 
-       if (with_info) {
-               timecode_packer.pack_start (timecode_info_box, false, false, 5);
+       UINT_TO_RGBA (bg_color, &r, &g, &b, &a);
+
+       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/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/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);
+       editing_attributes.change (*editing_attr);
+
+       if (!editing) {
+               _layout->set_attributes (normal_attributes);
+       } else {
+               _layout->set_attributes (editing_attributes);
        }
 
-       timecode_packer_hbox.pack_start (timecode_packer, true, false);
+       queue_draw ();
+}
 
-       bbt_packer.set_homogeneous (false);
-       bbt_packer.set_border_width (2);
-       bbt_packer.pack_start (*_eboxes[Bars], false, false);
-       bbt_packer.pack_start (b1, false, false);
-       bbt_packer.pack_start (*_eboxes[Beats], false, false);
-       bbt_packer.pack_start (b2, false, false);
-       bbt_packer.pack_start (*_eboxes[Ticks], false, false);
+void
+AudioClock::render (cairo_t* cr)
+{
+       /* main layout: rounded rect, plus the text */
 
-       if (with_info) {
-               bbt_packer.pack_start (bbt_info_box, false, false, 5);
+       if (_need_bg) {
+               cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
+               if (corner_radius) {
+                       if (_left_layout) {
+                               Gtkmm2ext::rounded_top_half_rectangle (cr, 0, 0, get_width() - corner_radius/2.0, 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);
        }
 
-       bbt_packer_hbox.pack_start (bbt_packer, true, false);
+       if (!_fixed_width) {
+               cairo_move_to (cr, layout_x_offset, 0);
+       } else {
+               int xcenter = layout_x_offset > corner_radius/4.0 ? 0 : (get_width() - _mode_width[_mode]) /2;
+               cairo_move_to (cr, layout_x_offset + xcenter, (upper_height - layout_height) / 2.0);
+       }
 
-       minsec_packer.set_homogeneous (false);
-       minsec_packer.set_border_width (2);
-       minsec_packer.pack_start (*_eboxes[MS_Hours], false, false);
-       minsec_packer.pack_start (colon4, false, false);
-       minsec_packer.pack_start (*_eboxes[MS_Minutes], false, false);
-       minsec_packer.pack_start (colon5, false, false);
-       minsec_packer.pack_start (*_eboxes[MS_Seconds], false, false);
-       minsec_packer.pack_start (period1, false, false);
-       minsec_packer.pack_start (*_eboxes[MS_Milliseconds], false, false);
+       pango_cairo_show_layout (cr, _layout->gobj());
 
-       minsec_packer_hbox.pack_start (minsec_packer, true, false);
+       if (_left_layout) {
 
-       clock_frame.set_shadow_type (SHADOW_IN);
-       clock_frame.set_name ("BaseFrame");
+               double h = get_height() - upper_height - separator_height;
 
-       clock_frame.add (clock_base);
+               if (_need_bg) {
+                       cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
+               }
 
-       set_widget_name (widget_name);
+               if (mode_based_info_ratio != 1.0) {
 
-       _mode = BBT; /* lie to force mode switch */
-       set_mode (Timecode);
+                       double left_rect_width = round (((get_width() - separator_height) * mode_based_info_ratio) + 0.5);
 
-       pack_start (clock_frame, true, true);
+                       if (_need_bg) {
+                               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/2.0, corner_radius);
+                               } else {
+                                       cairo_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h);
+                               }
+                               cairo_fill (cr);
+                       }
 
-       /* the clock base handles button releases for menu popup regardless of
-          editable status. if the clock is editable, the clock base is where
-          we pass focus to after leaving the last editable "field", which
-          will then shutdown editing till the user starts it up again.
+                       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) {
+                               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 - corner_radius/2.0,
+                                                       h - corner_radius/2.0, 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);
+                       }
 
-          it does this because the focus out event on the field disables
-          keyboard event handling, and we don't connect anything up to
-          notice focus in on the clock base. hence, keyboard event handling
-          stays disabled.
-       */
 
-       clock_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
-       clock_base.signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_button_release_event), Timecode_Hours));
+                       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) {
+                                       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 (editable) {
-               setup_events ();
+                       if (_need_bg) {
+                               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);
+                       }
+               }
        }
 
-       set (last_when, true);
+       if (editing) {
+               if (!insert_map.empty()) {
 
-       if (!is_transient) {
-               clocks.push_back (this);
+                       int xcenter = layout_x_offset > corner_radius/4.0 ? 0 : (get_width() - _mode_width[_mode]) /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);
+                               if (!_fixed_width) {
+                                       cairo_rectangle (cr,
+                                                        min (get_width() - 2.0,
+                                                             (double) cursor.get_x()/PANGO_SCALE + layout_x_offset + xcenter + em_width), 0,
+                                                        2.0, cursor.get_height()/PANGO_SCALE);
+                               } else {
+                                       cairo_rectangle (cr,
+                                                        min (get_width() - 2.0,
+                                                             (double) layout_x_offset + 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);
+                               if (!_fixed_width) {
+                                       cairo_rectangle (cr,
+                                                        (get_width()/2.0),
+                                                        0,
+                                                        2.0, upper_height);
+                               } else {
+                                       cairo_rectangle (cr,
+                                                        (get_width()/2.0),
+                                                        (upper_height - layout_height)/2.0,
+                                                        2.0, upper_height);
+                               }
+                               cairo_fill (cr);
+                       }
+               }
        }
 }
 
 void
-AudioClock::set_widget_name (string name)
+AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 {
-       Widget::set_name (name);
+       CairoWidget::on_size_allocate (alloc);
+
+       if (_left_layout) {
+               upper_height = (get_height()/2.0) - 1.0;
+       } else {
+               upper_height = get_height();
+       }
+
+       if (_fixed_width) {
+               /* center display in available space
+                * NB. this only works if the containing widget is not the
+                * layout itself (eg. the session->property dialog)
+                */
+               layout_x_offset = (get_width() - layout_width)/2.0;
+       } else {
+               /* left justify */
+               layout_x_offset = 0;
+       }
+}
+
+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.
+       */
+
+       if (first_width) {
+               req->width = first_width;
+               req->height = first_height;
+               return;
+       }
+
+       Glib::RefPtr<Pango::Layout> tmp;
+       Glib::RefPtr<Gtk::Style> style = get_style ();
+       Pango::FontDescription font;
+
+       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);
+
+       if (_fixed_width) {
+               int ignored;
+               tmp->set_text ("-88:88:88:88");
+               tmp->get_pixel_size (_mode_width[Timecode], ignored);
+               tmp->set_text (" 8888|88|8888");
+               tmp->get_pixel_size (_mode_width[BBT], ignored);
+               tmp->set_text (" 88:88:88,888");
+               tmp->get_pixel_size (_mode_width[MinSec], ignored);
+               tmp->set_text (" 8888888888");
+               tmp->get_pixel_size (_mode_width[Frames], ignored);
+
+               /* this string is the longest thing we will ever display,
+                  it does not include the BBT bar char that may descend
+                        below the baseline.
+                        note; depending on BPM setting this may actually
+                        not be sufficient for 24h worth of BBT
+               */
+
+               tmp->set_text (" 8888888888::,");
+       } else {
+               switch (_mode) {
+               case Timecode:
+                       tmp->set_text ("-88:88:88:88");
+                       break;
+               case BBT:
+                       tmp->set_text (" 8888|88|8888");
+                       break;
+               case MinSec:
+                       tmp->set_text (" 88:88:88,888");
+                       break;
+               case Frames:
+                       tmp->set_text (" 8888888888");
+                       break;
+               }
+       }
+
+       tmp->get_pixel_size (req->width, req->height);
+
+       layout_height = req->height;
+       layout_width = req->width;
+
+       /* now tackle height, for which we need to know the height of the lower
+        * layout
+        */
+
+       if (_left_layout) {
 
-       clock_base.set_name (name);
+               int w;
 
-       for (std::map<Field, EventBox*>::iterator i = _eboxes.begin(); i != _eboxes.end(); ++i) {
-               i->second->set_name (name);
+               font.set_size ((int) lrint (font.get_size() * info_font_scale_factor));
+               font.set_weight (Pango::WEIGHT_NORMAL);
+               tmp->set_font_description (font);
+
+               /* we only care about height, so put as much stuff in here
+                  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.
+                */
+
+               req->height += info_height;
+               req->height += separator_height;
        }
 
-       for (std::map<Field, Label*>::iterator i = _labels.begin(); i != _labels.end(); ++i) {
-               i->second->set_name (name);
+       req->height += corner_radius/2.0;
+       req->width += corner_radius/2.0;
+
+       first_height = req->height;
+       first_width = req->width;
+}
+
+void
+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);
+
+       _layout->set_attributes (editing_attributes);
+}
+
+void
+AudioClock::start_edit (Field f)
+{
+       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;
 
-       colon1.set_name (name);
-       colon2.set_name (name);
-       colon3.set_name (name);
-       colon4.set_name (name);
-       colon5.set_name (name);
-       b1.set_name (name);
-       b2.set_name (name);
-       period1.set_name (name);
+       if (f) {
+               input_string = get_field (f);
+               show_edit_status (merge_input_and_edit_string ());
+               _layout->set_text (edit_string);
+       }
 
        queue_draw ();
+
+       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
-AudioClock::setup_events ()
+AudioClock::end_edit (bool modify)
 {
-       clock_base.set_flags (CAN_FOCUS);
-       
-       for (std::map<Field, EventBox*>::iterator i = _eboxes.begin(); i != _eboxes.end(); ++i) {
-               i->second->add_events (
-                       Gdk::BUTTON_PRESS_MASK |
-                       Gdk::BUTTON_RELEASE_MASK |
-                       Gdk::KEY_PRESS_MASK |
-                       Gdk::KEY_RELEASE_MASK |
-                       Gdk::FOCUS_CHANGE_MASK |
-                       Gdk::POINTER_MOTION_MASK |
-                       Gdk::SCROLL_MASK);
-               
-               i->second->set_flags (CAN_FOCUS);
-               i->second->signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_motion_notify_event), i->first));
-               i->second->signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_button_press_event), i->first));
-               i->second->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_button_release_event), i->first));
-               i->second->signal_scroll_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_button_scroll_event), i->first));
-               i->second->signal_key_press_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_key_press_event), i->first));
-               i->second->signal_key_release_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_key_release_event), i->first));
-               i->second->signal_focus_in_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_focus_in_event), i->first));
-               i->second->signal_focus_out_event().connect (sigc::bind (sigc::mem_fun (*this, &AudioClock::field_focus_out_event), i->first));
-       }
-
-       clock_base.signal_focus_in_event().connect (sigc::mem_fun (*this, &AudioClock::drop_focus_handler));
+       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 (0);
+                       /* edit attributes remain in use */
+               } else {
+
+                       editing = false;
+                       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);
+                               } else {
+                                       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;
+                       }
+
+                       set (pos, true);
+                       _layout->set_attributes (normal_attributes);
+                       ValueChanged(); /* EMIT_SIGNAL */
+               }
+
+       } else {
+
+               editing = false;
+               _layout->set_attributes (normal_attributes);
+               _layout->set_text (pre_edit_string);
+       }
+
+       queue_draw ();
+
+       if (!editing) {
+               drop_focus ();
+       }
 }
 
-bool
-AudioClock::drop_focus_handler (GdkEventFocus*)
+void
+AudioClock::drop_focus ()
 {
        Keyboard::magic_widget_drop_focus ();
-       return false;
+
+       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 ();
+               }
+       }
 }
 
-void
-AudioClock::on_realize ()
+framecnt_t
+AudioClock::parse_as_frames_distance (const std::string& str)
 {
-       HBox::on_realize ();
+       framecnt_t f;
+
+       if (sscanf (str.c_str(), "%" PRId64, &f) == 1) {
+               return f;
+       }
+
+       return 0;
+}
+
+framecnt_t
+AudioClock::parse_as_minsec_distance (const std::string& str)
+{
+       framecnt_t sr = _session->frame_rate();
+       int msecs;
+       int secs;
+       int mins;
+       int hrs;
+
+       switch (str.length()) {
+       case 0:
+               return 0;
+       case 1:
+       case 2:
+       case 3:
+       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));
+
+       case 6:
+               sscanf (str.c_str(), "%2" PRId32 "%" PRId32, &secs, &msecs);
+               return (secs * sr) + (msecs * (sr/1000));
+
+       case 7:
+               sscanf (str.c_str(), "%1" PRId32 "%2" PRId32 "%" PRId32, &mins, &secs, &msecs);
+               return (mins * 60 * sr) + (secs * sr) + (msecs * (sr/1000));
+
+       case 8:
+               sscanf (str.c_str(), "%2" PRId32 "%2" PRId32 "%" PRId32, &mins, &secs, &msecs);
+               return (mins * 60 * sr) + (secs * sr) + (msecs * (sr/1000));
+
+       case 9:
+               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));
+
+       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;
+       }
+
+       return 0;
+}
+
+framecnt_t
+AudioClock::parse_as_timecode_distance (const std::string& str)
+{
+       double fps = _session->timecode_frames_per_second();
+       framecnt_t sr = _session->frame_rate();
+       int frames;
+       int secs;
+       int mins;
+       int hrs;
+
+       switch (str.length()) {
+       case 0:
+               return 0;
+       case 1:
+       case 2:
+               sscanf (str.c_str(), "%" PRId32, &frames);
+               return lrint ((frames/(float)fps) * sr);
+
+       case 3:
+               sscanf (str.c_str(), "%1" PRId32 "%" PRId32, &secs, &frames);
+               return (secs * sr) + lrint ((frames/(float)fps) * sr);
+
+       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);
+
+       case 6:
+               sscanf (str.c_str(), "%2" PRId32 "%2" PRId32 "%" PRId32, &mins, &secs, &frames);
+               return (mins * 60 * sr) + (secs * sr) + lrint ((frames/(float)fps) * sr);
 
-       /* styles are not available until the widgets are bound to a window */
+       case 7:
+               sscanf (str.c_str(), "%1" PRId32 "%2" PRId32 "%2" PRId32 "%" PRId32, &hrs, &mins, &secs, &frames);
+               return (hrs * 3600 * sr) + (mins * 60 * sr) + (secs * sr) + lrint ((frames/(float)fps) * sr);
 
-       set_size_requests ();
+       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;
+       }
+
+       return 0;
+}
+
+framecnt_t
+AudioClock::parse_as_bbt_distance (const std::string&)
+{
+       return 0;
+}
+
+framecnt_t
+AudioClock::parse_as_distance (const std::string& instr)
+{
+       switch (_mode) {
+       case Timecode:
+               return parse_as_timecode_distance (instr);
+               break;
+       case Frames:
+               return parse_as_frames_distance (instr);
+               break;
+       case BBT:
+               return parse_as_bbt_distance (instr);
+               break;
+       case MinSec:
+               return parse_as_minsec_distance (instr);
+               break;
+       }
+       return 0;
 }
 
 void
-AudioClock::set (framepos_t when, bool force, framecnt_t offset, char which)
+AudioClock::end_edit_relative (bool add)
 {
-       if ((!force && !is_visible()) || _session == 0) {
+       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;
        }
 
-       bool const pdelta = Config->get_primary_clock_delta_edit_cursor ();
-       bool const sdelta = Config->get_secondary_clock_delta_edit_cursor ();
+       framecnt_t frames = parse_as_distance (input_string);
+
+       editing = false;
+
+       editing = false;
+       _layout->set_attributes (normal_attributes);
 
-       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 (frames != 0) {
+               if (add) {
+                       set (current_time() + frames, true);
+               } else {
+                       framepos_t c = current_time();
+
+                       if (c > frames) {
+                               set (c - frames, true);
+                       } else {
+                               set (0, true);
+                       }
+               }
+               ValueChanged (); /* EMIT SIGNAL */
        }
 
-       if (when == last_when && !force) {
+       input_string.clear ();
+       queue_draw ();
+       drop_focus ();
+}
+
+void
+AudioClock::session_configuration_changed (std::string p)
+{
+       if (p == "sync-source" || p == "external-sync") {
+               set (current_time(), true);
                return;
        }
 
-       if (which == 'p' && pdelta && !last_pdelta) {
-               set_widget_name("TransportClockDisplayDelta");
-               last_pdelta = true;
-       } else if (which == 'p' && !pdelta && last_pdelta) {
-               set_widget_name("TransportClockDisplay");
-               last_pdelta = false;
-       } else if (which == 's' && sdelta && !last_sdelta) {
-               set_widget_name("SecondaryClockDisplayDelta");
-               last_sdelta = true;
-       } else if (which == 's' && !sdelta && last_sdelta) {
-               set_widget_name("SecondaryClockDisplay");
-               last_sdelta = false;
+       if (p != "timecode-offset" && p != "timecode-offset-negative") {
+               return;
        }
 
+       framecnt_t current;
+
        switch (_mode) {
        case Timecode:
-               set_timecode (when, force);
+               if (is_duration) {
+                       current = current_duration ();
+               } else {
+                       current = current_time ();
+               }
+               set (current, true);
                break;
-
-       case BBT:
-               set_bbt (when, force);
+       default:
                break;
+       }
+}
+
+void
+AudioClock::set (framepos_t when, bool force, framecnt_t offset)
+{
+       if ((!force && !is_visible()) || _session == 0) {
+               return;
+       }
+
+       if (is_duration) {
+               when = when - offset;
+       }
+
+       if (when == last_when && !force) {
+               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 MinSec:
-               set_minsec (when, force);
-               break;
+               case BBT:
+                       set_bbt (when, force);
+                       break;
 
-       case Frames:
-               set_frames (when, force);
-               break;
+               case MinSec:
+                       if (_right_layout) {
+                               _right_layout->set_alignment(Pango::ALIGN_RIGHT);
+                       }
+                       set_minsec (when, force);
+                       break;
 
-       case Off:
-               break;
+               case Frames:
+                       set_frames (when, force);
+                       break;
+               }
        }
 
+       queue_draw ();
        last_when = when;
-
-       /* we're setting the time from a frames value, so keep it as the canonical value */
-       _canonical_time = when;
-       _canonical_time_is_displayed = false;
 }
 
 void
-AudioClock::session_configuration_changed (std::string p)
+AudioClock::set_slave_info ()
 {
-       if (p != "timecode-offset" && p != "timecode-offset-negative") {
+       if (!_left_layout || !_right_layout) {
                return;
        }
-       
-       framecnt_t current;
 
-       switch (_mode) {
-       case Timecode:
-               if (is_duration) {
-                       current = current_duration ();
-               } else {
-                       current = current_time ();
+       SyncSource sync_src = Config->get_sync_source();
+
+       if (_session->config.get_external_sync()) {
+               Slave* slave = _session->slave();
+
+               switch (sync_src) {
+               case JACK:
+                       _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                                               INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+                       _right_layout->set_text ("");
+                       break;
+               case LTC:
+               case MTC:
+               case MIDIClock:
+                       if (slave) {
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"green\">%2</span>",
+                                                       INFO_FONT_SIZE, dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position()));
+                               _right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                                                       INFO_FONT_SIZE, slave->approximate_current_delta()));
+                       } else {
+                               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                                                       INFO_FONT_SIZE, _("--pending--")));
+                               _right_layout->set_text ("");
+                       }
+                       break;
                }
-               set (current, true);
-               break;
-       default:
-               break;
+       } else {
+               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">INT/%2</span>",
+                                       INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+               _right_layout->set_text ("");
        }
 }
 
@@ -414,39 +1049,59 @@ void
 AudioClock::set_frames (framepos_t when, bool /*force*/)
 {
        char buf[32];
-       snprintf (buf, sizeof (buf), "%" PRId64, when);
-       _labels[AudioFrames]->set_text (buf);
+       bool negative = false;
 
-       if (frames_upper_info_label) {
+       if (_off) {
+               _layout->set_text ("\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012\u2012");
+
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
+               }
+
+               return;
+       }
+
+       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, "%.3fK", rate/1000.0f);
+                       sprintf (buf, "%" PRId64 "Hz", rate);
                }
 
-               if (frames_upper_info_label->get_text() != buf) {
-                       frames_upper_info_label->set_text (buf);
-               }
+               _left_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%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) {
-                       if (frames_lower_info_label->get_text () != _("none")) {
-                               frames_lower_info_label->set_text(_("none"));
-                       }
+                       _right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+                                       INFO_FONT_SIZE, _("pullup: \u2012")));
                } else {
-                       sprintf (buf, "%-6.4f", vid_pullup);
-                       if (frames_lower_info_label->get_text() != buf) {
-                               frames_lower_info_label->set_text (buf);
-                       }
+                       sprintf (buf, _("%+-6.4f%%"), vid_pullup);
+                       _right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"green\">%2</span>",
+                                       INFO_FONT_SIZE, buf));
                }
        }
 }
 
 void
-AudioClock::set_minsec (framepos_t when, bool force)
+AudioClock::set_minsec (framepos_t when, bool /*force*/)
 {
        char buf[32];
        framecnt_t left;
@@ -454,6 +1109,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");
+
+               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));
@@ -464,137 +1136,97 @@ 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());
 
-       if (force || hrs != ms_last_hrs) {
-               sprintf (buf, "%02d", hrs);
-               _labels[MS_Hours]->set_text (buf);
-               ms_last_hrs = hrs;
-       }
-
-       if (force || mins != ms_last_mins) {
-               sprintf (buf, "%02d", mins);
-               _labels[MS_Minutes]->set_text (buf);
-               ms_last_mins = mins;
-       }
-
-       if (force || secs != ms_last_secs) {
-               sprintf (buf, "%02d", secs);
-               _labels[MS_Seconds]->set_text (buf);
-               ms_last_secs = secs;
+       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);
        }
 
-       if (force || millisecs != ms_last_millisecs) {
-               sprintf (buf, "%03d", millisecs);
-               _labels[MS_Milliseconds]->set_text (buf);
-               ms_last_millisecs = 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 timecode;
-
-       if (is_duration) {
-               _session->timecode_duration (when, timecode);
-       } else {
-               _session->timecode_time (when, timecode);
-       }
-
-       if (force || timecode.hours != last_hrs || timecode.negative != last_negative) {
-               if (timecode.negative) {
-                       sprintf (buf, "-%02" PRIu32, timecode.hours);
-               } else {
-                       sprintf (buf, " %02" PRIu32, timecode.hours);
+       Timecode::Time TC;
+       bool negative = false;
+
+       if (_off) {
+               _layout->set_text ("\u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012");
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
                }
-               _labels[Timecode_Hours]->set_text (buf);
-               last_hrs = timecode.hours;
-               last_negative = timecode.negative;
-       }
 
-       if (force || timecode.minutes != last_mins) {
-               sprintf (buf, "%02" PRIu32, timecode.minutes);
-               _labels[Timecode_Minutes]->set_text (buf);
-               last_mins = timecode.minutes;
+               return;
        }
 
-       if (force || timecode.seconds != last_secs) {
-               sprintf (buf, "%02" PRIu32, timecode.seconds);
-               _labels[Timecode_Seconds]->set_text (buf);
-               last_secs = timecode.seconds;
+       if (when < 0) {
+               when = -when;
+               negative = true;
        }
 
-       if (force || timecode.frames != last_frames) {
-               sprintf (buf, "%02" PRIu32, timecode.frames);
-               _labels[Timecode_Frames]->set_text (buf);
-               last_frames = timecode.frames;
+       if (is_duration) {
+               _session->timecode_duration (when, TC);
+       } else {
+               _session->timecode_time (when, TC);
        }
 
-       if (timecode_upper_info_label) {
-               double timecode_frames = _session->timecode_frames_per_second();
+       TC.negative = TC.negative || negative;
 
-               if (fmod(timecode_frames, 1.0) == 0.0) {
-                       sprintf (buf, "%u", int (timecode_frames));
-               } else {
-                       sprintf (buf, "%.2f", timecode_frames);
-               }
-
-               if (timecode_upper_info_label->get_text() != buf) {
-                       timecode_upper_info_label->set_text (buf);
-               }
-
-               if ((fabs(timecode_frames - 29.97) < 0.0001) || timecode_frames == 30) {
-                       if (_session->timecode_drop_frames()) {
-                               sprintf (buf, "DF");
-                       } else {
-                               sprintf (buf, "NDF");
-                       }
-               } else {
-                       // there is no drop frame alternative
-                       buf[0] = '\0';
-               }
+       _layout->set_text (Timecode::timecode_format_time(TC));
 
-               if (timecode_lower_info_label->get_text() != buf) {
-                       timecode_lower_info_label->set_text (buf);
-               }
-       }
+       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;
+       Timecode::BBT_Time BBT;
+       bool negative = false;
+
+       if (_off) {
+               _layout->set_text ("\u2012\u2012\u2012|\u2012\u2012|\u2012\u2012\u2012\u2012");
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
+               }
+               return;
+       }
+
+       if (when < 0) {
+               when = -when;
+               negative = true;
+       }
 
        /* handle a common case */
        if (is_duration) {
                if (when == 0) {
-                       bbt.bars = 0;
-                       bbt.beats = 0;
-                       bbt.ticks = 0;
+                       BBT.bars = 0;
+                       BBT.beats = 0;
+                       BBT.ticks = 0;
                } else {
-                       _session->tempo_map().bbt_time (when, bbt);
-                       bbt.bars--;
-                       bbt.beats--;
+                       _session->tempo_map().bbt_time (when, BBT);
+                       BBT.bars--;
+                       BBT.beats--;
                }
        } else {
-               _session->tempo_map().bbt_time (when, bbt);
+               _session->tempo_map().bbt_time (when, BBT);
        }
 
-       sprintf (buf, "%03" PRIu32, bbt.bars);
-       if (force || _labels[Bars]->get_text () != buf) {
-               _labels[Bars]->set_text (buf);
-       }
-       sprintf (buf, "%02" PRIu32, bbt.beats);
-       if (force || _labels[Beats]->get_text () != buf) {
-               _labels[Beats]->set_text (buf);
-       }
-       sprintf (buf, "%04" PRIu32, bbt.ticks);
-       if (force || _labels[Ticks]->get_text () != buf) {
-               _labels[Ticks]->set_text (buf);
+       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);
        }
 
-       if (bbt_upper_info_label) {
+       _layout->set_text (buf);
+
+       if (_right_layout) {
                framepos_t pos;
 
                if (bbt_reference_time < 0) {
@@ -606,13 +1238,12 @@ 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());
-               if (bbt_lower_info_label->get_text() != buf) {
-                       bbt_lower_info_label->set_text (buf);
-               }
-               sprintf (buf, "%g|%g", m.meter().beats_per_bar(), m.meter().note_divisor());
-               if (bbt_upper_info_label->get_text() != buf) {
-                       bbt_upper_info_label->set_text (buf);
-               }
+               _left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"green\">%2</span>",
+                                       INFO_FONT_SIZE, buf));
+
+               sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
+               _right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"green\">%2</span>",
+                                       INFO_FONT_SIZE, buf));
        }
 }
 
@@ -625,14 +1256,23 @@ AudioClock::set_session (Session *s)
 
                _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
 
-               XMLProperty* prop;
+               const XMLProperty* prop;
                XMLNode* node = _session->extra_xml (X_("ClockModes"));
                AudioClock::Mode amode;
 
                if (node) {
-                       if ((prop = node->property (_name)) != 0) {
-                               amode = AudioClock::Mode (string_2_enum (prop->value(), amode));
-                               set_mode (amode);
+                       for (XMLNodeList::const_iterator i = node->children().begin(); i != node->children().end(); ++i) {
+                               if ((prop = (*i)->property (X_("name"))) && prop->value() == _name) {
+
+                                       if ((prop = (*i)->property (X_("mode"))) != 0) {
+                                               amode = AudioClock::Mode (string_2_enum (prop->value(), amode));
+                                               set_mode (amode);
+                                       }
+                                       if ((prop = (*i)->property (X_("on"))) != 0) {
+                                               set_off (!string_is_affirmative (prop->value()));
+                                       }
+                                       break;
+                               }
                        }
                }
 
@@ -640,46 +1280,17 @@ AudioClock::set_session (Session *s)
        }
 }
 
-void
-AudioClock::focus ()
-{
-       switch (_mode) {
-       case Timecode:
-               _eboxes[Timecode_Hours]->grab_focus ();
-               break;
-
-       case BBT:
-               _eboxes[Bars]->grab_focus ();
-               break;
-
-       case MinSec:
-               _eboxes[MS_Hours]->grab_focus ();
-               break;
-
-       case Frames:
-               _eboxes[AudioFrames]->grab_focus ();
-               break;
-
-       case Off:
-               break;
-       }
-}
-
-
 bool
-AudioClock::field_key_press_event (GdkEventKey */*ev*/, Field /*field*/)
+AudioClock::on_key_press_event (GdkEventKey* ev)
 {
-       /* all key activity is handled on key release */
-       return true;
-}
+       if (!editing) {
+               return false;
+       }
 
-bool
-AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
-{
-       Label *label = _labels[field];
        string new_text;
        char new_char = 0;
-       bool move_on = false;
+       int highlight_length;
+       framepos_t pos;
 
        switch (ev->keyval) {
        case GDK_0:
@@ -723,208 +1334,281 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
                new_char = '9';
                break;
 
-       case GDK_period:
-       case GDK_KP_Decimal:
-               if (_mode == MinSec && field == MS_Seconds) {
-                       new_char = '.';
-               } else {
-                       return false;
-               }
+       case GDK_minus:
+       case GDK_KP_Subtract:
+               end_edit_relative (false);
+               return true;
+               break;
+
+       case GDK_plus:
+       case GDK_KP_Add:
+               end_edit_relative (true);
+               return true;
                break;
 
        case GDK_Tab:
        case GDK_Return:
        case GDK_KP_Enter:
-               move_on = true;
+               end_edit (true);
+               return true;
                break;
 
        case GDK_Escape:
-               key_entry_state = 0;
-               clock_base.grab_focus ();
+               end_edit (false);
                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 (!move_on) {
-
-               if (key_entry_state == 0) {
+       if (!insert_map.empty() && (input_string.length() >= insert_map.size())) {
+               /* too many digits: eat the key event, but do nothing with it */
+               return true;
+       }
 
-                       /* initialize with a fresh new string */
+       input_string.push_back (new_char);
 
-                       if (field != AudioFrames) {
-                               for (uint32_t xn = 0; xn < field_length[field] - 1; ++xn) {
-                                       new_text += '0';
-                               }
-                       } else {
-                               new_text = "";
-                       }
+  use_input_string:
 
+       switch (_mode) {
+       case Frames:
+               /* 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 {
-
-                       string existing = label->get_text();
-                       if (existing.length() >= field_length[field]) {
-                               new_text = existing.substr (1, field_length[field] - 1);
-                       } else {
-                               new_text = existing.substr (0, field_length[field] - 1);
-                       }
+                       edit_string.push_back (new_char);
                }
-
-               new_text += new_char;
-               label->set_text (new_text);
-               _canonical_time_is_displayed = true;
-               key_entry_state++;
-       }
-
-       if (key_entry_state == field_length[field]) {
-               move_on = true;
-       }
-
-       if (move_on) {
-
-               if (key_entry_state) {
-
-                       switch (field) {
-                       case Timecode_Hours:
-                       case Timecode_Minutes:
-                       case Timecode_Seconds:
-                       case Timecode_Frames:
-                               // Check Timecode fields for sanity (may also adjust fields)
-                               timecode_sanitize_display();
-                               break;
-                       case Bars:
-                       case Beats:
-                       case Ticks:
-                               // Bars should never be, unless this clock is for a duration
-                               if (atoi (_labels[Bars]->get_text()) == 0 && !is_duration) {
-                                       _labels[Bars]->set_text("001");
-                                       _canonical_time_is_displayed = true;
-                               }
-                               //  beats should never be 0, unless this clock is for a duration
-                               if (atoi (_labels[Beats]->get_text()) == 0 && !is_duration) {
-                                       _labels[Beats]->set_text("01");
-                                       _canonical_time_is_displayed = true;
-                               }
-                               break;
-                       default:
-                               break;
-                       }
-
-                       ValueChanged(); /* EMIT_SIGNAL */
+               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;
 
-               /* move on to the next field.
-                */
-
-               switch (field) {
-
-                       /* Timecode */
+       default:
+               highlight_length = merge_input_and_edit_string ();
+       }
 
-               case Timecode_Hours:
-                       _eboxes[Timecode_Minutes]->grab_focus ();
-                       break;
-               case Timecode_Minutes:
-                       _eboxes[Timecode_Seconds]->grab_focus ();
-                       break;
-               case Timecode_Seconds:
-                       _eboxes[Timecode_Frames]->grab_focus ();
-                       break;
-               case Timecode_Frames:
-                       clock_base.grab_focus ();
-                       break;
+       show_edit_status (highlight_length);
+       _layout->set_text (edit_string);
+       queue_draw ();
 
-               /* audio frames */
-               case AudioFrames:
-                       clock_base.grab_focus ();
-                       break;
+       return true;
+}
 
-               /* Min:Sec */
+int
+AudioClock::merge_input_and_edit_string ()
+{
+       /* merge with pre-edit-string into edit string */
 
-               case MS_Hours:
-                       _eboxes[MS_Minutes]->grab_focus ();
-                       break;
-               case MS_Minutes:
-                       _eboxes[MS_Seconds]->grab_focus ();
-                       break;
-               case MS_Seconds:
-                       _eboxes[MS_Milliseconds]->grab_focus ();
-                       break;
-               case MS_Milliseconds:
-                       clock_base.grab_focus ();
-                       break;
+       edit_string = pre_edit_string;
 
-               /* BBT */
+       if (input_string.empty()) {
+               return 0;
+       }
 
-               case Bars:
-                       _eboxes[Beats]->grab_focus ();
-                       break;
-               case Beats:
-                       _eboxes[Ticks]->grab_focus ();
-                       break;
-               case Ticks:
-                       clock_base.grab_focus ();
-                       break;
+       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];
+}
 
-               default:
-                       break;
-               }
 
+bool
+AudioClock::on_key_release_event (GdkEventKey *ev)
+{
+       if (!editing) {
+               return false;
        }
 
-       //if user hit Enter, lose focus
+       /* 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:
-               clock_base.grab_focus ();
+       case GDK_Escape:
+       case GDK_minus:
+       case GDK_plus:
+       case GDK_KP_Add:
+       case GDK_KP_Subtract:
+               return true;
+       default:
+               return false;
        }
-
-       return true;
 }
 
-bool
-AudioClock::field_focus_in_event (GdkEventFocus */*ev*/, Field field)
+AudioClock::Field
+AudioClock::index_to_field (int index) const
 {
-       key_entry_state = 0;
-
-       Keyboard::magic_widget_grab_focus ();
-
-       _eboxes[field]->set_flags (HAS_FOCUS);
-       _eboxes[field]->set_state (STATE_ACTIVE);
+       switch (_mode) {
+       case Timecode:
+               if (index < 4) {
+                       return Timecode_Hours;
+               } else if (index < 7) {
+                       return Timecode_Minutes;
+               } else if (index < 10) {
+                       return Timecode_Seconds;
+               } else {
+                       return Timecode_Frames;
+               }
+               break;
+       case BBT:
+               if (index < 5) {
+                       return Bars;
+               } else if (index < 7) {
+                       return Beats;
+               } else {
+                       return Ticks;
+               }
+               break;
+       case MinSec:
+               if (index < 3) {
+                       return Timecode_Hours;
+               } else if (index < 6) {
+                       return MS_Minutes;
+               } else if (index < 9) {
+                       return MS_Seconds;
+               } else {
+                       return MS_Milliseconds;
+               }
+               break;
+       case Frames:
+               return AudioFrames;
+               break;
+       }
 
-       return false;
+       return Field (0);
 }
 
 bool
-AudioClock::field_focus_out_event (GdkEventFocus */*ev*/, Field field)
+AudioClock::on_button_press_event (GdkEventButton *ev)
 {
-       _eboxes[field]->unset_flags (HAS_FOCUS);
-       _eboxes[field]->set_state (STATE_NORMAL);
+       switch (ev->button) {
+       case 1:
+               if (editable && !_off) {
+                       int index;
+                       int trailing;
+                       int y;
+                       int x;
+
+                       /* the text has been centered vertically, so adjust
+                        * x and y.
+                        */
+                       int xcenter = !_fixed_width || layout_x_offset > corner_radius/4.0 ? 0 : (get_width() - _mode_width[_mode]) /2;
+
+                       y = ev->y - ((upper_height - layout_height)/2);
+                       x = ev->x - layout_x_offset - 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 ,
+                                        GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK),
+                                        NULL,NULL,ev->time);
+                       drag_accum = 0;
+                       drag_start_y = ev->y;
+                       drag_y = ev->y;
+               }
+               break;
 
-       Keyboard::magic_widget_drop_focus ();
+       default:
+               return false;
+               break;
+       }
 
-       return false;
+       return true;
 }
 
 bool
-AudioClock::field_button_release_event (GdkEventButton *ev, Field field)
+AudioClock::on_button_release_event (GdkEventButton *ev)
 {
-       if (dragging) {
-               gdk_pointer_ungrab (GDK_CURRENT_TIME);
-               dragging = false;
-               if (ev->y > drag_start_y+1 || ev->y < drag_start_y-1 || Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)){
-                       // we actually dragged so return without setting editing focus, or we shift clicked
-                       return true;
-               }
-       }
-
-       if (!editable) {
-               if (ops_menu == 0) {
-                       build_ops_menu ();
+       if (editable && !_off) {
+               if (dragging) {
+                       gdk_pointer_ungrab (GDK_CURRENT_TIME);
+                       dragging = false;
+                       if (ev->y > drag_start_y+1 || ev->y < drag_start_y-1 || Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)){
+                               // we actually dragged so return without
+                               // setting editing focus, or we shift clicked
+                               return true;
+                       } else {
+                               if (ev->button == 1) {
+
+                                       if (_edit_by_click_field) {
+
+                                               int xcenter = !_fixed_width || layout_x_offset > corner_radius/4.0 ? 0 : (get_width() - _mode_width[_mode]) /2;
+                                               int index = 0;
+                                               int trailing;
+                                               int y = ev->y - ((upper_height - layout_height)/2);
+                                               int x = ev->x - layout_x_offset - 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 ();
+                                       }
+                               }
+                       }
                }
-               ops_menu->popup (1, ev->time);
-               return true;
        }
 
        if (Keyboard::is_context_menu_event (ev)) {
@@ -935,102 +1619,79 @@ AudioClock::field_button_release_event (GdkEventButton *ev, Field field)
                return true;
        }
 
-       switch (ev->button) {
-       case 1:
-               _eboxes[field]->grab_focus ();
-               break;
+       return false;
+}
 
-       default:
-               break;
+bool
+AudioClock::on_focus_out_event (GdkEventFocus* ev)
+{
+       bool ret = CairoWidget::on_focus_out_event (ev);
+
+       if (editing) {
+               end_edit (false);
        }
 
-       return true;
+       return ret;
 }
 
 bool
-AudioClock::field_button_press_event (GdkEventButton *ev, Field /*field*/)
+AudioClock::on_scroll_event (GdkEventScroll *ev)
 {
-       if (_session == 0) {
+       int index;
+       int trailing;
+
+       if (editing || _session == 0 || !editable || _off) {
                return false;
        }
 
-       framepos_t frames = 0;
-
-       switch (ev->button) {
-       case 1:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                       set (frames, true);
-                       ValueChanged (); /* EMIT_SIGNAL */
-                                       }
-
-               /* make absolutely sure that the pointer is grabbed */
-               gdk_pointer_grab(ev->window,false ,
-                                GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK),
-                                NULL,NULL,ev->time);
-               dragging = true;
-               drag_accum = 0;
-               drag_start_y = ev->y;
-               drag_y = ev->y;
-               break;
-
-       case 2:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                       set (frames, true);
-                       ValueChanged (); /* EMIT_SIGNAL */
-               }
-               break;
-
-       case 3:
-               /* used for context sensitive menu */
-               return false;
-               break;
+       int y;
+       int x;
 
-       default:
-               return false;
-               break;
-       }
+       /* the text has been centered vertically, so adjust
+        * x and y.
+        */
 
-       return true;
-}
+       int xcenter = !_fixed_width || layout_x_offset > corner_radius/4.0 ? 0 : (get_width() - _mode_width[_mode]) /2;
+       y = ev->y - ((upper_height - layout_height)/2);
+       x = ev->x - layout_x_offset - xcenter;
 
-bool
-AudioClock::field_button_scroll_event (GdkEventScroll *ev, Field field)
-{
-       if (_session == 0) {
+       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;
 
        switch (ev->direction) {
 
        case GDK_SCROLL_UP:
-              frames = get_frames (field);
-              if (frames != 0) {
-                     if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                            frames *= 10;
-                     }
-                     set (current_time() + frames, true);
-                     ValueChanged (); /* EMIT_SIGNAL */
-              }
-              break;
+               frames = get_frame_step (f);
+               if (frames != 0) {
+                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                               frames *= 10;
+                       }
+                       set (current_time() + frames, true);
+                       ValueChanged (); /* EMIT_SIGNAL */
+               }
+               break;
 
        case GDK_SCROLL_DOWN:
-              frames = get_frames (field);
-              if (frames != 0) {
-                     if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                            frames *= 10;
-                     }
-
-                     if ((double)current_time() - (double)frames < 0.0) {
-                            set (0, true);
-                     } else {
-                            set (current_time() - frames, true);
-                     }
-
-                     ValueChanged (); /* EMIT_SIGNAL */
-              }
-              break;
+               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) {
+                               set (0, true);
+                       } else {
+                               set (current_time() - frames, true);
+                       }
+
+                       ValueChanged (); /* EMIT_SIGNAL */
+               }
+               break;
 
        default:
                return false;
@@ -1041,15 +1702,14 @@ AudioClock::field_button_scroll_event (GdkEventScroll *ev, Field field)
 }
 
 bool
-AudioClock::field_motion_notify_event (GdkEventMotion *ev, Field field)
+AudioClock::on_motion_notify_event (GdkEventMotion *ev)
 {
-       if (_session == 0 || !dragging) {
+       if (editing || _session == 0 || !dragging) {
                return false;
        }
 
        float pixel_frame_scale_factor = 0.2f;
 
-/*
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier))  {
                pixel_frame_scale_factor = 0.1f;
        }
@@ -1060,629 +1720,241 @@ AudioClock::field_motion_notify_event (GdkEventMotion *ev, Field field)
 
                pixel_frame_scale_factor = 0.025f;
        }
-*/
+
        double y_delta = ev->y - drag_y;
 
        drag_accum +=  y_delta*pixel_frame_scale_factor;
 
        drag_y = ev->y;
 
-       if (trunc(drag_accum) != 0) {
+       if (trunc (drag_accum) != 0) {
 
                framepos_t frames;
                framepos_t pos;
                int dir;
                dir = (drag_accum < 0 ? 1:-1);
                pos = current_time();
-               frames = get_frames (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 computer-land
-
+                       set ((framepos_t) floor (pos - drag_accum * frames), false); // minus because up is negative in GTK
                } else {
                        set (0 , false);
-
                }
 
                drag_accum= 0;
                ValueChanged();  /* EMIT_SIGNAL */
-
-
        }
 
        return true;
 }
 
 framepos_t
-AudioClock::get_frames (Field field, framepos_t pos, int dir)
+AudioClock::get_frame_step (Field field, framepos_t pos, int dir)
 {
-       framecnt_t frames = 0;
-       Timecode::BBT_Time bbt;
+       framecnt_t f = 0;
+       Timecode::BBT_Time BBT;
        switch (field) {
        case Timecode_Hours:
-               frames = (framecnt_t) floor (3600.0 * _session->frame_rate());
+               f = (framecnt_t) floor (3600.0 * _session->frame_rate());
                break;
        case Timecode_Minutes:
-               frames = (framecnt_t) floor (60.0 * _session->frame_rate());
+               f = (framecnt_t) floor (60.0 * _session->frame_rate());
                break;
        case Timecode_Seconds:
-               frames = _session->frame_rate();
+               f = _session->frame_rate();
                break;
        case Timecode_Frames:
-               frames = (framecnt_t) floor (_session->frame_rate() / _session->timecode_frames_per_second());
+               f = (framecnt_t) floor (_session->frame_rate() / _session->timecode_frames_per_second());
                break;
 
        case AudioFrames:
-               frames = 1;
+               f = 1;
                break;
 
        case MS_Hours:
-               frames = (framecnt_t) floor (3600.0 * _session->frame_rate());
+               f = (framecnt_t) floor (3600.0 * _session->frame_rate());
                break;
        case MS_Minutes:
-               frames = (framecnt_t) floor (60.0 * _session->frame_rate());
+               f = (framecnt_t) floor (60.0 * _session->frame_rate());
                break;
        case MS_Seconds:
-               frames = (framecnt_t) _session->frame_rate();
+               f = (framecnt_t) _session->frame_rate();
                break;
        case MS_Milliseconds:
-               frames = (framecnt_t) floor (_session->frame_rate() / 1000.0);
+               f = (framecnt_t) floor (_session->frame_rate() / 1000.0);
                break;
 
        case Bars:
-               bbt.bars = 1;
-               bbt.beats = 0;
-               bbt.ticks = 0;
-               frames = _session->tempo_map().bbt_duration_at(pos,bbt,dir);
+               BBT.bars = 1;
+               BBT.beats = 0;
+               BBT.ticks = 0;
+               f = _session->tempo_map().bbt_duration_at (pos,BBT,dir);
                break;
        case Beats:
-               bbt.bars = 0;
-               bbt.beats = 1;
-               bbt.ticks = 0;
-               frames = _session->tempo_map().bbt_duration_at(pos,bbt,dir);
+               BBT.bars = 0;
+               BBT.beats = 1;
+               BBT.ticks = 0;
+               f = _session->tempo_map().bbt_duration_at(pos,BBT,dir);
                break;
        case Ticks:
-               bbt.bars = 0;
-               bbt.beats = 0;
-               bbt.ticks = 1;
-               frames = _session->tempo_map().bbt_duration_at(pos,bbt,dir);
+               BBT.bars = 0;
+               BBT.beats = 0;
+               BBT.ticks = 1;
+               f = _session->tempo_map().bbt_duration_at(pos,BBT,dir);
+               break;
+       default:
+               error << string_compose (_("programming error: %1"), "attempt to get frames from non-text field!") << endmsg;
+               f = 0;
                break;
        }
 
-       return frames;
+       return f;
 }
 
 framepos_t
-AudioClock::current_time (framepos_t pos) const
+AudioClock::current_time (framepos_t) const
+{
+       return last_when;
+}
+
+framepos_t
+AudioClock::current_duration (framepos_t pos) const
 {
-       if (!_canonical_time_is_displayed) {
-               return _canonical_time;
-       }
-       
        framepos_t ret = 0;
 
        switch (_mode) {
        case Timecode:
-               ret = timecode_frame_from_display ();
+               ret = last_when;
                break;
        case BBT:
-               ret = bbt_frame_from_display (pos);
+               ret = frame_duration_from_bbt_string (pos, _layout->get_text());
                break;
 
        case MinSec:
-               ret = minsec_frame_from_display ();
+               ret = last_when;
                break;
 
        case Frames:
-               ret = audio_frame_from_display ();
-               break;
-
-       case Off:
+               ret = last_when;
                break;
        }
 
        return ret;
 }
 
-framepos_t
-AudioClock::current_duration (framepos_t pos) const
+bool
+AudioClock::bbt_validate_edit (const string& str)
 {
-       framepos_t ret = 0;
+       AnyTime any;
 
-       switch (_mode) {
-       case Timecode:
-               ret = timecode_frame_from_display ();
-               break;
-       case BBT:
-               ret = bbt_frame_duration_from_display (pos);
-               break;
+       if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks) != 3) {
+               return false;
+       }
 
-       case MinSec:
-               ret = minsec_frame_from_display ();
-               break;
+       if (any.bbt.ticks > Timecode::BBT_Time::ticks_per_beat) {
+               return false;
+       }
 
-       case Frames:
-               ret = audio_frame_from_display ();
-               break;
+       if (!is_duration && any.bbt.bars == 0) {
+               return false;
+       }
 
-       case Off:
-               break;
+       if (!is_duration && any.bbt.beats == 0) {
+               return false;
        }
 
-       return ret;
+       return true;
 }
 
-void
-AudioClock::timecode_sanitize_display()
+bool
+AudioClock::timecode_validate_edit (const string&)
 {
-       // Check Timecode fields for sanity, possibly adjusting values
-       if (atoi (_labels[Timecode_Minutes]->get_text()) > 59) {
-               _labels[Timecode_Minutes]->set_text("59");
-               _canonical_time_is_displayed = true;
+       Timecode::Time TC;
+
+       if (sscanf (_layout->get_text().c_str(), "%" PRId32 ":%" PRId32 ":%" PRId32 ":%" PRId32,
+                   &TC.hours, &TC.minutes, &TC.seconds, &TC.frames) != 4) {
+               return false;
        }
 
-       if (atoi (_labels[Timecode_Seconds]->get_text()) > 59) {
-               _labels[Timecode_Seconds]->set_text("59");
-               _canonical_time_is_displayed = true;
+       if (TC.hours > 23U || TC.minutes > 59U || TC.seconds > 59U) {
+               return false;
        }
 
-       switch ((long)rint(_session->timecode_frames_per_second())) {
-       case 24:
-               if (atoi (_labels[Timecode_Frames]->get_text()) > 23) {
-                       _labels[Timecode_Frames]->set_text("23");
-                       _canonical_time_is_displayed = true;
-               }
-               break;
-       case 25:
-               if (atoi (_labels[Timecode_Frames]->get_text()) > 24) {
-                       _labels[Timecode_Frames]->set_text("24");
-                       _canonical_time_is_displayed = true;
-               }
-               break;
-       case 30:
-               if (atoi (_labels[Timecode_Frames]->get_text()) > 29) {
-                       _labels[Timecode_Frames]->set_text("29");
-                       _canonical_time_is_displayed = true;
-               }
-               break;
-       default:
-               break;
+       if (TC.frames > (uint32_t) rint (_session->timecode_frames_per_second()) - 1) {
+               return false;
        }
 
        if (_session->timecode_drop_frames()) {
-               if ((atoi (_labels[Timecode_Minutes]->get_text()) % 10) && (atoi (_labels[Timecode_Seconds]->get_text()) == 0) && (atoi (_labels[Timecode_Frames]->get_text()) < 2)) {
-                       _labels[Timecode_Frames]->set_text("02");
-                       _canonical_time_is_displayed = true;
+               if (TC.minutes % 10 && TC.seconds == 0U && TC.frames < 2U) {
+                       return false;
                }
        }
+
+       return true;
 }
 
-/** This is necessary because operator[] isn't const with std::map.
- *  @param f Field.
- *  @return Label widget.
- */
-Label const *
-AudioClock::label (Field f) const
+bool
+AudioClock::minsec_validate_edit (const string& str)
 {
-       std::map<Field, Label*>::const_iterator i = _labels.find (f);
-       assert (i != _labels.end ());
+       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 i->second;
+       return true;
 }
 
 framepos_t
-AudioClock::timecode_frame_from_display () const
+AudioClock::frames_from_timecode_string (const string& str) const
 {
        if (_session == 0) {
                return 0;
        }
 
-       Timecode::Time timecode;
+       Timecode::Time TC;
        framepos_t sample;
 
-       timecode.hours = atoi (label (Timecode_Hours)->get_text());
-       timecode.minutes = atoi (label (Timecode_Minutes)->get_text());
-       timecode.seconds = atoi (label (Timecode_Seconds)->get_text());
-       timecode.frames = atoi (label (Timecode_Frames)->get_text());
-       timecode.rate = _session->timecode_frames_per_second();
-       timecode.drop= _session->timecode_drop_frames();
-
-       _session->timecode_to_sample (timecode, sample, false /* use_offset */, false /* use_subframes */ );
-
-
-#if 0
-#define Timecode_SAMPLE_TEST_1
-#define Timecode_SAMPLE_TEST_2
-#define Timecode_SAMPLE_TEST_3
-#define Timecode_SAMPLE_TEST_4
-#define Timecode_SAMPLE_TEST_5
-#define Timecode_SAMPLE_TEST_6
-#define Timecode_SAMPLE_TEST_7
-
-       // Testcode for timecode<->sample conversions (P.S.)
-       Timecode::Time timecode1;
-       framepos_t sample1;
-       framepos_t oldsample = 0;
-       Timecode::Time timecode2;
-       framecnt_t sample_increment;
-
-       sample_increment = (framecnt_t)rint(_session->frame_rate() / _session->timecode_frames_per_second);
-
-#ifdef Timecode_SAMPLE_TEST_1
-       // Test 1: use_offset = false, use_subframes = false
-       cout << "use_offset = false, use_subframes = false" << endl;
-       for (int i = 0; i < 108003; i++) {
-               _session->timecode_to_sample( timecode1, sample1, false /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, false /* use_offset */, false /* use_subframes */ );
-
-               if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
-                       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-                       cout << "timecode1: " << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode1: " << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#ifdef Timecode_SAMPLE_TEST_2
-       // Test 2: use_offset = true, use_subframes = false
-       cout << "use_offset = true, use_subframes = false" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 108003; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-               if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
-                       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#ifdef Timecode_SAMPLE_TEST_3
-       // Test 3: use_offset = true, use_subframes = false, decrement
-       cout << "use_offset = true, use_subframes = false, decrement" << endl;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 108003; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-               if ((i > 0) && ( ((oldsample - sample1) != sample_increment) && ((oldsample - sample1) != (sample_increment + 1)) && ((oldsample - sample1) != (sample_increment - 1)))) {
-                       cout << "ERROR: sample increment not right: " << (oldsample - sample1) << " != " << sample_increment << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_decrement( timecode1 );
+       if (sscanf (str.c_str(), "%d:%d:%d:%d", &TC.hours, &TC.minutes, &TC.seconds, &TC.frames) != 4) {
+               error << string_compose (_("programming error: %1 %2"), "badly formatted timecode clock string", str) << endmsg;
+               return 0;
        }
 
-       cout << "sample_decrement: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-
-#ifdef Timecode_SAMPLE_TEST_4
-       // Test 4: use_offset = true, use_subframes = true
-       cout << "use_offset = true, use_subframes = true" << endl;
-
-       for (long sub = 5; sub < 80; sub += 5) {
-               timecode1.hours = 0;
-               timecode1.minutes = 0;
-               timecode1.seconds = 0;
-               timecode1.frames = 0;
-               timecode1.subframes = 0;
-               sample1 = oldsample = (sample_increment * sub) / 80;
-
-               _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, true /* use_subframes */ );
-
-               cout << "starting at sample: " << sample1 << " -> ";
-               cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-               for (int i = 0; i < 108003; i++) {
-                       _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, true /* use_subframes */ );
-                       _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, true /* use_subframes */ );
-
-                       if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
-                               cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               //break;
-                       }
-
-                       if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames || timecode2.subframes != timecode1.subframes) {
-                               cout << "ERROR: timecode2 not equal timecode1" << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               break;
-                       }
-                       oldsample = sample1;
-                       _session->timecode_increment( timecode1 );
-               }
-
-               cout << "sample_increment: " << sample_increment << endl;
-               cout << "sample: " << sample1 << " -> ";
-               cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-               for (int i = 0; i < 108003; i++) {
-                       _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, true /* use_subframes */ );
-                       _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, true /* use_subframes */ );
-
-                       if ((i > 0) && ( ((oldsample - sample1) != sample_increment) && ((oldsample - sample1) != (sample_increment + 1)) && ((oldsample - sample1) != (sample_increment - 1)))) {
-                               cout << "ERROR: sample increment not right: " << (oldsample - sample1) << " != " << sample_increment << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               //break;
-                       }
-
-                       if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames || timecode2.subframes != timecode1.subframes) {
-                               cout << "ERROR: timecode2 not equal timecode1" << endl;
-                               cout << "timecode1: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                               cout << "sample: " << sample1 << endl;
-                               cout << "sample: " << sample1 << " -> ";
-                               cout << "timecode2: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                               break;
-                       }
-                       oldsample = sample1;
-                       _session->timecode_decrement( timecode1 );
-               }
-
-               cout << "sample_decrement: " << sample_increment << endl;
-               cout << "sample: " << sample1 << " -> ";
-               cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-       }
-#endif
-
-
-#ifdef Timecode_SAMPLE_TEST_5
-       // Test 5: use_offset = true, use_subframes = false, increment seconds
-       cout << "use_offset = true, use_subframes = false, increment seconds" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-       sample_increment = _session->frame_rate();
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 3600; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-//     if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1))))
-//     {
-//       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-//       break;
-//     }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment_seconds( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-
-#ifdef Timecode_SAMPLE_TEST_6
-       // Test 6: use_offset = true, use_subframes = false, increment minutes
-       cout << "use_offset = true, use_subframes = false, increment minutes" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-       sample_increment = _session->frame_rate() * 60;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 60; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-//     if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1))))
-//     {
-//       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-//       break;
-//     }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment_minutes( timecode1 );
-       }
-
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
-
-#ifdef Timecode_SAMPLE_TEST_7
-       // Test 7: use_offset = true, use_subframes = false, increment hours
-       cout << "use_offset = true, use_subframes = false, increment hours" << endl;
-
-       timecode1.hours = 0;
-       timecode1.minutes = 0;
-       timecode1.seconds = 0;
-       timecode1.frames = 0;
-       timecode1.subframes = 0;
-       sample1 = oldsample = 0;
-       sample_increment = _session->frame_rate() * 60 * 60;
-
-       _session->sample_to_timecode( sample1, timecode1, true /* use_offset */, false /* use_subframes */ );
-       cout << "Starting at sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << endl;
-
-       for (int i = 0; i < 10; i++) {
-               _session->timecode_to_sample( timecode1, sample1, true /* use_offset */, false /* use_subframes */ );
-               _session->sample_to_timecode( sample1, timecode2, true /* use_offset */, false /* use_subframes */ );
-
-//     cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-//     cout << "sample: " << sample1 << endl;
-//     cout << "sample: " << sample1 << " -> ";
-//     cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-
-//     if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1))))
-//     {
-//       cout << "ERROR: sample increment not right: " << (sample1 - oldsample) << " != " << sample_increment << endl;
-//       break;
-//     }
-
-               if (timecode2.hours != timecode1.hours || timecode2.minutes != timecode1.minutes || timecode2.seconds != timecode2.seconds || timecode2.frames != timecode1.frames) {
-                       cout << "ERROR: timecode2 not equal timecode1" << endl;
-                       cout << "timecode: " << (timecode1.negative ? "-" : "") << timecode1.hours << ":" << timecode1.minutes << ":" << timecode1.seconds << ":" << timecode1.frames << "::" << timecode1.subframes << " -> ";
-                       cout << "sample: " << sample1 << endl;
-                       cout << "sample: " << sample1 << " -> ";
-                       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-                       break;
-               }
-               oldsample = sample1;
-               _session->timecode_increment_hours( timecode1 );
-       }
+       TC.rate = _session->timecode_frames_per_second();
+       TC.drop= _session->timecode_drop_frames();
 
-       cout << "sample_increment: " << sample_increment << endl;
-       cout << "sample: " << sample1 << " -> ";
-       cout << "timecode: " << (timecode2.negative ? "-" : "") << timecode2.hours << ":" << timecode2.minutes << ":" << timecode2.seconds << ":" << timecode2.frames << "::" << timecode2.subframes << endl;
-#endif
+       _session->timecode_to_sample (TC, sample, false /* use_offset */, false /* use_subframes */ );
 
-#endif
+       // timecode_tester ();
 
        return sample;
 }
 
 framepos_t
-AudioClock::minsec_frame_from_display () const
+AudioClock::frames_from_minsec_string (const string& str) const
 {
        if (_session == 0) {
                return 0;
        }
 
-       int hrs = atoi (label (MS_Hours)->get_text());
-       int mins = atoi (label (MS_Minutes)->get_text());
-       int secs = atoi (label (MS_Seconds)->get_text());
-       int millisecs = atoi (label (MS_Milliseconds)->get_text());
-
+       int hrs, mins, secs, millisecs;
        framecnt_t sr = _session->frame_rate();
 
+       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));
 }
 
 framepos_t
-AudioClock::bbt_frame_from_display (framepos_t pos) const
+AudioClock::frames_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;
@@ -1692,9 +1964,9 @@ AudioClock::bbt_frame_from_display (framepos_t pos) const
        AnyTime any;
        any.type = AnyTime::BBT;
 
-       any.bbt.bars = atoi (label (Bars)->get_text());
-       any.bbt.beats = atoi (label (Beats)->get_text());
-       any.bbt.ticks = atoi (label (Ticks)->get_text());
+       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++;
@@ -1707,7 +1979,7 @@ AudioClock::bbt_frame_from_display (framepos_t pos) const
 
 
 framepos_t
-AudioClock::bbt_frame_duration_from_display (framepos_t pos) const
+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;
@@ -1716,18 +1988,19 @@ AudioClock::bbt_frame_duration_from_display (framepos_t pos) const
 
        Timecode::BBT_Time bbt;
 
-
-       bbt.bars = atoi (label (Bars)->get_text());
-       bbt.beats = atoi (label (Beats)->get_text());
-       bbt.ticks = atoi (label (Ticks)->get_text());
+       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);
 }
 
 framepos_t
-AudioClock::audio_frame_from_display () const
+AudioClock::frames_from_audioframes_string (const string& str) const
 {
-       return (framepos_t) atoi (label (AudioFrames)->get_text ());
+       framepos_t f;
+       sscanf (str.c_str(), "%" PRId64, &f);
+       return f;
 }
 
 void
@@ -1744,9 +2017,8 @@ AudioClock::build_ops_menu ()
        ops_items.push_back (MenuElem (_("Bars:Beats"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), BBT)));
        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)));
-       ops_items.push_back (MenuElem (_("Off"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Off)));
 
-       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)));
@@ -1770,146 +2042,173 @@ AudioClock::locate ()
        if (!_session || is_duration) {
                return;
        }
-       
+
        _session->request_locate (current_time(), _session->transport_rolling ());
 }
 
 void
 AudioClock::set_mode (Mode m)
 {
-       /* slightly tricky: this is called from within the ARDOUR_UI
-          constructor by some of its clock members. at that time
-          the instance pointer is unset, so we have to be careful.
-          the main idea is to drop keyboard focus in case we had
-          started editing the clock and then we switch clock mode.
-       */
-
-       clock_base.grab_focus ();
-
        if (_mode == m) {
                return;
        }
 
-       clock_base.remove ();
-
        _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);
+               info_height += 4;
+
+               _left_layout->set_text ("");
+               _right_layout->set_text ("");
+       }
+
        switch (_mode) {
        case Timecode:
-               clock_base.add (timecode_packer_hbox);
+               mode_based_info_ratio = 0.5;
+               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:
-               clock_base.add (bbt_packer_hbox);
+               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:
-               clock_base.add (minsec_packer_hbox);
+               mode_based_info_ratio = 0.5;
+               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:
-               clock_base.add (frames_packer_hbox);
-               break;
-
-       case Off:
-               clock_base.add (off_hbox);
+               mode_based_info_ratio = 0.5;
                break;
        }
 
-       set_size_requests ();
-
        set (last_when, true);
-       clock_base.show_all ();
-       key_entry_state = 0;
 
         if (!is_transient) {
                 ModeChanged (); /* EMIT SIGNAL (the static one)*/
         }
 
+       if (!_fixed_width) {
+               /* display is different, allow us to resize */
+               first_width = 0;
+               first_height = 0;
+               queue_resize ();
+       }
+
         mode_changed (); /* EMIT SIGNAL (the member one) */
 }
 
 void
-AudioClock::set_size_requests ()
+AudioClock::set_bbt_reference (framepos_t pos)
 {
-       /* note that in some fonts, "88" is narrower than "00" */
-
-       switch (_mode) {
-       case Timecode:
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Timecode_Hours], "-88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Timecode_Minutes], "88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Timecode_Seconds], "88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Timecode_Frames], "88", 5, 5);
-               break;
-
-       case BBT:
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Bars], "-888", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Beats], "88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[Ticks], "8888", 5, 5);
-               break;
-
-       case MinSec:
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[MS_Hours], "88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[MS_Minutes], "88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[MS_Seconds], "88", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[MS_Milliseconds], "888", 5, 5);
-               break;
-
-       case Frames:
-               Gtkmm2ext::set_size_request_to_display_given_text (*_labels[AudioFrames], "8888888888", 5, 5);
-               break;
-
-       case Off:
-               Gtkmm2ext::set_size_request_to_display_given_text (off_hbox, "00000", 5, 5);
-               break;
+       bbt_reference_time = pos;
+}
 
-       }
+void
+AudioClock::on_style_changed (const Glib::RefPtr<Gtk::Style>& old_style)
+{
+       CairoWidget::on_style_changed (old_style);
+       first_width = 0;
+       first_height = 0;
+       set_font ();
+       set_colors ();
 }
 
 void
-AudioClock::set_bbt_reference (framepos_t pos)
+AudioClock::set_editable (bool yn)
 {
-       bbt_reference_time = pos;
+       editable = yn;
 }
 
 void
-AudioClock::on_style_changed (const Glib::RefPtr<Gtk::Style>& old_style)
+AudioClock::set_is_duration (bool yn)
 {
-       HBox::on_style_changed (old_style);
+       if (yn == is_duration) {
+               return;
+       }
 
-       /* propagate style changes to all component widgets that should inherit the main one */
+       is_duration = yn;
+       set (last_when, true);
+}
 
-       Glib::RefPtr<RcStyle> rcstyle = get_modifier_style();
+void
+AudioClock::set_off (bool yn)
+{
+       if (_off == yn) {
+               return;
+       }
 
-       clock_base.modify_style (rcstyle);
+       _off = yn;
 
-       for (std::map<Field, Label*>::iterator i = _labels.begin(); i != _labels.end(); ++i) {
-               i->second->modify_style (rcstyle);
-       }
+       /* force a redraw. last_when will be preserved, but the clock text will
+        * change
+        */
 
-       for (std::map<Field, EventBox*>::iterator i = _eboxes.begin(); i != _eboxes.end(); ++i) {
-               i->second->modify_style (rcstyle);
-       }
+       set (last_when, true);
+}
 
-       colon1.modify_style (rcstyle);
-       colon2.modify_style (rcstyle);
-       colon3.modify_style (rcstyle);
-       colon4.modify_style (rcstyle);
-       colon5.modify_style (rcstyle);
-       b1.modify_style (rcstyle);
-       b2.modify_style (rcstyle);
-       period1.modify_style (rcstyle);
+void
+AudioClock::focus ()
+{
+       start_edit (Field (0));
+}
 
-       set_size_requests ();
+void
+AudioClock::set_corner_radius (double r)
+{
+       corner_radius = r;
+       first_width = 0;
+       first_height = 0;
+       queue_resize ();
 }
 
 void
-AudioClock::set_is_duration (bool yn)
+AudioClock::set_fixed_width (bool yn)
 {
-       if (yn == is_duration) {
-               return;
-       }
-        
-       is_duration = yn;
-       set (last_when, true, 0, 's');
+       _fixed_width = yn;
+}
+
+void
+AudioClock::dpi_reset ()
+{
+       /* force recomputation of size even if we are fixed width
+        */
+       first_width = 0;
+       first_height = 0;
+       queue_resize ();
 }