all new implementation of audio clocks, with entirely new editing model. not entirely...
[ardour.git] / gtk2_ardour / audio_clock.cc
index c37c6cab9c5391c988c9f08712240988f44827f5..f2347d749cbf23b182da75cbe17d6004affb0441 100644 (file)
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
 
-#include <gtkmm2ext/utils.h>
+#include <gtkmm/style.h>
+
+#include "gtkmm2ext/cairocell.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/rgb_macros.h"
 
 #include "ardour/ardour.h"
 #include "ardour/session.h"
@@ -35,6 +39,7 @@
 #include "audio_clock.h"
 #include "utils.h"
 #include "keyboard.h"
+#include "gui_thread.h"
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -44,389 +49,423 @@ 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.6;
+const double AudioClock::separator_height = 2.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 */
-       5,   /* MS_Seconds */
-       3,   /* Bars */
-       2,   /* Beats */
-       4,   /* Tick */
-       10   /* Audio Frame */
-};
-
-AudioClock::AudioClock (std::string clock_name, bool transient, std::string widget_name, 
+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 (":"),
-         b1 ("|"),
-         b2 ("|"),
-         last_when(0)
+       : _name (clock_name)
+       , is_transient (transient)
+       , is_duration (duration)
+       , editable (allow_edit)
+       , _follows_playhead (follows_playhead)
+       , _off (false)
+       , _need_bg (true)
+       , ops_menu (0)
+       , editing_attr (0)
+       , background_attr (0)
+       , foreground_attr (0)
+       , mode_based_info_ratio (1.0)
+       , editing (false)
+       , bbt_reference_time (-1)
+       , last_when(0)
+       , last_pdelta (0)
+       , last_sdelta (0)
+       , dragging (false)
+       , drag_field (Field (0))
+       , _canonical_time_is_displayed (true)
+       , _canonical_time (0)
+
 {
-       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);
+       }
+}
 
+AudioClock::~AudioClock ()
+{
+       delete background_attr;
+       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");
        }
+}
 
-       audio_frames_ebox.add (audio_frames_label);
 
-       frames_packer.set_homogeneous (false);
-       frames_packer.set_border_width (2);
-       frames_packer.pack_start (audio_frames_ebox, false, false);
+void
+AudioClock::on_realize ()
+{
+       CairoWidget::on_realize ();
+       set_font ();
+       set_colors ();
+}
 
-       if (with_info) {
-               frames_packer.pack_start (frames_info_box, false, false, 5);
-       }
-
-       frames_packer_hbox.pack_start (frames_packer, true, false);
-
-       hours_ebox.add (hours_label);
-       minutes_ebox.add (minutes_label);
-       seconds_ebox.add (seconds_label);
-       frames_ebox.add (frames_label);
-       bars_ebox.add (bars_label);
-       beats_ebox.add (beats_label);
-       ticks_ebox.add (ticks_label);
-       ms_hours_ebox.add (ms_hours_label);
-       ms_minutes_ebox.add (ms_minutes_label);
-       ms_seconds_ebox.add (ms_seconds_label);
-
-       timecode_packer.set_homogeneous (false);
-       timecode_packer.set_border_width (2);
-       timecode_packer.pack_start (hours_ebox, false, false);
-       timecode_packer.pack_start (colon1, false, false);
-       timecode_packer.pack_start (minutes_ebox, false, false);
-       timecode_packer.pack_start (colon2, false, false);
-       timecode_packer.pack_start (seconds_ebox, false, false);
-       timecode_packer.pack_start (colon3, false, false);
-       timecode_packer.pack_start (frames_ebox, false, false);
+void
+AudioClock::set_font ()
+{
+       Glib::RefPtr<Gtk::Style> style = get_style ();
+       Pango::FontDescription font; 
+       Pango::AttrFontDesc* font_attr;
 
-       if (with_info) {
-               timecode_packer.pack_start (timecode_info_box, false, false, 5);
+       if (!is_realized()) {
+               font = get_font_for_style (get_name());
+       } else {
+               font = style->get_font();
        }
 
-       timecode_packer_hbox.pack_start (timecode_packer, true, false);
+       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 
-       bbt_packer.set_homogeneous (false);
-       bbt_packer.set_border_width (2);
-       bbt_packer.pack_start (bars_ebox, false, false);
-       bbt_packer.pack_start (b1, false, false);
-       bbt_packer.pack_start (beats_ebox, false, false);
-       bbt_packer.pack_start (b2, false, false);
-       bbt_packer.pack_start (ticks_ebox, false, false);
+       normal_attributes.change (*font_attr);
+       editing_attributes.change (*font_attr);
 
-       if (with_info) {
-               bbt_packer.pack_start (bbt_info_box, false, false, 5);
-       }
+       /* now a smaller version of the same font */
+
+       delete font_attr;
+       font.set_size ((int) lrint (font.get_size() * info_font_scale_factor));
+       font.set_weight (Pango::WEIGHT_NORMAL);
+       font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
+       info_attributes.change (*font_attr);
+       
+       delete font_attr;
+}
 
-       bbt_packer_hbox.pack_start (bbt_packer, true, false);
+void
+AudioClock::set_active_state (Gtkmm2ext::ActiveState s)
+{
+       CairoWidget::set_active_state (s);
+       set_colors ();
+}
 
-       minsec_packer.set_homogeneous (false);
-       minsec_packer.set_border_width (2);
-       minsec_packer.pack_start (ms_hours_ebox, false, false);
-       minsec_packer.pack_start (colon4, false, false);
-       minsec_packer.pack_start (ms_minutes_ebox, false, false);
-       minsec_packer.pack_start (colon5, false, false);
-       minsec_packer.pack_start (ms_seconds_ebox, false, false);
+void
+AudioClock::set_colors ()
+{
+       int r, g, b, a;
 
-       minsec_packer_hbox.pack_start (minsec_packer, true, false);
+       uint32_t bg_color;
+       uint32_t text_color;
+       uint32_t editing_color;
 
-       clock_frame.set_shadow_type (Gtk::SHADOW_IN);
-       clock_frame.set_name ("BaseFrame");
+       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()));
+       } 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()));
+       }
+
+       UINT_TO_RGBA (bg_color, &r, &g, &b, &a);
+       r = lrint ((r/256.0) * 65535.0);
+       g = lrint ((g/256.0) * 65535.0);
+       b = lrint ((b/256.0) * 65535.0);
+       background_attr = new Pango::AttrColor (Pango::Attribute::create_attr_background (r, g, b));
+
+       /* store for bg in ::render() */
+       bg_r = r/256.0;
+       bg_g = g/256.0;
+       bg_b = b/256.0;
+       bg_a = a/256.0;
+
+       UINT_TO_RGBA (text_color, &r, &g, &b, &a);
+       r = lrint ((r/256.0) * 65535.0);
+       g = lrint ((g/256.0) * 65535.0);
+       b = lrint ((b/256.0) * 65535.0);
+       foreground_attr = new Pango::AttrColor (Pango::Attribute::create_attr_foreground (r, g, b));
+
+       UINT_TO_RGBA (editing_color, &r, &g, &b, &a);
+       r = lrint ((r/256.0) * 65535.0);
+       g = lrint ((g/256.0) * 65535.0);
+       b = lrint ((b/256.0) * 65535.0);
+       editing_attr = new Pango::AttrColor (Pango::Attribute::create_attr_foreground (r, g, b));
+       
+       normal_attributes.change (*background_attr);
+       normal_attributes.change (*foreground_attr);
 
-       clock_frame.add (clock_base);
+       info_attributes.change (*background_attr);
+       info_attributes.change (*foreground_attr);
 
-       set_widget_name (widget_name);
+       editing_attributes.change (*background_attr);
+       editing_attributes.change (*foreground_attr);
+       editing_attributes.change (*editing_attr);
 
-       _mode = BBT; /* lie to force mode switch */
-       set_mode (Timecode);
+       if (!editing) {
+               _layout->set_attributes (normal_attributes);
+       } else {
+               _layout->set_attributes (editing_attributes);
+       }
 
-       pack_start (clock_frame, true, true);
+       if (_left_layout) {
+               _left_layout->set_attributes (info_attributes);
+               _right_layout->set_attributes (info_attributes);
+       }
 
