fixes from Carl H for a couple of buglets
[ardour.git] / gtk2_ardour / time_axis_view.cc
index 8eb58d0c610d360b777adeb69168bc55e3a68edd..0a5d65b13dff56387b83c8aeb80af8f9d3af7514 100644 (file)
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -24,7 +23,7 @@
 #include <string>
 #include <list>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/canvas.h>
 #include <libgnomecanvasmm/item.h>
 
@@ -55,16 +54,30 @@ using namespace Gtk;
 using namespace Gdk;
 using namespace sigc; 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
 
 const double trim_handle_size = 6.0; /* pixels */
 
+uint32_t TimeAxisView::hLargest = 0;
+uint32_t TimeAxisView::hLarge = 0;
+uint32_t TimeAxisView::hLarger = 0;
+uint32_t TimeAxisView::hNormal = 0;
+uint32_t TimeAxisView::hSmaller = 0;
+uint32_t TimeAxisView::hSmall = 0;
+bool TimeAxisView::need_size_info = true;
+
 TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* rent, Canvas& canvas) 
        : AxisView (sess), 
          editor (ed),
-         controls_table (2, 9)
+         controls_table (2, 8)
 {
+       if (need_size_info) {
+               compute_controls_size_info ();
+               need_size_info = false;
+       }
+
        canvas_display = new Group (*canvas.root(), 0.0, 0.0);
        
        selection_group = new Group (*canvas_display);
@@ -80,6 +93,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
        parent = rent;
        _has_state = false;
        last_name_entry_key_press_event = 0;
+       name_packing = NamePackingBits (0);
 
        /*
          Create the standard LHS Controls
@@ -99,27 +113,21 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
        name_label.set_name ("TrackLabel");
        name_label.set_alignment (0.0, 0.5);
 
-       // name_hbox.set_border_width (2);
-       // name_hbox.set_spacing (5);
-
        /* typically, either name_label OR name_entry are visible,
           but not both. its up to derived classes to show/hide them as they
           wish.
        */
 
-       name_hbox.pack_start (name_label, true, true);
-       name_hbox.pack_start (name_entry, true, true);
        name_hbox.show ();
 
        controls_table.set_border_width (2);
        controls_table.set_row_spacings (0);
        controls_table.set_col_spacings (0);
        controls_table.set_homogeneous (true);
-       controls_table.show ();
 
-       controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-
-       controls_table.show ();
+       controls_table.attach (name_hbox, 0, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       controls_table.show_all ();
+       controls_table.set_no_show_all ();
 
        controls_vbox.pack_start (controls_table, false, false);
        controls_vbox.show ();
@@ -141,6 +149,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
        controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
        controls_frame.set_shadow_type (Gtk::SHADOW_OUT);
 
+       ColorChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
 }
 
 TimeAxisView::~TimeAxisView()
@@ -176,11 +185,6 @@ TimeAxisView::~TimeAxisView()
                delete display_menu;
                display_menu = 0;
        }
-
-       if (size_menu) {
-               delete size_menu;
-               size_menu = 0;
-       }
 }
 
 guint32
@@ -229,7 +233,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
                
                if (canvas_item_visible ((*i)->canvas_display)) {
                        ++nth;
-                       effective_height += (*i)->show_at (y + effective_height, nth, parent);
+                       effective_height += (*i)->show_at (y + 1 + effective_height, nth, parent);
                }
        }
 
@@ -241,15 +245,15 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 {
        switch (ev->direction) {
        case GDK_SCROLL_UP:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-                       step_height (true);
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
+                       step_height (false);
                        return true;
                }
                break;
                
        case GDK_SCROLL_DOWN:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-                       step_height (false);
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
+                       step_height (true);
                        return true;
                }
                break;
