(1) use select next/previous row functions for tab/shift-tab navigation in region...
[ardour.git] / gtk2_ardour / editor_selection.cc
index 854d4ad98598d95c23eb75ae69758df4aba3bc5d..4fc418b8b3d8023d7cb593e1d813d4144780b937 100644 (file)
@@ -174,12 +174,97 @@ Editor::select_all_tracks ()
  *  tracks, in which case nothing will happen unless `force' is true.
  */
 void
-Editor::set_selected_track_as_side_effect (bool force)
+Editor::set_selected_track_as_side_effect (Selection::Operation op, bool /*force*/)
 {
        if (!clicked_axisview) {
                return;
        }
 
+#if 1
+        if (!clicked_routeview) {
+                return;
+        }
+
+        bool had_tracks = !selection->tracks.empty();
+        RouteGroup* group = clicked_routeview->route()->route_group();
+        RouteGroup& arg (_session->all_route_group());
+        
+       switch (op) {
+       case Selection::Toggle: 
+               if (selection->selected (clicked_axisview)) {
+                       if (arg.is_select() && arg.is_active()) {
+                               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+                                        selection->remove(*i);
+                               }
+                       } else if (group && group->is_active()) {
+                               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+                                       if ((*i)->route_group() == group)
+                                               selection->remove(*i);
+                               }
+                       } else {
+                               selection->remove (clicked_axisview);
+                        }
+               } else {
+                       if (arg.is_select() && arg.is_active()) {
+                               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+                                               selection->add(*i);
+                               }
+                       } else if (group && group->is_active()) {
+                               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+                                       if ( (*i)->route_group() == group)
+                                               selection->add(*i);
+                               }
+                        } else {
+                                selection->add (clicked_axisview);
+                        }
+               }
+                break;
+       
+       case Selection::Add: 
+               if (!had_tracks && arg.is_select() && arg.is_active()) {
+                        /* nothing was selected already, and all group is active etc. so use
+                           all tracks.
+                        */
+                       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+                                       selection->add(*i);
+                       }
+               } else if (group && group->is_active()) {
+                       for (TrackViewList::iterator i  = track_views.begin(); i != track_views.end (); ++i) {
+                               if ((*i)->route_group() == group)
+                                       selection->add(*i);
+                       }
+                } else {
+                       selection->add (clicked_axisview);
+                }
+                break;
+               
+       case Selection::Set:
+                selection->clear();
+               if (!had_tracks && arg.is_select() && arg.is_active()) {
+                        /* nothing was selected already, and all group is active etc. so use
+                           all tracks.
+                        */
+                       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+                                       selection->add(*i);
+                       }
+               } else if (group && group->is_active()) {
+                       for (TrackViewList::iterator i  = track_views.begin(); i != track_views.end (); ++i) {
+                               if ((*i)->route_group() == group)
+                                       selection->add(*i);
+                       }
+                } else {
+                       selection->set (clicked_axisview);
+                }
+                break;
+       
+       case Selection::Extend: 
+               selection->clear();
+               cerr << ("Editor::set_selected_track_as_side_effect  case  Selection::Add  not yet implemented\n");
+                break;
+       }
+
+#else // the older version
+
        if (!selection->tracks.empty()) {
                if (!selection->selected (clicked_axisview)) {
                        selection->add (clicked_axisview);
@@ -188,6 +273,7 @@ Editor::set_selected_track_as_side_effect (bool force)
        } else if (force) {
                selection->set (clicked_axisview);
        }
+#endif
 }
 
 void
@@ -344,7 +430,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionVi
 void
 Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions, PBD::PropertyID property) const
 {
-       mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview(), property);
+       mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_time_axis_view(), property);
 
        /* add clicked regionview since we skipped all other regions in the same track as the one it was in */
 
@@ -362,7 +448,7 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c
 
                mapover_tracks (
                        sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq),
-                       &(*i)->get_trackview(), prop
+                       &(*i)->get_time_axis_view(), prop
                        );
 
                for (vector<RegionView*>::iterator j = eq.begin(); j != eq.end(); ++j) {
@@ -500,14 +586,14 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
        } else if (op == Selection::Extend) {
 
                list<Selectable*> results;
-               nframes64_t last_frame;
-               nframes64_t first_frame;
+               framepos_t last_frame;
+               framepos_t first_frame;
                bool same_track = false;
 
                /* 1. find the last selected regionview in the track that was clicked in */
 
                last_frame = 0;
-               first_frame = max_frames;
+               first_frame = max_framepos;
 
                for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
                        if (&(*x)->get_time_axis_view() == &clicked_regionview->get_time_axis_view()) {
@@ -575,8 +661,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                        */
 
 
-                       first_frame = entered_regionview->region()->position();
-                       last_frame = entered_regionview->region()->last_frame();
+                       first_frame = clicked_regionview->region()->position();
+                       last_frame = clicked_regionview->region()->last_frame();
 
                        for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
                                if ((*i)->region()->position() < first_frame) {
@@ -610,9 +696,9 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
                           any selected ones.
                        */
 
-                       if (!selection->selected (entered_regionview)) {
+                       if (!selection->selected (clicked_regionview)) {
 
-                               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&entered_regionview->get_time_axis_view());
+                               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&clicked_regionview->get_time_axis_view());
 
                                if (rtv) {
 
@@ -797,13 +883,24 @@ Editor::track_selection_changed ()
        }
 
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-               (*i)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end());
 
-               TimeAxisView::Children c = (*i)->get_child_list ();
-               for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) {
-                       (*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
-               }
-       }
+                bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end());
+                
+                (*i)->set_selected (yn);
+                
+                TimeAxisView::Children c = (*i)->get_child_list ();
+                for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) {
+                        (*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
+                }
+
+                if (yn && 
+                    ((mouse_mode == MouseRange) || 
+                     ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+                        (*i)->reshow_selection (selection->time);
+                } else {
+                        (*i)->hide_selection ();
+                }
+        }
 
        ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
 }
@@ -860,13 +957,17 @@ Editor::region_selection_changed ()
        _regions->block_change_connection (true);
        editor_regions_selection_changed_connection.block(true);
 
-       _regions->unselect_all ();
+       if (_region_selection_change_updates_region_list) {
+               _regions->unselect_all ();
+       }
 
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                (*i)->set_selected_regionviews (selection->regions);
        }
 
-       _regions->set_selected (selection->regions);
+        if (_region_selection_change_updates_region_list) {
+                _regions->set_selected (selection->regions);
+        }
 
        sensitize_the_right_region_actions (!selection->regions.empty());
 
@@ -891,7 +992,7 @@ Editor::select_all_in_track (Selection::Operation op)
                return;
        }
 
-       clicked_routeview->get_selectables (0, max_frames, 0, DBL_MAX, touched);
+       clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
 
        switch (op) {
        case Selection::Toggle:
@@ -918,7 +1019,7 @@ Editor::select_all (Selection::Operation op)
                if ((*iter)->hidden()) {
                        continue;
                }
-               (*iter)->get_selectables (0, max_frames, 0, DBL_MAX, touched);
+               (*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
        }
        begin_reversible_command (_("select all"));
        switch (op) {
@@ -1081,8 +1182,8 @@ Editor::select_all_selectables_using_time_selection ()
                return;
        }
 
-       nframes64_t start = selection->time[clicked_selection].start;
-       nframes64_t end = selection->time[clicked_selection].end;
+       framepos_t start = selection->time[clicked_selection].start;
+       framepos_t end = selection->time[clicked_selection].end;
 
        if (end - start < 1)  {
                return;
@@ -1174,8 +1275,8 @@ Editor::select_all_selectables_using_loop()
 void
 Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 {
-        nframes64_t start;
-       nframes64_t end;
+        framepos_t start;
+       framepos_t end;
        list<Selectable *> touched;
 
        if (after) {
@@ -1214,8 +1315,8 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 void
 Editor::select_all_selectables_using_edit (bool after)
 {
-        nframes64_t start;
-       nframes64_t end;
+        framepos_t start;
+       framepos_t end;
        list<Selectable *> touched;
 
        if (after) {
@@ -1254,8 +1355,8 @@ Editor::select_all_selectables_using_edit (bool after)
 void
 Editor::select_all_selectables_between (bool /*within*/)
 {
-        nframes64_t start;
-       nframes64_t end;
+        framepos_t start;
+       framepos_t end;
        list<Selectable *> touched;
 
        if (!get_edit_op_range (start, end)) {
@@ -1283,8 +1384,8 @@ Editor::select_all_selectables_between (bool /*within*/)
 void
 Editor::select_range_between ()
 {
-        nframes64_t start;
-       nframes64_t end;
+        framepos_t start;
+       framepos_t end;
 
         if (mouse_mode == MouseRange && !selection->time.empty()) {
                 selection->clear_time ();
@@ -1299,9 +1400,9 @@ Editor::select_range_between ()
 }
 
 bool
-Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const
+Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 {
-       nframes64_t m;
+       framepos_t m;
        bool ignored;
 
        /* in range mode, use any existing selection */