-       /* 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.
+       queue_draw ();
+}
 
-          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.
-       */
+void
+AudioClock::render (cairo_t* cr)
+{
+       if (_need_bg) {
+               /* paint entire area the color of the parent window bg 
+                  
+                  XXX try to optimize this so that we just paint the corners and
+                  other areas that may be exposed by rounded corners.
+               */
+               
+               Gdk::Color bg (get_parent_bg());
+               cairo_rectangle (cr, 0, 0, _width, _height);
+               cairo_stroke_preserve (cr);
+               cairo_set_source_rgb (cr, bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
+               cairo_fill (cr);
+       }
+
+       /* main layout: rounded rect, plus the text */
+       
+       cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
+       Gtkmm2ext::rounded_rectangle (cr, 0, 0, _width, upper_height, 9);
 
-       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));
+       cairo_move_to (cr, 6, (upper_height - layout_height) / 2.0);
+       pango_cairo_show_layout (cr, _layout->gobj());
 
-       Session::TimecodeOffsetChanged.connect (sigc::mem_fun (*this, &AudioClock::timecode_offset_changed));
+       if (_left_layout) {
 
-       if (editable) {
-               setup_events ();
-       }
+               double h = _height - upper_height - separator_height;
 
-       set (last_when, true);
+               if (mode_based_info_ratio != 1.0) {
 
-       if (!is_transient) {
-               clocks.push_back (this);
+                       double left_rect_width = round (((_width - separator_height) * mode_based_info_ratio) + 0.5);
+
+                       cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
+                       Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h, 9);
+                       
+                       cairo_move_to (cr, 6, upper_height + separator_height + ((h - info_height)/2.0));
+                       pango_cairo_show_layout (cr, _left_layout->gobj());
+                       
+                       Gtkmm2ext::rounded_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, 
+                                                     _width - separator_height - left_rect_width, h, 9);
+                       
+                       cairo_move_to (cr, 6 + 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 */
+
+                       cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
+                       Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, _width, h, 9);
+               }
        }
 }
 
 void
-AudioClock::set_widget_name (string name)
+AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 {
-       Widget::set_name (name);
-
-       clock_base.set_name (name);
-
-       audio_frames_label.set_name (name);
-       hours_label.set_name (name);
-       minutes_label.set_name (name);
-       seconds_label.set_name (name);
-       frames_label.set_name (name);
-       bars_label.set_name (name);
-       beats_label.set_name (name);
-       ticks_label.set_name (name);
-       ms_hours_label.set_name (name);
-       ms_minutes_label.set_name (name);
-       ms_seconds_label.set_name (name);
-       hours_ebox.set_name (name);
-       minutes_ebox.set_name (name);
-       seconds_ebox.set_name (name);
-       frames_ebox.set_name (name);
-       audio_frames_ebox.set_name (name);
-       bars_ebox.set_name (name);
-       beats_ebox.set_name (name);
-       ticks_ebox.set_name (name);
-       ms_hours_ebox.set_name (name);
-       ms_minutes_ebox.set_name (name);
-       ms_seconds_ebox.set_name (name);
-
-       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);
-
-       queue_draw ();
+       CairoWidget::on_size_allocate (alloc);
+       
+       if (_left_layout) {
+               upper_height = (_height/2.0) - 1.0;
+       } else {
+               upper_height = _height;
+       }
 }
 
 void
-AudioClock::setup_events ()
+AudioClock::on_size_request (Gtk::Requisition* req)
 {
-       clock_base.set_flags (Gtk::CAN_FOCUS);
-
-       hours_ebox.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);
-       minutes_ebox.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);
-       seconds_ebox.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);
-       frames_ebox.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);
-       bars_ebox.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);
-       beats_ebox.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);
-       ticks_ebox.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);
-       ms_hours_ebox.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);
-       ms_minutes_ebox.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);
-       ms_seconds_ebox.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);
-       audio_frames_ebox.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);
-
-       hours_ebox.set_flags (Gtk::CAN_FOCUS);
-       minutes_ebox.set_flags (Gtk::CAN_FOCUS);
-       seconds_ebox.set_flags (Gtk::CAN_FOCUS);
-       frames_ebox.set_flags (Gtk::CAN_FOCUS);
-       audio_frames_ebox.set_flags (Gtk::CAN_FOCUS);
-       bars_ebox.set_flags (Gtk::CAN_FOCUS);
-       beats_ebox.set_flags (Gtk::CAN_FOCUS);
-       ticks_ebox.set_flags (Gtk::CAN_FOCUS);
-       ms_hours_ebox.set_flags (Gtk::CAN_FOCUS);
-       ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS);
-       ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS);
-
-       hours_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Timecode_Hours));
-       minutes_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Timecode_Minutes));
-       seconds_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Timecode_Seconds));
-       frames_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Timecode_Frames));
-       audio_frames_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
-       bars_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
-       beats_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
-       ticks_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
-       ms_hours_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
-       ms_minutes_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
-       ms_seconds_ebox.signal_motion_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
-
-       hours_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Timecode_Hours));
-       minutes_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Timecode_Minutes));
-       seconds_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Timecode_Seconds));
-       frames_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Timecode_Frames));
-       audio_frames_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
-       bars_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Bars));
-       beats_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Beats));
-       ticks_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
-       ms_hours_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
-       ms_minutes_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
-       ms_seconds_ebox.signal_button_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
-
-       hours_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Timecode_Hours));
-       minutes_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Timecode_Minutes));
-       seconds_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Timecode_Seconds));
-       frames_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Timecode_Frames));
-       audio_frames_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
-       bars_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Bars));
-       beats_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Beats));
-       ticks_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
-       ms_hours_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
-       ms_minutes_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
-       ms_seconds_ebox.signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
-
-       hours_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Timecode_Hours));
-       minutes_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Timecode_Minutes));
-       seconds_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Timecode_Seconds));
-       frames_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Timecode_Frames));
-       audio_frames_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), AudioFrames));
-       bars_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Bars));
-       beats_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Beats));
-       ticks_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), Ticks));
-       ms_hours_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Hours));
-       ms_minutes_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Minutes));
-       ms_seconds_ebox.signal_scroll_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_button_scroll_event), MS_Seconds));
-
-       hours_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Timecode_Hours));
-       minutes_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Timecode_Minutes));
-       seconds_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Timecode_Seconds));
-       frames_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Timecode_Frames));
-       audio_frames_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), AudioFrames));
-       bars_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Bars));
-       beats_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Beats));
-       ticks_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), Ticks));
-       ms_hours_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), MS_Hours));
-       ms_minutes_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), MS_Minutes));
-       ms_seconds_ebox.signal_key_press_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_press_event), MS_Seconds));
-
-       hours_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Timecode_Hours));
-       minutes_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Timecode_Minutes));
-       seconds_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Timecode_Seconds));
-       frames_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Timecode_Frames));
-       audio_frames_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
-       bars_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Bars));
-       beats_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Beats));
-       ticks_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
-       ms_hours_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
-       ms_minutes_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
-       ms_seconds_ebox.signal_key_release_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
-
-       hours_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Timecode_Hours));
-       minutes_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Timecode_Minutes));
-       seconds_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Timecode_Seconds));
-       frames_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Timecode_Frames));
-       audio_frames_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
-       bars_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
-       beats_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
-       ticks_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
-       ms_hours_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
-       ms_minutes_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
-       ms_seconds_ebox.signal_focus_in_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
-
-       hours_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Timecode_Hours));
-       minutes_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Timecode_Minutes));
-       seconds_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Timecode_Seconds));
-       frames_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Timecode_Frames));
-       audio_frames_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
-       bars_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
-       beats_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
-       ticks_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
-       ms_hours_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
-       ms_minutes_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
-       ms_seconds_ebox.signal_focus_out_event().connect (sigc::bind (sigc::mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
-
-       clock_base.signal_focus_in_event().connect (sigc::mem_fun (*this, &AudioClock::drop_focus_handler));
+       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);
+
+       /* this string is the longest thing we will ever display,
+          and also includes the BBT "|" that may descends below
+          the baseline a bit, and a comma for the minsecs mode
+          where we printf a fractional value (XXX or should)
+       */
+
+       tmp->set_text (" 88|88:88:88,88"); 
+
+       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) {
+
+               int w;
+
+               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);
+               
+               info_height += 4;
+
+               req->height += info_height;
+               req->height += separator_height;
+       }
 }
 