@@ -281,18 +285,8 @@ TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
 void
 TimeAxisView::selection_click (GdkEventButton* ev)
 {
-       if (Keyboard::modifier_state_contains (ev->state, Keyboard::Shift)) {
-
-               if (editor.get_selection().selected (this)) {
-                       editor.get_selection().remove (this);
-               } else {
-                       editor.get_selection().add (this);
-               }
-
-       } else {
-
-               editor.get_selection().set (this);
-       }
+       Selection::Operation op = Keyboard::selection_type (ev->state);
+       editor.set_selected_track (*this, op, false);
 }
 
 void
@@ -325,36 +319,48 @@ TimeAxisView::hide ()
 void
 TimeAxisView::step_height (bool bigger)
 {
-       switch (height) {
-       case Largest:
-               if (!bigger) set_height (Large);
-               break;
-       case Large:
-               if (bigger) set_height (Largest);
-               else set_height (Larger);
-               break;
-       case Larger:
-               if (bigger) set_height (Large);
-               else set_height (Normal);
-               break;
-       case Normal:
-               if (bigger) set_height (Larger);
-               else set_height (Smaller);
-               break;
-       case Smaller:
-               if (bigger) set_height (Normal);
-               else set_height (Small);
-               break;
-       case Small:
-               if (bigger) set_height (Smaller);
-               break;
-       }
+  
+       if (height == hLargest) {
+               if (!bigger) set_height (Large);
+               return;
+       }
+       if (height == hLarge) {
+               if (bigger) set_height (Largest);
+                else set_height (Larger);
+               return;
+       }
+       if (height == hLarger) {
+                if (bigger) set_height (Large);
+                else set_height (Normal);
+               return;
+       }
+       if (height == hNormal) {
+                if (bigger) set_height (Larger);
+                else set_height (Smaller);
+               return;
+       }
+       if (height == hSmaller) {
+                if (bigger) set_height (Normal);
+                else set_height (Small);
+               return;
+       }
+       if (height == hSmall) {
+                if (bigger) set_height (Smaller);
+               return;
+       }
 }
 
 void
 TimeAxisView::set_height (TrackHeight h)
 {
-       height = (gint32) h;
+       height_style = h;
+       set_height_pixels (height_to_pixels (h));
+}
+
+void
+TimeAxisView::set_height_pixels (uint32_t h)
+{
+       height = h;
        controls_frame.set_size_request (-1, height);
 
        if (canvas_item_visible (selection_group)) {
@@ -366,8 +372,48 @@ TimeAxisView::set_height (TrackHeight h)
 bool
 TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 {
+       PublicEditor::TrackViewList *allviews = 0;
+       PublicEditor::TrackViewList::iterator i;
+
        switch (ev->keyval) {
+       case GDK_Escape:
+               name_entry.select_region (0,0);
+               controls_ebox.grab_focus ();
+               name_entry_changed ();
+               return true;
+
+       /* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
+        * generates a different ev->keyval, rather than setting 
+        * ev->state.
+        */
+       case GDK_ISO_Left_Tab:
        case GDK_Tab:
+               name_entry_changed ();
+               allviews = editor.get_valid_views (0);
+               if (allviews != 0) {
+                       i = find (allviews->begin(), allviews->end(), this);
+                       if (ev->keyval == GDK_Tab) {
+                               if (i != allviews->end()) {
+                                       do {
+                                               if (++i == allviews->end()) { return true; }
+                                       } while((*i)->hidden());
+                               }
+                       } else {
+                               if (i != allviews->begin()) {
+                                       do {
+                                               if (--i == allviews->begin()) { return true; }
+                                       } while ((*i)->hidden());
+                               }
+                       }
+
+                       if ((*i)->height_style == Small) {
+                               (*i)->set_height(Smaller);
+                       }
+                       
+                       (*i)->name_entry.grab_focus();
+               }
+               return true;
+
        case GDK_Up:
        case GDK_Down:
                name_entry_changed ();
@@ -417,6 +463,7 @@ TimeAxisView::name_entry_focus_out (GdkEventFocus* ev)
        last_name_entry_key_press_event = 0;
        name_entry_key_timeout.disconnect ();
        name_entry.set_name ("EditorTrackNameDisplay");
+       name_entry.select_region (0,0);
        
        /* do the real stuff */
 
@@ -468,12 +515,14 @@ TimeAxisView::popup_display_menu (guint32 when)
        if (display_menu == 0) {
                build_display_menu ();
        }
+       editor.set_selected_track (*this, Selection::Add);
        display_menu->popup (1, when);  
 }
 
 gint
 TimeAxisView::size_click (GdkEventButton *ev)
 {
+       editor.set_selected_track (*this, Selection::Add);
        popup_size_menu (ev->time);
        return TRUE;
 }
@@ -534,7 +583,7 @@ TimeAxisView::build_size_menu ()
        items.push_back (MenuElem (_("Large"), bind (mem_fun (*this, &TimeAxisView::set_height), Large)));
        items.push_back (MenuElem (_("Larger"), bind (mem_fun (*this, &TimeAxisView::set_height), Larger)));
        items.push_back (MenuElem (_("Normal"), bind (mem_fun (*this, &TimeAxisView::set_height), Normal)));
-       items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_height), Smaller)));
+       items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_height),Smaller)));
        items.push_back (MenuElem (_("Small"), bind (mem_fun (*this, &TimeAxisView::set_height), Small)));
 }
 
