#include <cstdlib>
#include <cmath>
+#include <algorithm>
#include <pbd/stacktrace.h>
#include "control_point.h"
#include "canvas_impl.h"
#include "simplerect.h"
+#include "canvas-note-event.h"
+#include "canvas-program-change.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;
-
- switch (ev->direction) {
+ nframes64_t xdelta;
+ int direction = ev->direction;
+ CanvasNoteEvent *midi_event = dynamic_cast<CanvasNoteEvent *>(track_canvas->get_item_at(ev->x, ev->y));
+ CanvasFlagRect *flag_rect = dynamic_cast<CanvasFlagRect *>(track_canvas->get_item_at(ev->x, ev->y));
+ CanvasFlagText *flag_text = dynamic_cast<CanvasFlagText *>(track_canvas->get_item_at(ev->x, ev->y));
+
+ retry:
+ switch (direction) {
case GDK_SCROLL_UP:
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
//if (ev->state == GDK_CONTROL_MASK) {
/* XXX
the ev->x will be out of step with the canvas
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::Shift)) {
+ } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+ direction = GDK_SCROLL_LEFT;
+ goto retry;
+ } 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));
+ } else if (flag_rect) {
+ return flag_rect->on_event(reinterpret_cast<GdkEvent *>(ev));
+ } else if (flag_text) {
+ return flag_text->on_event(reinterpret_cast<GdkEvent *>(ev));
+ }
scroll_tracks_up_line ();
return true;
}
break;
+
case GDK_SCROLL_DOWN:
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
+ 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::Shift)) {
+ } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+ direction = GDK_SCROLL_RIGHT;
+ goto retry;
+ } 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));
+ } else if (flag_rect) {
+ return flag_rect->on_event(reinterpret_cast<GdkEvent *>(ev));
+ } else if (flag_text) {
+ return flag_text->on_event(reinterpret_cast<GdkEvent *>(ev));
+ }
scroll_tracks_down_line ();
return true;
}
break;
+ case GDK_SCROLL_LEFT:
+ xdelta = (current_page_frames() / 8);
+ if (leftmost_frame > xdelta) {
+ reset_x_origin (leftmost_frame - xdelta);
+ } else {
+ reset_x_origin (0);
+ }
+ break;
+
+ case GDK_SCROLL_RIGHT:
+ xdelta = (current_page_frames() / 8);
+ if (max_frames - xdelta > leftmost_frame) {
+ reset_x_origin (leftmost_frame + xdelta);
+ } else {
+ reset_x_origin (max_frames - current_page_frames());
+ }
+ break;
+
default:
- /* no left/right handling yet */
+ /* what? */
break;
}
bool
Editor::track_canvas_scroll_event (GdkEventScroll *event)
{
- track_canvas.grab_focus();
+ track_canvas->grab_focus();
track_canvas_scroll (event);
return false;
}
bool
Editor::track_canvas_button_press_event (GdkEventButton *event)
{
- track_canvas.grab_focus();
+ selection->clear ();
+ track_canvas->grab_focus();
return false;
}
{
int x, y;
/* keep those motion events coming */
- track_canvas.get_pointer (x, y);
+ track_canvas->get_pointer (x, y);
return false;
}
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);
}
+
return false;
}
break;
case GDK_ENTER_NOTIFY:
+ set_entered_track (&rv->get_time_axis_view ());
set_entered_regionview (rv);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_track (0);
set_entered_regionview (0);
break;
break;
case GDK_ENTER_NOTIFY:
+ set_entered_track (tv);
+ break;
+
+ case GDK_LEAVE_NOTIFY:
+ set_entered_track (0);
break;
default:
return ret;
}
-
-
bool
Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationTimeAxisView *atv)
{
return canvas_region_view_event (event, rv->get_canvas_group(), rv);
}
+
+ delete rl;
}
}
}
return typed_event (item, event, TransportMarkerBarItem);
}
+bool
+Editor::canvas_cd_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
+{
+ return typed_event (item, event, CdMarkerBarItem);
+}
+
bool
Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* marker)
{
return typed_event (item, event, PlayheadCursorItem);
}
-bool
-Editor::canvas_edit_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
-{
- return typed_event (item, event, EditCursorItem);
-}
-
bool
Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item)
{
projects / ardour.git / blobdiff