Merge branch 'windows+cc' into cairocanvas

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 26da869ee523714d439233abf88cdc595cd31951..a22ba9443959d12be288aeb8d7b9f345cd0d6533 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -44,7 +44,6 @@
 #include "axis_view.h"
 #include "enums.h"
 #include "editing.h"
-#include "canvas.h"
 
 namespace ARDOUR {
        class Session;
@@ -58,6 +57,12 @@ namespace Gtk {
        class Menu;
 }
 
+namespace ArdourCanvas {
+       class Canvas;
+       class Group;
+       class Item;
+}
+
 class PublicEditor;
 class RegionSelection;
 class TimeSelection;
@@ -68,6 +73,7 @@ class Selectable;
 class RegionView;
 class GhostRegion;
 class StreamView;
+class ArdourDialog;
 
 /** Abstract base class for time-axis views (horizontal editor 'strips')
  *
@@ -99,7 +105,6 @@ class TimeAxisView : public virtual AxisView
         virtual void leave_internal_edit_mode () {}
 
        ArdourCanvas::Group* canvas_display () { return _canvas_display; }
-       ArdourCanvas::Group* canvas_background () { return _canvas_background; }
        ArdourCanvas::Group* ghost_group () { return _ghost_group; }
 
        /** @return effective height (taking children into account) in canvas units, or
@@ -116,16 +121,9 @@ class TimeAxisView : public virtual AxisView
 
        void idle_resize (uint32_t);
 
-       void hide_name_label ();
-       void hide_name_entry ();
-       void show_name_label ();
-       void show_name_entry ();
-
        virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
        virtual void hide ();
 
-       void clip_to_viewport ();
-
        bool touched (double top, double bot);
 
        /** @return true if hidden, otherwise false */
@@ -153,7 +151,7 @@ class TimeAxisView : public virtual AxisView
        virtual ARDOUR::RouteGroup* route_group() const { return 0; }
        virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
 
-       virtual void set_samples_per_unit (double);
+       virtual void set_samples_per_pixel (double);
        virtual void show_selection (TimeSelection&);
        virtual void hide_selection ();
        virtual void reshow_selection (TimeSelection&);
@@ -200,35 +198,44 @@ class TimeAxisView : public virtual AxisView
 
   protected:
        /* The Standard LHS Controls */
-       Gtk::HBox             controls_hbox;
-       Gtk::Table            controls_table;
-       Gtk::EventBox         controls_ebox;
-       Gtk::VBox             controls_vbox;
-       Gtk::VBox             time_axis_vbox;
-       Gtk::HBox             name_hbox;
-       Gtk::Frame            name_frame;
-       Gtkmm2ext::FocusEntry name_entry;
-
-       uint32_t height;  /* in canvas units */
-
-       std::string controls_base_unselected_name;
-       std::string controls_base_selected_name;
+       Gtk::HBox              controls_hbox;
+       Gtk::Table             controls_table;
+       Gtk::EventBox          controls_ebox;
+       Gtk::VBox              controls_vbox;
+       Gtk::VBox              time_axis_vbox;
+       Gtk::HBox              name_hbox;
+       Gtk::Label             name_label;
+        bool                  _name_editing;
+        uint32_t               height;  /* in canvas units */
+       std::string            controls_base_unselected_name;
+       std::string            controls_base_selected_name;
+       Gtk::Menu*             display_menu; /* The standard LHS Track control popup-menus */
+       TimeAxisView*          parent;
+       ArdourCanvas::Group*   selection_group;
+       ArdourCanvas::Group*  _ghost_group;
+       std::list<GhostRegion*> ghosts;
+       std::list<SelectionRect*> free_selection_rects;
+       std::list<SelectionRect*> used_selection_rects;
+       bool                  _hidden;
+       bool                   in_destructor;
+       Gtk::Menu*            _size_menu;
+       ArdourCanvas::Group*  _canvas_display;
+       double                _y_position;
+       PublicEditor&         _editor;
 
         virtual bool can_edit_name() const;
 
-       bool name_entry_button_press (GdkEventButton *ev);
-       bool name_entry_button_release (GdkEventButton *ev);
        bool name_entry_key_release (GdkEventKey *ev);
-       void name_entry_activated ();
-       sigc::connection name_entry_key_timeout;
-       bool name_entry_key_timed_out ();
-       guint32 last_name_entry_key_press_event;
+       bool name_entry_key_press (GdkEventKey *ev);
+       bool name_entry_focus_out (GdkEventFocus *ev);
+
+        Gtk::Entry* name_entry;
+        void begin_name_edit ();
+        void end_name_edit (int);
 
        /* derived classes can override these */
 
        virtual void name_entry_changed ();
-       virtual bool name_entry_focus_in (GdkEventFocus *ev);
-       virtual bool name_entry_focus_out (GdkEventFocus *ev);
 
        /** Handle mouse relaese on our LHS control name ebox.
         *
@@ -255,14 +262,6 @@ class TimeAxisView : public virtual AxisView
         */
        virtual bool handle_display_menu_map_event (GdkEventAny * /*ev*/) { return false; }
 
-       /* The standard LHS Track control popup-menus */
-
-       Gtk::Menu *display_menu;
-
-       Gtk::Label    name_label;
-
-       TimeAxisView* parent;
-
        Children children;
        bool is_child (TimeAxisView*);
 
@@ -271,48 +270,28 @@ class TimeAxisView : public virtual AxisView
 
        /* selection display */
 
-       ArdourCanvas::Group      *selection_group;
-
-       std::list<GhostRegion*> ghosts;
-
-       std::list<SelectionRect*> free_selection_rects;
-       std::list<SelectionRect*> used_selection_rects;
-
        virtual void selection_click (GdkEventButton*);
 
-       bool _hidden;
-       bool _has_state;
-       bool in_destructor;
-       NamePackingBits name_packing;
-
        void color_handler ();
 
        void conditionally_add_to_selection ();
 
        void build_size_menu ();
-       Gtk::Menu* _size_menu;
-
-       ArdourCanvas::Group* _canvas_display;
-       double _y_position;
-       PublicEditor& _editor;
 
 private:
+       Gtk::VBox*            control_parent;
+       int                  _order;
+       uint32_t             _effective_height;
+       double               _resize_drag_start;
+       GdkCursor*           _preresize_cursor;
+       bool                 _have_preresize_cursor;
+        bool                  _ebox_release_can_act;
 
-       ArdourCanvas::Group* _canvas_background;
-       Gtk::VBox* control_parent;
-       int _order;
-       uint32_t _effective_height;
-       double _resize_drag_start;
-       GdkCursor* _preresize_cursor;
-       bool       _have_preresize_cursor;
-       ArdourCanvas::Group* _ghost_group;
-
-       void compute_heights ();
        static uint32_t button_height;
        static uint32_t extra_height;
-
        static int const _max_order;
        
+       void compute_heights ();
        bool maybe_set_cursor (int y);
 
 }; /* class TimeAxisView */