@@ -558,7 +607,7 @@ TimeAxisView::set_samples_per_unit (double spu)
 }
 
 void
-TimeAxisView::show_timestretch (jack_nframes_t start, jack_nframes_t end)
+TimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 {
        for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
                (*i)->show_timestretch (start, end);
@@ -600,7 +649,7 @@ TimeAxisView::show_selection (TimeSelection& ts)
        selection_group->raise_to_top();
        
        for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
-               jack_nframes_t start, end, cnt;
+               nframes_t start, end, cnt;
 
                start = (*i).start;
                end = (*i).end;
@@ -608,8 +657,8 @@ TimeAxisView::show_selection (TimeSelection& ts)
 
                rect = get_selection_rect ((*i).id);
                
-               x1 = start / editor.get_current_zoom();
-               x2 = (start + cnt - 1) / editor.get_current_zoom();
+               x1 = editor.frame_to_unit (start);
+               x2 = editor.frame_to_unit (start + cnt - 1);
                y2 = height;
 
                rect->rect->property_x1() = x1;
@@ -711,8 +760,9 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
        for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
                if ((*i)->id == id) {
+                       SelectionRect* ret = (*i);
                        free_selection_rects.erase (i);
-                       return (*i);
+                       return ret;
                }
        }
 
@@ -778,7 +828,7 @@ TimeAxisView::remove_child (TimeAxisView* child)
 }
 
 void
-TimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& result)
+TimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& result)
 {
        return;
 }
@@ -861,14 +911,179 @@ TimeAxisView::set_state (const XMLNode& node)
 void
 TimeAxisView::reset_height()
 {
-       set_height ((TrackHeight) height);
+       set_height_pixels (height);
 
        for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
-               (*i)->set_height ((TrackHeight)(*i)->height);
+               (*i)->set_height_pixels ((TrackHeight)(*i)->height);
        }
 }
        
