Make crossfades blue because blue = audio and it's prettier.

[ardour.git] / gtk2_ardour / editor_canvas_events.cc

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index a69dcf935a0cf9d961b78fcffcc2fb6bed196254..a9c0bf17a95d06aa3512fd22474eadb4940189cd 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -19,6 +19,7 @@
 
 #include <cstdlib>
 #include <cmath>
+#include <algorithm>
 
 #include <pbd/stacktrace.h>
 
@@ -39,21 +40,25 @@
 #include "control_point.h"
 #include "canvas_impl.h"
 #include "simplerect.h"
+#include "canvas-note-event.h"
 
 #include "i18n.h"
 
 using namespace sigc;
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
+using namespace ArdourCanvas;
 
 bool
 Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
        int x, y;
        double wx, wy;
-       nframes_t xdelta;
+       nframes64_t xdelta;
        int direction = ev->direction;
+       CanvasNoteEvent *midi_event = dynamic_cast<CanvasNoteEvent *>(track_canvas->get_item_at(ev->x, ev->y));
 
   retry:
        switch (direction) {
@@ -65,17 +70,15 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                           if we're in mid zoom, so we have to get the damn mouse 
                           pointer again
                        */
-                       track_canvas.get_pointer (x, y);
-                       track_canvas.window_to_world (x, y, wx, wy);
-                       wx += horizontal_adjustment.get_value();
-                       wy += vertical_adjustment.get_value();
-                       
+                       track_canvas->get_pointer (x, y);
+                       track_canvas->window_to_world (x, y, wx, wy);
+
                        GdkEvent event;
                        event.type = GDK_BUTTON_RELEASE;
                        event.button.x = wx;
                        event.button.y = wy;
                        
-                       nframes_t where = event_frame (&event, 0, 0);
+                       nframes64_t where = event_frame (&event, 0, 0);
                        temporal_zoom_to_frame (false, where);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
@@ -84,14 +87,17 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
                        if (!current_stepping_trackview) {
                                step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-                               if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
+                               if (!(current_stepping_trackview = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize))) {
                                        return false;
                                }
                        }
-                       gettimeofday (&last_track_height_step_timestamp, 0);
+                       last_track_height_step_timestamp = get_microseconds();
                        current_stepping_trackview->step_height (true);
                        return true;
                } else {
+                       if(midi_event) {
+                               return midi_event->on_event(reinterpret_cast<GdkEvent *>(ev));
+                       }
                        scroll_tracks_up_line ();
                        return true;
                }
@@ -100,17 +106,15 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
        case GDK_SCROLL_DOWN:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                        //if (ev->state == GDK_CONTROL_MASK) {
-                       track_canvas.get_pointer (x, y);
-                       track_canvas.window_to_world (x, y, wx, wy);
-                       wx += horizontal_adjustment.get_value();
-                       wy += vertical_adjustment.get_value();
-                       
+                       track_canvas->get_pointer (x, y);
+                       track_canvas->window_to_world (x, y, wx, wy);
+
                        GdkEvent event;
                        event.type = GDK_BUTTON_RELEASE;
                        event.button.x = wx;
                        event.button.y = wy;
                        
-                       nframes_t where = event_frame (&event, 0, 0);
+                       nframes64_t where = event_frame (&event, 0, 0);
                        temporal_zoom_to_frame (true, where);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
@@ -119,14 +123,17 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
                        if (!current_stepping_trackview) {
                                step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-                               if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
+                               if (!(current_stepping_trackview = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize))) {
                                        return false;
                                }
                        }
-                       gettimeofday (&last_track_height_step_timestamp, 0);
+                       last_track_height_step_timestamp = get_microseconds();
                        current_stepping_trackview->step_height (false);
                        return true;
                } else {
+                       if(midi_event) {
+                               return midi_event->on_event(reinterpret_cast<GdkEvent *>(ev));
+                       }
                        scroll_tracks_down_line ();
                        return true;
                }
@@ -161,65 +168,16 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 bool
 Editor::track_canvas_scroll_event (GdkEventScroll *event)
 {
-       track_canvas.grab_focus();
+       track_canvas->grab_focus();
        track_canvas_scroll (event);
        return false;
 }
 
-bool
-Editor::time_canvas_scroll (GdkEventScroll* ev)
-{
-       nframes_t xdelta;
-       int direction = ev->direction;
-
-       switch (direction) {
-       case GDK_SCROLL_UP:
-               temporal_zoom_step (true);
-               break;
-
-       case GDK_SCROLL_DOWN:
-               temporal_zoom_step (false);
-               break;  
-
-       case GDK_SCROLL_LEFT:
-               xdelta = (current_page_frames() / 2);
-               if (leftmost_frame > xdelta) {
-                       reset_x_origin (leftmost_frame - xdelta);
-               } else {
-                       reset_x_origin (0);
-               }
-               break;
-
-       case GDK_SCROLL_RIGHT:
-               xdelta = (current_page_frames() / 2);
-               if (max_frames - xdelta > leftmost_frame) {
-                       reset_x_origin (leftmost_frame + xdelta);
-               } else {
-                       reset_x_origin (max_frames - current_page_frames());
-               }
-               break;
-
-       default:
-               /* what? */
-               break;
-       }
-
-       return false;
-}
-
-bool
-Editor::time_canvas_scroll_event (GdkEventScroll *event)
-{
-       time_canvas.grab_focus();
-       time_canvas_scroll (event);
-       return false;
-}
-
 bool
 Editor::track_canvas_button_press_event (GdkEventButton *event)
 {
        selection->clear ();
-       track_canvas.grab_focus();
+       track_canvas->grab_focus();
        return false;
 }
 
@@ -237,7 +195,7 @@ Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
 {
        int x, y;
        /* keep those motion events coming */
-       track_canvas.get_pointer (x, y);
+       track_canvas->get_pointer (x, y);
        return false;
 }
 
@@ -245,14 +203,10 @@ bool
 Editor::track_canvas_motion (GdkEvent *ev)
 {
        if (verbose_cursor_visible) {
-               verbose_canvas_cursor->property_x() = ev->motion.x + 20;
-               verbose_canvas_cursor->property_y() = ev->motion.y + 20;
+               verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 10);
+               verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 10);
        }
 
-#ifdef GTKOSX
-       flush_canvas ();
-#endif
-
        return false;
 }