-bool
-AudioClock::drop_focus_handler (GdkEventFocus*)
+void
+AudioClock::show_edit_status (int length)
 {
-       Keyboard::magic_widget_drop_focus ();
-       return false;
+       editing_attr->set_start_index (edit_string.length() - length);
+       editing_attr->set_end_index (edit_string.length());
+       
+       editing_attributes.change (*background_attr);
+       editing_attributes.change (*foreground_attr);
+       editing_attributes.change (*editing_attr);
+
+       _layout->set_attributes (editing_attributes);
 }
 
 void
-AudioClock::on_realize ()
+AudioClock::start_edit ()
 {
-       HBox::on_realize ();
+       edit_string = _layout->get_text ();
+       pre_edit_string = edit_string;
+       input_string.clear ();
+       editing = true;
 
-       /* styles are not available until the widgets are bound to a window */
+       show_edit_status (1);
 
-       set_size_requests ();
+       Keyboard::magic_widget_grab_focus ();
+       grab_focus ();
 }
 
 void
-AudioClock::set (nframes_t when, bool force, nframes_t offset, char which)
+AudioClock::end_edit (bool modify)
 {
+       if (modify) {
 
-       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:
+                       break;
+                       
+               case Frames:
+                       break;
+               }
+               
+               if (!ok) {
+                       edit_string = pre_edit_string;
+                       input_string.clear ();
+                       _layout->set_text (edit_string);
+               } else {
+                       editing = false;
+                       _layout->set_attributes (normal_attributes);
+                       ValueChanged(); /* EMIT_SIGNAL */
+               }
+
+       } else {
+               editing = false;
+               _layout->set_text (pre_edit_string);
+       }
+
+       queue_draw ();
+
+       if (!editing) {
+
+               /* move focus back to the default widget in the top level window */
+               
+               Keyboard::magic_widget_drop_focus ();
+               
+               Widget* top = get_toplevel();
+               
+               if (top->is_toplevel ()) {
+                       Window* win = dynamic_cast<Window*> (top);
+                       win->grab_focus ();
+               }
+       }
+}
+
+void
+AudioClock::session_configuration_changed (std::string p)
+{
+       if (p != "timecode-offset" && p != "timecode-offset-negative") {
                return;
        }
 
-       if (when == last_when && !offset && !force) {
+       framecnt_t current;
+
+       switch (_mode) {
+       case Timecode:
+               if (is_duration) {
+                       current = current_duration ();
+               } else {
+                       current = current_time ();
+               }
+               set (current, true);
+               break;
+       default:
+               break;
+       }
+}
+
+void
+AudioClock::set (framepos_t when, bool force, framecnt_t offset, char which)
+{
+       if ((!force && !is_visible()) || _session == 0) {
                return;
        }
 
-       bool pdelta = Config->get_primary_clock_delta_edit_cursor();
-       bool sdelta = Config->get_secondary_clock_delta_edit_cursor();
+       bool const pdelta = Config->get_primary_clock_delta_edit_cursor ();
+       bool const sdelta = Config->get_secondary_clock_delta_edit_cursor ();
 
        if (offset && which == 'p' && pdelta) {
                when = (when > offset) ? when - offset : offset - when;
@@ -434,240 +473,211 @@ AudioClock::set (nframes_t when, bool force, nframes_t offset, char which)
                when = (when > offset) ? when - offset : offset - when;
        }
 
+       if (when == last_when && !force) {
+               return;
+       }
+
        if (which == 'p' && pdelta && !last_pdelta) {
-               set_widget_name("TransportClockDisplayDelta");
+               set_name("TransportClockDisplayDelta");
                last_pdelta = true;
        } else if (which == 'p' && !pdelta && last_pdelta) {
-               set_widget_name("TransportClockDisplay");
+               set_name("TransportClockDisplay");
                last_pdelta = false;
-       } else if (which == 's'  && sdelta && !last_sdelta) {
-               set_widget_name("SecondaryClockDisplayDelta");
+       } else if (which == 's' && sdelta && !last_sdelta) {
+               set_name("SecondaryClockDisplayDelta");
                last_sdelta = true;
        } else if (which == 's' && !sdelta && last_sdelta) {
-               set_widget_name("SecondaryClockDisplay");
+               set_name("SecondaryClockDisplay");
                last_sdelta = false;
        }
 
-       switch (_mode) {
-       case Timecode:
-               set_timecode (when, force);
-               break;
-
-       case BBT:
-               set_bbt (when, force);
-               break;
-
-       case MinSec:
-               set_minsec (when, force);
-               break;
+       if (!editing) {
 
-       case Frames:
-               set_frames (when, force);
-               break;
+               switch (_mode) {
+               case Timecode:
+                       set_timecode (when, force);
+                       break;
+                       
+               case BBT:
+                       set_bbt (when, force);
+                       break;
+                       
+               case MinSec:
+                       set_minsec (when, force);
+                       break;
+                       
+               case Frames:
+                       set_frames (when, force);
+                       break;
+               }
+       }
 
-       case Off:
-               break;
+       if (when != last_when || force) {
+               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::timecode_offset_changed ()
+AudioClock::set_frames (framepos_t when, bool /*force*/)
 {
-       nframes_t current;
+       char buf[32];
 
-       switch (_mode) {
-       case Timecode:
-               if (is_duration) {
-                       current = current_duration();
-               } else {
-                       current = current_time ();
+       if (_off) {
+               /* XXX with cairo, we can do better, surely? */
+
+               _layout->set_text ("-----------");
+
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
                }
-               set (current, true);
-               break;
-       default:
-               break;
+               
+               return;
        }
-}
-
-void
-AudioClock::set_frames (nframes_t when, bool /*force*/)
-{
-       char buf[32];
-       snprintf (buf, sizeof (buf), "%u", when);
-       audio_frames_label.set_text (buf);
+       
+       snprintf (buf, sizeof (buf), "%10" PRId64, when);
+       _layout->set_text (buf);
 
-       if (frames_upper_info_label) {
-               nframes_t rate = _session->frame_rate();
+       if (_left_layout) {
+               framecnt_t rate = _session->frame_rate();
 
                if (fmod (rate, 1000.0) == 0.000) {
-                       sprintf (buf, "%uK", rate/1000);
+                       sprintf (buf, "%" PRId64 "K", rate/1000);
                } else {
-                       sprintf (buf, "%.3fK", rate/1000.0f);
+                       sprintf (buf, "%" PRId64, rate);
                }
 
-               if (frames_upper_info_label->get_text() != buf) {
-                       frames_upper_info_label->set_text (buf);
-               }
+               _left_layout->set_text (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_text (_("none"));
                } else {
                        sprintf (buf, "%-6.4f", vid_pullup);
-                       if (frames_lower_info_label->get_text() != buf) {
-                               frames_lower_info_label->set_text (buf);
-                       }
+                       _right_layout->set_text (buf);
                }
        }
 }
 
 void
-AudioClock::set_minsec (nframes_t when, bool force)
+AudioClock::set_minsec (framepos_t when, bool force)
 {
        char buf[32];
-       nframes_t left;
+       framecnt_t left;
        int hrs;
        int mins;
-       float secs;
+       int secs;
+       int millisecs;
+
+       if (_off) {
+               _layout->set_text ("--:--:--");
+
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
+               }
+               
+               return;
+       }       
 
        left = when;
        hrs = (int) floor (left / (_session->frame_rate() * 60.0f * 60.0f));
-       left -= (nframes_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
+       left -= (framecnt_t) floor (hrs * _session->frame_rate() * 60.0f * 60.0f);
        mins = (int) floor (left / (_session->frame_rate() * 60.0f));
-       left -= (nframes_t) floor (mins * _session->frame_rate() * 60.0f);
-       secs = left / (float) _session->frame_rate();
-
-       if (force || hrs != ms_last_hrs) {
-               sprintf (buf, "%02d", hrs);
-               ms_hours_label.set_text (buf);
-               ms_last_hrs = hrs;
-       }
-
-       if (force || mins != ms_last_mins) {
-               sprintf (buf, "%02d", mins);
-               ms_minutes_label.set_text (buf);
-               ms_last_mins = mins;
-       }
+       left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f);
+       secs = (int) floor (left / (float) _session->frame_rate());
+       left -= (framecnt_t) floor (secs * _session->frame_rate());
+       millisecs = floor (left * 1000.0 / (float) _session->frame_rate());
 
-       if (force || secs != ms_last_secs) {
-               sprintf (buf, "%06.3f", secs);
-               ms_seconds_label.set_text (buf);
-               ms_last_secs = secs;
-       }
+       snprintf (buf, sizeof (buf), "%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ".%03" PRIu32, hrs, mins, secs, millisecs);
+       _layout->set_text (buf);
 }
 
 void
-AudioClock::set_timecode (nframes_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;
+       
+       if (_off) {
+               _layout->set_text ("--:--:--:--");
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
                }
-               hours_label.set_text (buf);
-               last_hrs = timecode.hours;
-               last_negative = timecode.negative;
+               
+               return;
        }
 
-       if (force || timecode.minutes != last_mins) {
-               sprintf (buf, "%02" PRIu32, timecode.minutes);
-               minutes_label.set_text (buf);
-               last_mins = timecode.minutes;
+       if (is_duration) {
+               _session->timecode_duration (when, TC);
+       } else {
+               _session->timecode_time (when, TC);
        }
-
-       if (force || timecode.seconds != last_secs) {
-               sprintf (buf, "%02" PRIu32, timecode.seconds);
-               seconds_label.set_text (buf);
-               last_secs = timecode.seconds;
+       
+       if (TC.negative) {
+               snprintf (buf, sizeof (buf), "-%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, TC.hours, TC.minutes, TC.seconds, TC.frames);
+       } else {
+               snprintf (buf, sizeof (buf), " %02" PRIu32 ":%02" PRIu32 ":%02" PRIu32 ":%02" PRIu32, TC.hours, TC.minutes, TC.seconds, TC.frames);
        }
 
-       if (force || timecode.frames != last_frames) {
-               sprintf (buf, "%02" PRIu32, timecode.frames);
-               frames_label.set_text (buf);
-               last_frames = timecode.frames;
-       }
+       _layout->set_text (buf);
 
-       if (timecode_upper_info_label) {
+       if (_right_layout) {
                double timecode_frames = _session->timecode_frames_per_second();
-
-               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");
-                       }
+       
+               if (fmod(timecode_frames, 1.0) == 0.0) {
+                       sprintf (buf, "FPS %u %s", int (timecode_frames), (_session->timecode_drop_frames() ? "D" : ""));
                } else {
-                       // there is no drop frame alternative
-                       buf[0] = '\0';
+                       sprintf (buf, "%.2f %s", timecode_frames, (_session->timecode_drop_frames() ? "D" : ""));
                }
 
-               if (timecode_lower_info_label->get_text() != buf) {
-                       timecode_lower_info_label->set_text (buf);
-               }
+               _right_layout->set_text (buf);
        }
 }
 
 void
-AudioClock::set_bbt (nframes_t when, bool force)
+AudioClock::set_bbt (framepos_t when, bool force)
 {
        char buf[16];
-       BBT_Time bbt;
+       Timecode::BBT_Time BBT;
+
+       if (_off) {
+               _layout->set_text ("--|--|--");
+               if (_left_layout) {
+                       _left_layout->set_text ("");
+                       _right_layout->set_text ("");
+               }
+               return;
+       }
 
        /* 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);
-       }
-
-       sprintf (buf, "%03" PRIu32, bbt.bars);
-       if (force || bars_label.get_text () != buf) {
-               bars_label.set_text (buf);
-       }
-       sprintf (buf, "%02" PRIu32, bbt.beats);
-       if (force || beats_label.get_text () != buf) {
-               beats_label.set_text (buf);
-       }
-       sprintf (buf, "%04" PRIu32, bbt.ticks);
-       if (force || ticks_label.get_text () != buf) {
-               ticks_label.set_text (buf);
+               _session->tempo_map().bbt_time (when, BBT);
        }
 
-       if (bbt_upper_info_label) {
-               nframes64_t pos;
+       snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%04" PRIu32, BBT.bars, BBT.beats, BBT.ticks);
+       _layout->set_text (buf);
+                
+       if (_right_layout) {
+               framepos_t pos;
 
                if (bbt_reference_time < 0) {
                        pos = when;
@@ -678,13 +688,10 @@ AudioClock::set_bbt (nframes_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);
-               }
+               _left_layout->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);
-               }
+               _right_layout->set_text (buf);
        }
 }
 
@@ -695,14 +702,25 @@ AudioClock::set_session (Session *s)
 
        if (_session) {
 
-               XMLProperty* prop;
+               _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
+
+               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;
+                               }
                        }
                }
 
@@ -710,87 +728,59 @@ AudioClock::set_session (Session *s)
        }
 }
 
-void
-AudioClock::focus ()
-{
-       switch (_mode) {
-       case Timecode:
-               hours_ebox.grab_focus ();
-               break;
-
-       case BBT:
-               bars_ebox.grab_focus ();
-               break;
-
-       case MinSec:
-               ms_hours_ebox.grab_focus ();
-               break;
-
-       case Frames:
-               frames_ebox.grab_focus ();
-               break;
-
-       case Off:
-               break;
-       }
-}
-
-
-bool
-AudioClock::field_key_press_event (GdkEventKey */*ev*/, Field /*field*/)
-{
-       /* all key activity is handled on key release */
-       return true;
-}
-
 bool
-AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
+AudioClock::on_key_press_event (GdkEventKey* ev)
 {
-       Label *label = 0;
-       string new_text;
-       char new_char = 0;
-       bool move_on = false;
-
-       switch (field) {
-       case Timecode_Hours:
-               label = &hours_label;
-               break;
-       case Timecode_Minutes:
-               label = &minutes_label;
-               break;
-       case Timecode_Seconds:
-               label = &seconds_label;
-               break;
-       case Timecode_Frames:
-               label = &frames_label;
-               break;
-
-       case AudioFrames:
-               label = &audio_frames_label;
-               break;
-
-       case MS_Hours:
-               label = &ms_hours_label;
-               break;
-       case MS_Minutes:
-               label = &ms_minutes_label;
-               break;
-       case MS_Seconds:
-               label = &ms_seconds_label;
-               break;
-
-       case Bars:
-               label = &bars_label;
-               break;
-       case Beats:
-               label = &beats_label;
-               break;
-       case Ticks:
-               label = &ticks_label;
-               break;
+       if (!editing) {
+               return false;
+       }
+       
+       /* return true for keys that we MIGHT use 
+          at release
+       */
+       switch (ev->keyval) {
+       case GDK_0:
+       case GDK_KP_0:
+       case GDK_1:
+       case GDK_KP_1:
+       case GDK_2:
+       case GDK_KP_2:
+       case GDK_3:
+       case GDK_KP_3:
+       case GDK_4:
+       case GDK_KP_4:
+       case GDK_5:
+       case GDK_KP_5:
+       case GDK_6:
+       case GDK_KP_6:
+       case GDK_7:
+       case GDK_KP_7:
+       case GDK_8:
+       case GDK_KP_8:
+       case GDK_9:
+       case GDK_KP_9:
+       case GDK_period:
+       case GDK_comma:
+       case GDK_KP_Decimal:
+       case GDK_Tab:
+       case GDK_Return:
+       case GDK_KP_Enter:
+       case GDK_Escape:
+               return true;
        default:
                return false;
        }
+}
+
+bool
+AudioClock::on_key_release_event (GdkEventKey *ev)
+{
+       if (!editing) {
+               return false;
+       }
+
+       string new_text;
+       char new_char = 0;
 
        switch (ev->keyval) {
        case GDK_0:
@@ -834,24 +824,15 @@ 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;
-               }
-               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;
 
@@ -859,651 +840,670 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
                return false;
        }
 
-       if (!move_on) {
+       if (input_string.length() >= insert_max) {
+               /* eat the key event, but do no nothing with it */
+               return true;
+       }
 
-               if (key_entry_state == 0) {
+       input_string.insert (input_string.begin(), new_char);
+       
+       string::reverse_iterator ri;
+       vector<int> insert_at;
+       int highlight_length;
+       
+       /* merge with pre-edit-string into edit string */
+       
+       switch (_mode) {
+       case Frames:
+               edit_string = input_string;
+               highlight_length = edit_string.length();
+               break;
+               
+       default:
+               edit_string = pre_edit_string;
+               
+               /* backup through the original string, till we have
+                * enough digits locations to put all the digits from
+                * the input string.
+                */
+               
+               for (ri = edit_string.rbegin(); ri != edit_string.rend(); ++ri) {
+                       if (isdigit (*ri)) {
+                               insert_at.push_back (edit_string.length() - (ri - edit_string.rbegin()) - 1);
+                               if (insert_at.size() == input_string.length()) {
+                                       break;
+                               }
+                       }
+               }
+               
+               if (insert_at.size() != input_string.length()) {
+                       error << "something went wrong " << endmsg;
+               } else {
+                       for (int i = input_string.length() - 1; i >= 0; --i) {
+                               edit_string[insert_at[i]] = input_string[i];
+                       }
+                       
+                       highlight_length = edit_string.length() - insert_at.back();
+               }
+               
+               break;
+       }
+       
+       if (edit_string != _layout->get_text()) {
+               show_edit_status (highlight_length);
+               _layout->set_text (edit_string);
+               queue_draw ();
+       } 
+
+       return true;
+}
 
-                       /* initialize with a fresh new string */
+AudioClock::Field
+AudioClock::index_to_field (int index) const
+{
+       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 if (index < 13) {
+                       return Timecode_Frames;
+               } else {
+                       return Field (0);
+               }
+               break;
+       case BBT:
+               if (index < 5) {
+                       return Bars;
+               } else if (index < 7) {
+                       return Beats;
+               } else if (index < 12) {
+                       return Ticks;
+               } else {
+                       return Field (0);
+               }
+               break;
 
-                       if (field != AudioFrames) {
-                               for (uint32_t xn = 0; xn < field_length[field] - 1; ++xn) {
-                                       new_text += '0';
-                               }
+       case MinSec:
+               if (index < 3) {
+                       return Timecode_Hours;
+               } else if (index < 6) {
+                       return MS_Minutes;
+               } else if (index < 9) {
+                       return MS_Seconds;
+               } else if (index < 12) {
+                       return MS_Milliseconds;
+               } else {
+                       return Field (0);
+               }
+               break;
+
+       case Frames:
+               return AudioFrames;
+               break;
+       }
+}
+
+bool
+AudioClock::on_button_press_event (GdkEventButton *ev)
+{
+       switch (ev->button) {
+       case 1:
+               if (editable) {
+                       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;
+                       
+                       int index;
+                       int trailing;
+
+                       if (_layout->xy_to_index (ev->x * PANGO_SCALE, ev->y * PANGO_SCALE, index, trailing)) {                 
+                               drag_field = index_to_field (index);
                        } else {
-                               new_text = "";
+                               drag_field = Field (0);
                        }
+               }
+               break;
+               
+       default:
+               return false;
+               break;
+       }
 
-               } else {
+       return true;
+}
 
-                       string existing = label->get_text();
-                       if (existing.length() >= field_length[field]) {
-                               new_text = existing.substr (1, field_length[field] - 1);
+bool
+AudioClock::on_button_release_event (GdkEventButton *ev)
+{
+       if (editable) {
+               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 {
-                               new_text = existing.substr (0, field_length[field] - 1);
+                               if (ev->button == 1) {
+                                       start_edit ();
+                               }
                        }
+
                }
+       }
 
-               new_text += new_char;
-               label->set_text (new_text);
-               key_entry_state++;
+       if (Keyboard::is_context_menu_event (ev)) {
+               if (ops_menu == 0) {
+                       build_ops_menu ();
+               }
+               ops_menu->popup (1, ev->time);
+               return true;
        }
 
-       if (key_entry_state == field_length[field]) {
-               move_on = true;
+       return false;
+}
+
+bool
+AudioClock::on_scroll_event (GdkEventScroll *ev)
+{
+       int index;
+       int trailing;
+
+       if (_session == 0 || !editable) {
+               return false;
        }
 
-       if (move_on) {
+       if (!_layout->xy_to_index (ev->x * PANGO_SCALE, ev->y * PANGO_SCALE, index, trailing)) {
+               /* not in the main layout */
+               return false;
+       }
+       
+       Field f = index_to_field (index);
+       framepos_t frames = 0;
 
-               if (key_entry_state) {
+       switch (ev->direction) {
 
-                       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(bars_label.get_text()) == 0 && !is_duration) {
-                                       bars_label.set_text("001");
-                               }
-                               //  beats should never be 0, unless this clock is for a duration
-                               if (atoi(beats_label.get_text()) == 0 && !is_duration) {
-                                       beats_label.set_text("01");
-                               }
-                               break;
-                       default:
-                               break;
+       case GDK_SCROLL_UP:
+               frames = get_frame_step (f);
+               if (frames != 0) {
+                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                               frames *= 10;
                        }
-
-                       ValueChanged(); /* EMIT_SIGNAL */
+                       set (current_time() + frames, true);
+                       ValueChanged (); /* EMIT_SIGNAL */
+               }
+               break;
+               
+       case GDK_SCROLL_DOWN:
+               frames = get_frame_step (f);
+               if (frames != 0) {
+                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                               frames *= 10;
+                       }
+                       
+                       if ((double)current_time() - (double)frames < 0.0) {
+                               set (0, true);
+                       } else {
+                               set (current_time() - frames, true);
+                       }
+                       
+                       ValueChanged (); /* EMIT_SIGNAL */
                }
+               break;
+               
+       default:
+               return false;
+               break;
+       }
+       
+       return true;
+}
 
-               /* move on to the next field.
-                */
+bool
+AudioClock::on_motion_notify_event (GdkEventMotion *ev)
+{
+       if (_session == 0 || !dragging) {
+               return false;
+       }
 
-               switch (field) {
+       float pixel_frame_scale_factor = 0.2f;
 
-                       /* Timecode */
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier))  {
+               pixel_frame_scale_factor = 0.1f;
+       }
 
-               case Timecode_Hours:
-                       minutes_ebox.grab_focus ();
-                       break;
-               case Timecode_Minutes:
-                       seconds_ebox.grab_focus ();
-                       break;
-               case Timecode_Seconds:
-                       frames_ebox.grab_focus ();
-                       break;
-               case Timecode_Frames:
-                       clock_base.grab_focus ();
-                       break;
 
-               /* audio frames */
-               case AudioFrames:
-                       clock_base.grab_focus ();
-                       break;
+       if (Keyboard::modifier_state_contains (ev->state,
+                                              Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) {
 
-               /* Min:Sec */
+               pixel_frame_scale_factor = 0.025f;
+       }
 
-               case MS_Hours:
-                       ms_minutes_ebox.grab_focus ();
-                       break;
-               case MS_Minutes:
-                       ms_seconds_ebox.grab_focus ();
-                       break;
-               case MS_Seconds:
-                       clock_base.grab_focus ();
-                       break;
+       double y_delta = ev->y - drag_y;
 
-               /* BBT */
+       drag_accum +=  y_delta*pixel_frame_scale_factor;
 
-               case Bars:
-                       beats_ebox.grab_focus ();
-                       break;
-               case Beats:
-                       ticks_ebox.grab_focus ();
-                       break;
-               case Ticks:
-                       clock_base.grab_focus ();
-                       break;
+       drag_y = ev->y;
 
-               default:
-                       break;
-               }
+       if (trunc (drag_accum) != 0) {
 
-       }
+               framepos_t frames;
+               framepos_t pos;
+               int dir;
+               dir = (drag_accum < 0 ? 1:-1);
+               pos = current_time();
+               frames = get_frame_step (drag_field,pos,dir);
 
-       //if user hit Enter, lose focus
-       switch (ev->keyval) {
-       case GDK_Return:
-       case GDK_KP_Enter:
-               clock_base.grab_focus ();
+               if (frames  != 0 &&  frames * drag_accum < current_time()) {
+                       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;
 }
 
-bool
-AudioClock::field_focus_in_event (GdkEventFocus */*ev*/, Field field)
+framepos_t
+AudioClock::get_frame_step (Field field, framepos_t pos, int dir)
 {
-       key_entry_state = 0;
-
-       Keyboard::magic_widget_grab_focus ();
-
+       framecnt_t f = 0;
+       Timecode::BBT_Time BBT;
        switch (field) {
        case Timecode_Hours:
-               hours_ebox.set_flags (Gtk::HAS_FOCUS);
-               hours_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = (framecnt_t) floor (3600.0 * _session->frame_rate());
                break;
        case Timecode_Minutes:
-               minutes_ebox.set_flags (Gtk::HAS_FOCUS);
-               minutes_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = (framecnt_t) floor (60.0 * _session->frame_rate());
                break;
        case Timecode_Seconds:
-               seconds_ebox.set_flags (Gtk::HAS_FOCUS);
-               seconds_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = _session->frame_rate();
                break;
        case Timecode_Frames:
-               frames_ebox.set_flags (Gtk::HAS_FOCUS);
-               frames_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = (framecnt_t) floor (_session->frame_rate() / _session->timecode_frames_per_second());
                break;
 
        case AudioFrames:
-               audio_frames_ebox.set_flags (Gtk::HAS_FOCUS);
-               audio_frames_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = 1;
                break;
 
        case MS_Hours:
-               ms_hours_ebox.set_flags (Gtk::HAS_FOCUS);
-               ms_hours_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = (framecnt_t) floor (3600.0 * _session->frame_rate());
                break;
        case MS_Minutes:
-               ms_minutes_ebox.set_flags (Gtk::HAS_FOCUS);
-               ms_minutes_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = (framecnt_t) floor (60.0 * _session->frame_rate());
                break;
        case MS_Seconds:
-               ms_seconds_ebox.set_flags (Gtk::HAS_FOCUS);
-               ms_seconds_ebox.set_state (Gtk::STATE_ACTIVE);
+               f = (framecnt_t) _session->frame_rate();
+               break;
+       case MS_Milliseconds:
+               f = (framecnt_t) floor (_session->frame_rate() / 1000.0);
                break;
+
        case Bars:
-               bars_ebox.set_flags (Gtk::HAS_FOCUS);
-               bars_ebox.set_state (Gtk::STATE_ACTIVE);
+               BBT.bars = 1;
+               BBT.beats = 0;
+               BBT.ticks = 0;
+               f = _session->tempo_map().bbt_duration_at (pos,BBT,dir);
                break;
        case Beats:
-               beats_ebox.set_flags (Gtk::HAS_FOCUS);
-               beats_ebox.set_state (Gtk::STATE_ACTIVE);
+               BBT.bars = 0;
+               BBT.beats = 1;
+               BBT.ticks = 0;
+               f = _session->tempo_map().bbt_duration_at(pos,BBT,dir);
                break;
        case Ticks:
-               ticks_ebox.set_flags (Gtk::HAS_FOCUS);
-               ticks_ebox.set_state (Gtk::STATE_ACTIVE);
+               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 false;
+       return f;
 }
 
-bool
-AudioClock::field_focus_out_event (GdkEventFocus */*ev*/, Field field)
+framepos_t
+AudioClock::current_time (framepos_t pos) const
 {
-       switch (field) {
+       // if (!_canonical_time_is_displayed) {
+       // return _canonical_time;
+        //}
 
-       case Timecode_Hours:
-               hours_ebox.unset_flags (Gtk::HAS_FOCUS);
-               hours_ebox.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Timecode_Minutes:
-               minutes_ebox.unset_flags (Gtk::HAS_FOCUS);
-               minutes_ebox.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Timecode_Seconds:
-               seconds_ebox.unset_flags (Gtk::HAS_FOCUS);
-               seconds_ebox.set_state (Gtk::STATE_NORMAL);
+       framepos_t ret = 0;
+
+       switch (_mode) {
+       case Timecode:
+               ret = timecode_frame_from_display ();
                break;
-       case Timecode_Frames:
-               frames_ebox.unset_flags (Gtk::HAS_FOCUS);
-               frames_ebox.set_state (Gtk::STATE_NORMAL);
+       case BBT:
+               ret = bbt_frame_from_display (pos);
                break;
 
-       case AudioFrames:
-               audio_frames_ebox.unset_flags (Gtk::HAS_FOCUS);
-               audio_frames_ebox.set_state (Gtk::STATE_NORMAL);
+       case MinSec:
+               ret = minsec_frame_from_display ();
                break;
 
-       case MS_Hours:
-               ms_hours_ebox.unset_flags (Gtk::HAS_FOCUS);
-               ms_hours_ebox.set_state (Gtk::STATE_NORMAL);
+       case Frames:
+               ret = audio_frame_from_display ();
                break;
-       case MS_Minutes:
-               ms_minutes_ebox.unset_flags (Gtk::HAS_FOCUS);
-               ms_minutes_ebox.set_state (Gtk::STATE_NORMAL);
+       }
+
+       return ret;
+}
+
+framepos_t
+AudioClock::current_duration (framepos_t pos) const
+{
+       framepos_t ret = 0;
+
+       switch (_mode) {
+       case Timecode:
+               ret = timecode_frame_from_display ();
                break;
-       case MS_Seconds:
-               ms_seconds_ebox.unset_flags (Gtk::HAS_FOCUS);
-               ms_seconds_ebox.set_state (Gtk::STATE_NORMAL);
+       case BBT:
+               ret = bbt_frame_duration_from_display (pos);
                break;
 
-       case Bars:
-               bars_ebox.unset_flags (Gtk::HAS_FOCUS);
-               bars_ebox.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Beats:
-               beats_ebox.unset_flags (Gtk::HAS_FOCUS);
-               beats_ebox.set_state (Gtk::STATE_NORMAL);
+       case MinSec:
+               ret = minsec_frame_from_display ();
                break;
-       case Ticks:
-               ticks_ebox.unset_flags (Gtk::HAS_FOCUS);
-               ticks_ebox.set_state (Gtk::STATE_NORMAL);
+
+       case Frames:
+               ret = audio_frame_from_display ();
                break;
        }
 
-       Keyboard::magic_widget_drop_focus ();
-
-       return false;
+       return ret;
 }
 
 bool
-AudioClock::field_button_release_event (GdkEventButton *ev, Field field)
+AudioClock::bbt_validate_edit (const string& str)
 {
-       if (dragging) {
-               cerr << "button event on clock but we are dragging\n";
-               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 ();
-               }
-               ops_menu->popup (1, ev->time);
-               return true;
-       }
+       AnyTime any;
 
-       if (Keyboard::is_context_menu_event (ev)) {
-               cerr << "Context menu event on clock\n";
-               if (ops_menu == 0) {
-                       build_ops_menu ();
-               }
-               ops_menu->popup (1, ev->time);
-               return true;
+       sscanf (str.c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks);
+       
+       if (!is_duration && any.bbt.bars == 0) {
+               return false;
        }
 
-       switch (ev->button) {
-       case 1:
-               switch (field) {
-               case Timecode_Hours:
-                       hours_ebox.grab_focus();
-                       break;
-               case Timecode_Minutes:
-                       minutes_ebox.grab_focus();
-                       break;
-               case Timecode_Seconds:
-                       seconds_ebox.grab_focus();
-                       break;
-               case Timecode_Frames:
-                       frames_ebox.grab_focus();
-                       break;
-
-               case AudioFrames:
-                       audio_frames_ebox.grab_focus();
-                       break;
-
-               case MS_Hours:
-                       ms_hours_ebox.grab_focus();
-                       break;
-               case MS_Minutes:
-                       ms_minutes_ebox.grab_focus();
-                       break;
-               case MS_Seconds:
-                       ms_seconds_ebox.grab_focus();
-                       break;
-
-               case Bars:
-                       bars_ebox.grab_focus ();
-                       break;
-               case Beats:
-                       beats_ebox.grab_focus ();
-                       break;
-               case Ticks:
-                       ticks_ebox.grab_focus ();
-                       break;
-               }
-               break;
-
-       default:
-               break;
+       if (!is_duration && any.bbt.beats == 0) {
+               return false;
        }
 
        return true;
 }
 
 bool
-AudioClock::field_button_press_event (GdkEventButton *ev, Field /*field*/)
+AudioClock::timecode_validate_edit (const string& str)
 {
-       if (_session == 0) {
+       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;
        }
 
-       nframes_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 */
+       if (TC.minutes > 59 || TC.seconds > 59) {
                return false;
-               break;
+       }
 
-       default:
+       if (TC.frames > (long)rint(_session->timecode_frames_per_second()) - 1) {
                return false;
-               break;
+       }
+
+       if (_session->timecode_drop_frames()) {
+               if (TC.minutes % 10 && TC.seconds == 0 && TC.frames < 2) {
+                       return false;
+               }
        }
 
        return true;
 }
 
-bool
-AudioClock::field_button_scroll_event (GdkEventScroll *ev, Field field)
+framepos_t
+AudioClock::timecode_frame_from_display () const
 {
        if (_session == 0) {
-               return false;
+               return 0;
        }
 
-       nframes_t frames = 0;
+       Timecode::Time TC;
+       framepos_t sample;
 
-       switch (ev->direction) {
+       sscanf (_layout->get_text().c_str(), "%d:%d:%d:%d", &TC.hours, &TC.minutes, &TC.seconds, &TC.frames);
 
-       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;
+       TC.rate = _session->timecode_frames_per_second();
+       TC.drop= _session->timecode_drop_frames();
 
-       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;
-
-       default:
-               return false;
-               break;
-       }
+       _session->timecode_to_sample (TC, sample, false /* use_offset */, false /* use_subframes */ );
+       
+       // timecode_tester ();
 
-       return true;
+       return sample;
 }
 
-bool
-AudioClock::field_motion_notify_event (GdkEventMotion *ev, Field field)
+framepos_t
+AudioClock::minsec_frame_from_display () const
 {
-       if (_session == 0 || !dragging) {
-               return false;
+       if (_session == 0) {
+               return 0;
        }
 
-       float pixel_frame_scale_factor = 0.2f;
+       int hrs, mins, secs, millisecs;
+       framecnt_t sr = _session->frame_rate();
 
-/*
-       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier))  {
-               pixel_frame_scale_factor = 0.1f;
-       }
+       sscanf (_layout->get_text().c_str(), "%d:%d:%d:%d", &hrs, &mins, &secs, &millisecs);
+       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
+{
+       if (_session == 0) {
+               error << "AudioClock::current_time() called with BBT mode but without session!" << endmsg;
+               return 0;
+       }
 
-       if (Keyboard::modifier_state_contains (ev->state,
-                                              Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) {
+       AnyTime any;
+       any.type = AnyTime::BBT;
 
-               pixel_frame_scale_factor = 0.025f;
-       }
-*/
-       double y_delta = ev->y - drag_y;
+       sscanf (_layout->get_text().c_str(), "%" PRId32 "|%" PRId32 "|%" PRId32, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks);
 
-       drag_accum +=  y_delta*pixel_frame_scale_factor;
+       if (is_duration) {
+               any.bbt.bars++;
+               any.bbt.beats++;
+                return _session->any_duration_to_frames (pos, any);
+       } else {
+                return _session->convert_to_frames (any);
+        }
+}
 
-       drag_y = ev->y;
 
-       if (trunc(drag_accum) != 0) {
+framepos_t
+AudioClock::bbt_frame_duration_from_display (framepos_t pos) const
+{
+       if (_session == 0) {
+               error << "AudioClock::current_time() called with BBT mode but without session!" << endmsg;
+               return 0;
+       }
 
-               nframes_t frames;
-               nframes_t pos ;
-               int dir;
-               dir = (drag_accum < 0 ? 1:-1);
-               pos = current_time();
-               frames = get_frames (field,pos,dir);
+       Timecode::BBT_Time bbt;
 
-               if (frames  != 0 &&  frames * drag_accum < current_time()) {
+       sscanf (_layout->get_text().c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, &bbt.bars, &bbt.beats, &bbt.ticks);
 
-                       set ((nframes_t) floor (pos - drag_accum * frames), false); // minus because up is negative in computer-land
+       return _session->tempo_map().bbt_duration_at(pos,bbt,1);
+}
 
-               } else {
-                       set (0 , false);
+framepos_t
+AudioClock::audio_frame_from_display () const
+{
+       framepos_t f;
+       sscanf (_layout->get_text().c_str(), "%" PRId64, &f);
+       return f;
+}
 
-               }
+void
+AudioClock::build_ops_menu ()
+{
+       using namespace Menu_Helpers;
+       ops_menu = new Menu;
+       MenuList& ops_items = ops_menu->items();
+       ops_menu->set_name ("ArdourContextMenu");
 
-               drag_accum= 0;
-               ValueChanged();  /* EMIT_SIGNAL */
+       if (!Profile->get_sae()) {
+               ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Timecode)));
+       }
+       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)));
 
+       if (editable && !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)));
+       }
+}
 
+void
+AudioClock::set_from_playhead ()
+{
+       if (!_session) {
+               return;
        }
 
-       return true;
+       set (_session->transport_frame());
+       ValueChanged ();
 }
 
-nframes_t
-AudioClock::get_frames (Field field,nframes_t pos,int dir)
+void
+AudioClock::locate ()
 {
-
-       nframes_t frames = 0;
-       BBT_Time bbt;
-       switch (field) {
-       case Timecode_Hours:
-               frames = (nframes_t) floor (3600.0 * _session->frame_rate());
-               break;
-       case Timecode_Minutes:
-               frames = (nframes_t) floor (60.0 * _session->frame_rate());
-               break;
-       case Timecode_Seconds:
-               frames = _session->frame_rate();
-               break;
-       case Timecode_Frames:
-               frames = (nframes_t) floor (_session->frame_rate() / _session->timecode_frames_per_second());
-               break;
-
-       case AudioFrames:
-               frames = 1;
-               break;
-
-       case MS_Hours:
-               frames = (nframes_t) floor (3600.0 * _session->frame_rate());
-               break;
-       case MS_Minutes:
-               frames = (nframes_t) floor (60.0 * _session->frame_rate());
-               break;
-       case MS_Seconds:
-               frames = _session->frame_rate();
-               break;
-
-       case Bars:
-               bbt.bars = 1;
-               bbt.beats = 0;
-               bbt.ticks = 0;
-               frames = _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);
-               break;
-       case Ticks:
-               bbt.bars = 0;
-               bbt.beats = 0;
-               bbt.ticks = 1;
-               frames = _session->tempo_map().bbt_duration_at(pos,bbt,dir);
-               break;
+       if (!_session || is_duration) {
+               return;
        }
 
-       return frames;
+       _session->request_locate (current_time(), _session->transport_rolling ());
 }
 
-nframes_t
-AudioClock::current_time (nframes_t pos) const
+void
+AudioClock::set_mode (Mode m)
 {
-       nframes_t ret = 0;
+       if (_mode == m) {
+               return;
+       }
+
+       _mode = m;
 
        switch (_mode) {
        case Timecode:
-               ret = timecode_frame_from_display ();
+               insert_max = 9; // 8 digits + sign [-]2:2:2:2
+               mode_based_info_ratio = 0.5;
                break;
+               
        case BBT:
-               ret = bbt_frame_from_display (pos);
+               insert_max = 8; // 8 digits, 2|2|4
+               mode_based_info_ratio = 0.5;
                break;
-
+               
        case MinSec:
-               ret = minsec_frame_from_display ();
+               insert_max = 9; // 7 digits 2:2:2.3
+               mode_based_info_ratio = 1.0;
                break;
-
+               
        case Frames:
-               ret = audio_frame_from_display ();
-               break;
-
-       case Off:
+               insert_max = INT_MAX;
+               mode_based_info_ratio = 1.0;
                break;
        }
 
-       return ret;
-}
+       set (last_when, true);
 
-nframes_t
-AudioClock::current_duration (nframes_t pos) const
-{
-       nframes_t ret = 0;
+        if (!is_transient) {
+                ModeChanged (); /* EMIT SIGNAL (the static one)*/
+        }
 
-       switch (_mode) {
-       case Timecode:
-               ret = timecode_frame_from_display ();
-               break;
-       case BBT:
-               ret = bbt_frame_duration_from_display (pos);
-               break;
+        mode_changed (); /* EMIT SIGNAL (the member one) */
+}
 
-       case MinSec:
-               ret = minsec_frame_from_display ();
-               break;
+void
+AudioClock::set_bbt_reference (framepos_t pos)
+{
+       bbt_reference_time = pos;
+}
 
-       case Frames:
-               ret = audio_frame_from_display ();
-               break;
+void
+AudioClock::on_style_changed (const Glib::RefPtr<Gtk::Style>& old_style)
+{
+       CairoWidget::on_style_changed (old_style);
+       set_font ();
+       set_colors ();
+}
 
-       case Off:
-               break;
+void
+AudioClock::set_is_duration (bool yn)
+{
+       if (yn == is_duration) {
+               return;
        }
 
-       return ret;
+       is_duration = yn;
+       set (last_when, true, 0, 's');
 }
 
 void
-AudioClock::timecode_sanitize_display()
+AudioClock::set_off (bool yn) 
 {
-       // Check Timecode fields for sanity, possibly adjusting values
-       if (atoi(minutes_label.get_text()) > 59) {
-               minutes_label.set_text("59");
+       if (_off == yn) {
+               return;
        }
 
-       if (atoi(seconds_label.get_text()) > 59) {
-               seconds_label.set_text("59");
-       }
+       _off = yn;
 
-       switch ((long)rint(_session->timecode_frames_per_second())) {
-       case 24:
-               if (atoi(frames_label.get_text()) > 23) {
-                       frames_label.set_text("23");
-               }
-               break;
-       case 25:
-               if (atoi(frames_label.get_text()) > 24) {
-                       frames_label.set_text("24");
-               }
-               break;
-       case 30:
-               if (atoi(frames_label.get_text()) > 29) {
-                       frames_label.set_text("29");
-               }
-               break;
-       default:
-               break;
+       if (_off) {
+               _canonical_time = current_time ();
+               _canonical_time_is_displayed = false;
+       } else {
+               _canonical_time_is_displayed = true;
        }
 
-       if (_session->timecode_drop_frames()) {
-               if ((atoi(minutes_label.get_text()) % 10) && (atoi(seconds_label.get_text()) == 0) && (atoi(frames_label.get_text()) < 2)) {
-                       frames_label.set_text("02");
-               }
-       }
+       /* force a possible redraw */
+       
+       set (_canonical_time, true);
 }
 
-nframes_t
-AudioClock::timecode_frame_from_display () const
+void
+AudioClock::focus ()
 {
-       if (_session == 0) {
-               return 0;
-       }
-
-       Timecode::Time timecode;
-       nframes_t sample;
-
-       timecode.hours = atoi (hours_label.get_text());
-       timecode.minutes = atoi (minutes_label.get_text());
-       timecode.seconds = atoi (seconds_label.get_text());
-       timecode.frames = atoi (frames_label.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 */ );
+       start_edit ();
+}
 
+void
+AudioClock::set_draw_background (bool yn)
+{
+       _need_bg = yn;
+}
 
+void
+AudioClock::timecode_tester ()
+{
 #if 0
 #define Timecode_SAMPLE_TEST_1
 #define Timecode_SAMPLE_TEST_2
@@ -1515,12 +1515,12 @@ AudioClock::timecode_frame_from_display () const
 
        // Testcode for timecode<->sample conversions (P.S.)
        Timecode::Time timecode1;
-       nframes_t sample1;
-       nframes_t oldsample = 0;
+       framepos_t sample1;
+       framepos_t oldsample = 0;
        Timecode::Time timecode2;
-       nframes_t sample_increment;
+       framecnt_t sample_increment;
 
-       sample_increment = (long)rint(_session->frame_rate() / _session->timecode_frames_per_second);
+       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
@@ -1873,211 +1873,4 @@ AudioClock::timecode_frame_from_display () const
 #endif
 
 #endif
-
-       return sample;
-}
-
-nframes_t
-AudioClock::minsec_frame_from_display () const
-{
-       if (_session == 0) {
-               return 0;
-       }
-
-       int hrs = atoi (ms_hours_label.get_text());
-       int mins = atoi (ms_minutes_label.get_text());
-       float secs = atof (ms_seconds_label.get_text());
-
-       nframes_t sr = _session->frame_rate();
-
-       return (nframes_t) floor ((hrs * 60.0f * 60.0f * sr) + (mins * 60.0f * sr) + (secs * sr));
-}
-
-nframes_t
-AudioClock::bbt_frame_from_display (nframes_t pos) const
-{
-       if (_session == 0) {
-               error << "AudioClock::current_time() called with BBT mode but without session!" << endmsg;
-               return 0;
-       }
-
-       AnyTime any;
-       any.type = AnyTime::BBT;
-
-       any.bbt.bars = atoi (bars_label.get_text());
-       any.bbt.beats = atoi (beats_label.get_text());
-       any.bbt.ticks = atoi (ticks_label.get_text());
-
-       if (is_duration) {
-               any.bbt.bars++;
-               any.bbt.beats++;
-       }
-
-       nframes_t ret = _session->convert_to_frames_at (pos, any);
-
-       return ret;
-}
-
-
-nframes_t
-AudioClock::bbt_frame_duration_from_display (nframes_t pos) const
-{
-       if (_session == 0) {
-               error << "AudioClock::current_time() called with BBT mode but without session!" << endmsg;
-               return 0;
-       }
-
-       BBT_Time bbt;
-
-
-       bbt.bars = atoi (bars_label.get_text());
-       bbt.beats = atoi (beats_label.get_text());
-       bbt.ticks = atoi (ticks_label.get_text());
-
-       return _session->tempo_map().bbt_duration_at(pos,bbt,1);
-}
-
-nframes_t
-AudioClock::audio_frame_from_display () const
-{
-       return (nframes_t) atoi (audio_frames_label.get_text());
-}
-
-void
-AudioClock::build_ops_menu ()
-{
-       using namespace Menu_Helpers;
-       ops_menu = new Menu;
-       MenuList& ops_items = ops_menu->items();
-       ops_menu->set_name ("ArdourContextMenu");
-
-       if (!Profile->get_sae()) {
-               ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Timecode)));
-       }
-       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) {
-               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)));
-       }
-}
-
-void
-AudioClock::set_from_playhead ()
-{
-       if (!_session) {
-               return;
-       }
-       
-       set (_session->transport_frame());
-}
-
-void
-AudioClock::locate ()
-{
-       if (!_session || is_duration) {
-               return;
-       }
-       
-       _session->request_locate (current_time(), false);
-}
-
-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;
-
-       switch (_mode) {
-       case Timecode:
-               clock_base.add (timecode_packer_hbox);
-               break;
-
-       case BBT:
-               clock_base.add (bbt_packer_hbox);
-               break;
-
-       case MinSec:
-               clock_base.add (minsec_packer_hbox);
-               break;
-
-       case Frames:
-               clock_base.add (frames_packer_hbox);
-               break;
-
-       case Off:
-               clock_base.add (off_hbox);
-               break;
-       }
-
-       set_size_requests ();
-
-       set (last_when, true);
-       clock_base.show_all ();
-       key_entry_state = 0;
-
-       if (!is_transient) {
-               ModeChanged (); /* EMIT SIGNAL */
-               mode_changed (); /* EMIT SIGNAL */
-       }
-}
-
-void
-AudioClock::set_size_requests ()
-{
-       /* note that in some fonts, "88" is narrower than "00", hence the 2 pixel padding */
-
-       switch (_mode) {
-       case Timecode:
-               Gtkmm2ext::set_size_request_to_display_given_text (hours_label, "-00", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (minutes_label, "00", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (seconds_label, "00", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (frames_label, "00", 5, 5);
-               break;
-
-       case BBT:
-               Gtkmm2ext::set_size_request_to_display_given_text (bars_label, "-000", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (beats_label, "00", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (ticks_label, "0000", 5, 5);
-               break;
-
-       case MinSec:
-               Gtkmm2ext::set_size_request_to_display_given_text (ms_hours_label, "00", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (ms_minutes_label, "00", 5, 5);
-               Gtkmm2ext::set_size_request_to_display_given_text (ms_seconds_label, "00.000", 5, 5);
-               break;
-
-       case Frames:
-               Gtkmm2ext::set_size_request_to_display_given_text (audio_frames_label, "0000000000", 5, 5);
-               break;
-
-       case Off:
-               Gtkmm2ext::set_size_request_to_display_given_text (off_hbox, "00000", 5, 5);
-               break;
-
-       }
-}
-
-void
-AudioClock::set_bbt_reference (nframes64_t pos)
-{
-       bbt_reference_time = pos;
 }