+uint32_t
+TimeAxisView::height_to_pixels (TrackHeight h)
+{
+       switch (h) {
+       case Largest:
+               return hLargest;
+       case Large:
+               return hLarge;
+       case Larger:
+               return hLarger;
+       case Normal:
+               return hNormal;
+       case Smaller:
+               return hSmaller;
+       case Small:
+               return hSmall;
+       }
+       
+       // what is wrong with gcc ?
+       
+       return hNormal;
+}
+                       
+void
+TimeAxisView::compute_controls_size_info ()
+{
+       Gtk::Window window (Gtk::WINDOW_TOPLEVEL);
+       Gtk::Table two_row_table (2, 8);
+       Gtk::Table one_row_table (1, 8);
+       Button* buttons[5];
+       const int border_width = 2;
+       const int extra_height = (2 * border_width) + 2; // 2 pixels for the controls frame
+
+       window.add (one_row_table);
+
+       one_row_table.set_border_width (border_width);
+       one_row_table.set_row_spacings (0);
+       one_row_table.set_col_spacings (0);
+       one_row_table.set_homogeneous (true);
+
+       two_row_table.set_border_width (border_width);
+       two_row_table.set_row_spacings (0);
+       two_row_table.set_col_spacings (0);
+       two_row_table.set_homogeneous (true);
+
+       for (int i = 0; i < 5; ++i) {
+               buttons[i] = manage (new Button (X_("f")));
+               buttons[i]->set_name ("TrackMuteButton");
+       }
+
+       one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       
+       one_row_table.show_all ();
+       Gtk::Requisition req(one_row_table.size_request ());
+
+
+       // height required to show 1 row of buttons
+
+       hSmaller = req.height + extra_height;
+
+       window.remove ();
+       window.add (two_row_table);
+
+       two_row_table.attach (*buttons[1], 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       two_row_table.attach (*buttons[2], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       two_row_table.attach (*buttons[3], 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+
+       two_row_table.show_all ();
+       req = two_row_table.size_request ();
+
+       // height required to show all normal buttons 
+
+       hNormal = req.height + extra_height;
+
+       // these heights are all just larger than normal. no more 
+       // elements are visible (yet).
+
+       hLarger = hNormal + 50;
+       hLarge = hNormal + 150;
+       hLargest = hNormal + 250;
+
+       // height required to show track name
+
+       hSmall = 27;
+}
+
+void
+TimeAxisView::show_name_label ()
+{
+       if (!(name_packing & NameLabelPacked)) {
+               name_hbox.pack_start (name_label, true, true);
+               name_packing = NamePackingBits (name_packing | NameLabelPacked);
+               name_hbox.show ();
+               name_label.show ();
+       }
+}
+
+void
+TimeAxisView::show_name_entry ()
+{
+       if (!(name_packing & NameEntryPacked)) {
+               name_hbox.pack_start (name_entry, true, true);
+               name_packing = NamePackingBits (name_packing | NameEntryPacked);
+               name_hbox.show ();
+               name_entry.show ();
+       }
+}
+
+void
+TimeAxisView::hide_name_label ()
+{
+       if (name_packing & NameLabelPacked) {
+               name_hbox.remove (name_label);
+               name_packing = NamePackingBits (name_packing & ~NameLabelPacked);
+       }
+}
+
+void
+TimeAxisView::hide_name_entry ()
+{
+       if (name_packing & NameEntryPacked) {
+               name_hbox.remove (name_entry);
+               name_packing = NamePackingBits (name_packing & ~NameEntryPacked);
+       }
+}
+
 void
-TimeAxisView::check_height (Gdk::Rectangle& r)
+TimeAxisView::color_handler (ColorID id, uint32_t val)
+{
+       switch (id) {
+       case cSelectionRectFill:
+               break;
+       case cSelectionRectOutline:
+               break;
+       case cSelectionStartFill:
+               break;
+       case cSelectionStartOutline:
+               break;
+       case cSelectionEndFill:
+               break;
+       case cSelectionEndOutline:
+               break;
+       default:
+               break;
+       }
+}
+
+TimeAxisView*
+TimeAxisView::covers_y_position (double y)
 {
+       if (hidden()) {
+               return 0;
+       }
+
+       if (y_position <= y && y < (y_position + height)) {
+               return this;
+       }
+
+       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+               TimeAxisView* tv;
+
+               if ((tv = (*i)->covers_y_position (y)) != 0) {
+                       return tv;
+               }
+       }
+
+       return 0;
 }