first round of audio-clock font rendering update

[ardour.git] / gtk2_ardour / audio_clock.h

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 061e790735272d9efaa797763d4edd2b0e60b8d2..5b1af6354e26e3e49456ae976df15aa99366aa36 100644 (file)
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -33,7 +33,7 @@
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 namespace ARDOUR {
        class Session;
@@ -58,16 +58,18 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
        bool off() const { return _off; }
        void set_widget_name (const std::string& name);
        void set_active_state (Gtkmm2ext::ActiveState s);
+       void set_editable (bool yn);
+       void set_corner_radius (double);
+       void set_fixed_width (bool);
 
        void focus ();
 
-       void set (framepos_t, bool force = false, ARDOUR::framecnt_t offset = 0, char which = 0);
+       void set (framepos_t, bool force = false, ARDOUR::framecnt_t offset = 0);
        void set_from_playhead ();
        void locate ();
        void set_mode (Mode);
        void set_bbt_reference (framepos_t);
         void set_is_duration (bool);
-       void set_draw_background (bool yn);
 
        std::string name() const { return _name; }
 
@@ -85,6 +87,9 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
   protected:
        void render (cairo_t*);
 
+       virtual void build_ops_menu ();
+       Gtk::Menu  *ops_menu;
+
   private:
        Mode             _mode;
        std::string      _name;
@@ -94,32 +99,38 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
        /** true if this clock follows the playhead, meaning that certain operations are redundant */
        bool             _follows_playhead;
        bool             _off;
-       bool             _need_bg;
-
-       Gtk::Menu  *ops_menu;
+       bool             _fixed_width;
+       int              layout_x_offset;
+       int              em_width;
+       bool             _edit_by_click_field;
 
        Glib::RefPtr<Pango::Layout> _layout;
        Glib::RefPtr<Pango::Layout> _left_layout;
        Glib::RefPtr<Pango::Layout> _right_layout;
 
        Pango::AttrColor*    editing_attr;
-       Pango::AttrColor*    background_attr;
        Pango::AttrColor*    foreground_attr;
 
        Pango::AttrList normal_attributes;
        Pango::AttrList editing_attributes;
        Pango::AttrList info_attributes;
 
+       int first_height;
+       int first_width;
        int layout_height;
        int layout_width;
        int info_height;
        int upper_height;
        double mode_based_info_ratio;
+       double corner_radius;
+       uint32_t font_size;
+
        static const double info_font_scale_factor;
        static const double separator_height;
+       static const double x_leading_padding;
 
        enum Field {
-               Timecode_Hours,
+               Timecode_Hours = 1,
                Timecode_Minutes,
                Timecode_Seconds,
                Timecode_Frames,
@@ -135,12 +146,19 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 
        Field index_to_field (int index) const;
 
+       /* this maps the number of input characters/digits when editing
+          to a cursor position. insert_map[N] = index of character/digit
+          where the cursor should be after N chars/digits. it is 
+          mode specific and so it is filled during set_mode().
+       */
+
+       std::vector<int> insert_map;
+
        bool editing;
        std::string edit_string;
        std::string pre_edit_string;
        std::string input_string;
-       std::string::size_type insert_max; 
-                          
+
        framepos_t bbt_reference_time;
        framepos_t last_when;
        bool last_pdelta;
@@ -152,13 +170,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
        double drag_accum;
        Field  drag_field;
 
-       /** true if the time of this clock is the one displayed in its widgets.
-        *  if false, the time in the widgets is an approximation of _canonical_time,
-        *  and _canonical_time should be returned as the `current' time of the clock.
-        */
-       bool _canonical_time_is_displayed;
-       framepos_t _canonical_time;
-
        void on_realize ();
        bool on_key_press_event (GdkEventKey *);
        bool on_key_release_event (GdkEventKey *);
@@ -180,20 +191,19 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 
        bool timecode_validate_edit (const std::string&);
        bool bbt_validate_edit (const std::string&);
+       bool minsec_validate_edit (const std::string&);
 
-       framepos_t timecode_frame_from_display () const;
-       framepos_t bbt_frame_from_display (framepos_t) const;
-       framepos_t bbt_frame_duration_from_display (framepos_t) const;
-       framepos_t minsec_frame_from_display () const;
-       framepos_t audio_frame_from_display () const;
-
-       void build_ops_menu ();
+       framepos_t frames_from_timecode_string (const std::string&) const;
+       framepos_t frames_from_bbt_string (framepos_t, const std::string&) const;
+       framepos_t frame_duration_from_bbt_string (framepos_t, const std::string&) const;
+       framepos_t frames_from_minsec_string (const std::string&) const;
+       framepos_t frames_from_audioframes_string (const std::string&) const;
 
        void session_configuration_changed (std::string);
 
        Field index_to_field () const;
 
-       void start_edit ();
+       void start_edit (Field f = Field (0));
        void end_edit (bool);
        void end_edit_relative (bool);
        void edit_next_field ();
@@ -207,10 +217,14 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
        void set_font ();
        void set_colors ();
        void show_edit_status (int length);
+       int  merge_input_and_edit_string ();
+       std::string get_field (Field);
 
-       void timecode_tester ();
+       void drop_focus ();
+       void dpi_reset ();
 
        double bg_r, bg_g, bg_b, bg_a;
+       double cursor_r, cursor_g, cursor_b, cursor_a;
 };
 
 #endif /* __audio_clock_h__ */