send enter events to EVERY newly entered item (ignore the bool return from the event...

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 28706ac7bc7d822146757edf5c8ef79354f6fef8..41010d317e54ef510963afebc6fd3ff43dcfa219 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -17,11 +17,9 @@
 
 */
 
-#include <sigc++/retype.h>
 #include <cstdlib>
 #include <cmath>
 
-#include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "ardour/session.h"
@@ -29,12 +27,15 @@
 #include "ardour/profile.h"
 #include "pbd/memento_command.h"
 
+#include "canvas/canvas.h"
+#include "canvas/item.h"
+#include "canvas/rectangle.h"
+
 #include "editor.h"
 #include "marker.h"
 #include "selection.h"
 #include "editing.h"
 #include "gui_thread.h"
-#include "simplerect.h"
 #include "actions.h"
 #include "prompter.h"
 #include "editor_drag.h"
@@ -172,7 +173,7 @@ Editor::add_new_location_internal (Location* location)
                select_new_marker = false;
        }
 
-       lam->canvas_height_set (_canvas_height);
+       lam->canvas_height_set (_visible_canvas_height);
        lam->set_show_lines (_show_marker_lines);
 
        /* Add these markers to the appropriate sorted marker lists, which will render
@@ -257,7 +258,7 @@ Editor::check_marker_label (Marker* m)
 
                /* Update just the available space between the previous marker and this one */
 
-               double const p = frame_to_pixel (m->position() - (*prev)->position());
+               double const p = sample_to_pixel (m->position() - (*prev)->position());
 
                if (m->label_on_left()) {
                        (*prev)->set_right_label_limit (p / 2);
@@ -276,7 +277,7 @@ Editor::check_marker_label (Marker* m)
 
                /* Update just the available space between this marker and the next */
 
-               double const p = frame_to_pixel ((*next)->position() - m->position());
+               double const p = sample_to_pixel ((*next)->position() - m->position());
 
                if ((*next)->label_on_left()) {
                        m->set_right_label_limit (p / 2);
@@ -330,7 +331,7 @@ Editor::update_marker_labels (ArdourCanvas::Group* group)
        while (i != sorted.end()) {
 
                if (prev != sorted.end()) {
-                       double const p = frame_to_pixel ((*i)->position() - (*prev)->position());
+                       double const p = sample_to_pixel ((*i)->position() - (*prev)->position());
 
                        if ((*prev)->label_on_left()) {
                                (*i)->set_left_label_limit (p);
@@ -341,7 +342,7 @@ Editor::update_marker_labels (ArdourCanvas::Group* group)
                }
 
                if (next != sorted.end()) {
-                       double const p = frame_to_pixel ((*next)->position() - (*i)->position());
+                       double const p = sample_to_pixel ((*next)->position() - (*i)->position());
 
                        if ((*next)->label_on_left()) {
                                (*i)->set_right_label_limit (p / 2);
@@ -672,7 +673,7 @@ Editor::mouse_add_new_range (framepos_t where)
           it's reasonably easy to manipulate after creation.
        */
 
-       framepos_t const end = where + current_page_frames() / 8;
+       framepos_t const end = where + current_page_samples() / 8;
 
        string name;
        _session->locations()->next_available_name (name, _("range"));
@@ -894,14 +895,13 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
        markerMenu->set_name ("ArdourContextMenu");
 
        items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
-       items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
-       items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
-       if (!loop_or_punch_or_session) {
-               items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
-       }
-       items.push_back (MenuElem (_("Set Range Mark from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+       items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
+       items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
+       items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
+
+       items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
        if (!Profile->get_sae()) {
-               items.push_back (MenuElem (_("Set Range from Range Selection"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+               items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
        }
 
        items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
@@ -1154,7 +1154,7 @@ Editor::marker_menu_set_from_playhead ()
 }
 
 void
-Editor::marker_menu_set_from_selection ()
+Editor::marker_menu_set_from_selection (bool /*force_regions*/)
 {
        Marker* marker;
 
@@ -1169,23 +1169,15 @@ Editor::marker_menu_set_from_selection ()
        if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
                if (l->is_mark()) {
-                       // nothing for now
-               }
-               else {
 
-                       /* if range selection use first to last */
+                       // nothing for now
 
-                       if (mouse_mode == Editing::MouseRange) {
-                               if (!selection->time.empty()) {
-                                       l->set_start (selection->time.start());
-                                       l->set_end (selection->time.end_frame());
-                               }
-                       }
-                       else {
-                               if (!selection->regions.empty()) {
-                                       l->set_start (selection->regions.start());
-                                       l->set_end (selection->regions.end_frame());
-                               }
+               } else {
+                       
+                       if (!selection->time.empty()) {
+                               l->set (selection->time.start(), selection->time.end_frame());
+                       } else if (!selection->regions.empty()) {
+                               l->set (selection->regions.start(), selection->regions.end_frame());
                        }
                }
        }
@@ -1348,12 +1340,23 @@ Editor::marker_menu_rename ()
                /*NOTREACHED*/
        }
 
+
+       rename_marker (marker);
+}
+
+void
+Editor::rename_marker(Marker *marker)
+{
        Location* loc;
        bool is_start;
 
        loc = find_location_from_marker (marker, is_start);
 
-       if (!loc) return;
+       if (!loc)
+              return;
+
+       if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range())
+               return;
 
        ArdourPrompter dialog (true);
        string txt;
@@ -1388,6 +1391,7 @@ Editor::marker_menu_rename ()
 
        dialog.get_result(txt);
        loc->set_name (txt);
+       _session->set_dirty ();
 
        XMLNode &after = _session->locations()->get_state();
        _session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
@@ -1426,11 +1430,11 @@ Editor::update_loop_range_view (bool visibility)
 
        if (_session->get_play_loop() && ((tll = transport_loop_location()) != 0)) {
 
-               double x1 = frame_to_pixel (tll->start());
-               double x2 = frame_to_pixel (tll->end());
+               double x1 = sample_to_pixel (tll->start());
+               double x2 = sample_to_pixel (tll->end());
 
-               transport_loop_range_rect->property_x1() = x1;
-               transport_loop_range_rect->property_x2() = x2;
+               transport_loop_range_rect->set_x0 (x1);
+               transport_loop_range_rect->set_x1 (x2);
 
                if (visibility) {
                        transport_loop_range_rect->show();
@@ -1451,14 +1455,13 @@ Editor::update_punch_range_view (bool visibility)
        Location* tpl;
 
        if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
-               guint track_canvas_width,track_canvas_height;
-               track_canvas->get_size(track_canvas_width,track_canvas_height);
+               ArdourCanvas::Rect const v = _track_canvas->visible_area ();
                if (_session->config.get_punch_in()) {
-                       transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start());
-                       transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES));
+                       transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
+                       transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES));
                } else {
-                       transport_punch_range_rect->property_x1() = 0;
-                       transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width);
+                       transport_punch_range_rect->set_x0 (0);
+                       transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
                }
 
                if (visibility) {