#include "pbd/stacktrace.h"
-#include "ardour/audio_diskstream.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/region_factory.h"
#include "audio_region_view.h"
#include "audio_streamview.h"
#include "canvas-noevent-text.h"
-#include "crossfade_view.h"
#include "audio_time_axis.h"
#include "region_gain_line.h"
#include "automation_line.h"
#include "control_point.h"
#include "canvas_impl.h"
#include "simplerect.h"
-#include "interactive-item.h"
#include "editor_drag.h"
#include "midi_time_axis.h"
#include "editor_regions.h"
+#include "verbose_cursor.h"
#include "i18n.h"
-using namespace sigc;
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
+
bool
Editor::track_canvas_scroll (GdkEventScroll* ev)
{
- int x, y;
- double wx, wy;
- nframes64_t xdelta;
+ framepos_t xdelta;
int direction = ev->direction;
- Gnome::Canvas::Item* item = track_canvas->get_item_at(ev->x, ev->y);
- InteractiveItem* interactive_item = dynamic_cast<InteractiveItem*>(item);
- if (interactive_item) {
- return interactive_item->on_event(reinterpret_cast<GdkEvent*>(ev));
- }
-
retry:
switch (direction) {
case GDK_SCROLL_UP:
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);
-
- GdkEvent event;
- event.type = GDK_BUTTON_RELEASE;
- event.button.x = wx;
- event.button.y = wy;
-
- nframes64_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (false, where);
+ temporal_zoom_step (false);
return true;
} 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);
+ step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500);
std::pair<TimeAxisView*, int> const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize);
current_stepping_trackview = p.first;
if (!current_stepping_trackview) {
}
}
last_track_height_step_timestamp = get_microseconds();
- current_stepping_trackview->step_height (true);
+ current_stepping_trackview->step_height (false);
return true;
} else {
scroll_tracks_up_line ();
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);
-
- GdkEvent event;
- event.type = GDK_BUTTON_RELEASE;
- event.button.x = wx;
- event.button.y = wy;
-
- nframes64_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (true, where);
+ temporal_zoom_step (true);
return true;
} 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);
+ step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500);
std::pair<TimeAxisView*, int> const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize);
current_stepping_trackview = p.first;
if (!current_stepping_trackview) {
}
}
last_track_height_step_timestamp = get_microseconds();
- current_stepping_trackview->step_height (false);
+ current_stepping_trackview->step_height (true);
return true;
} else {
scroll_tracks_down_line ();
case GDK_SCROLL_RIGHT:
xdelta = (current_page_frames() / 8);
- if (max_frames - xdelta > leftmost_frame) {
+ if (max_framepos - xdelta > leftmost_frame) {
reset_x_origin (leftmost_frame + xdelta);
} else {
- reset_x_origin (max_frames - current_page_frames());
+ reset_x_origin (max_framepos - current_page_frames());
}
break;
Editor::track_canvas_scroll_event (GdkEventScroll *event)
{
track_canvas->grab_focus();
- track_canvas_scroll (event);
- return false;
+ return track_canvas_scroll (event);
}
bool
bool
Editor::track_canvas_button_release_event (GdkEventButton *event)
{
- if (_drag) {
- _drag->end_grab ((GdkEvent*) event);
- delete _drag;
- _drag = 0;
+ if (_drags->active ()) {
+ _drags->end_grab ((GdkEvent*) event);
}
return false;
}
bool
Editor::track_canvas_motion (GdkEvent *ev)
{
- if (verbose_cursor_visible) {
- 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);
+ if (_verbose_cursor->visible ()) {
+ _verbose_cursor->set_position (ev->motion.x + 10, ev->motion.y + 10);
}
return false;
ret = leave_handler (item, event, type);
break;
+ case GDK_KEY_PRESS:
+ ret = key_press_handler (item, event, type);
+ break;
+
+ case GDK_KEY_RELEASE:
+ ret = key_release_handler (item, event, type);
+ break;
+
default:
break;
}
return false;
}
-
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
clicked_regionview = 0;
clicked_control_point = 0;
clicked_axisview = tv;
- clicked_routeview = dynamic_cast<RouteTimeAxisView*>(tv);
+ clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
ret = button_press_handler (item, event, StreamItem);
break;
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, FadeInHandleItem);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, FadeInHandleItem);
break;
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, FadeOutHandleItem);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, FadeOutHandleItem);
break;
}
};
-bool
-Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item, CrossfadeView* xfv)
-{
- /* we handle only button 3 press/release events */
-
- switch (event->type) {
- case GDK_BUTTON_PRESS:
- clicked_crossfadeview = xfv;
- clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
- if (event->button.button == 3) {
- return button_press_handler (item, event, CrossfadeViewItem);
- }
- break;
-
- case GDK_BUTTON_RELEASE:
- if (event->button.button == 3) {
- bool ret = button_release_handler (item, event, CrossfadeViewItem);
- return ret;
- }
- break;
-
- default:
- break;
-
- }
-
- /* XXX do not forward double clicks */
-
- if (event->type == GDK_2BUTTON_PRESS) {
- return false;
- }
-
- /* proxy for an underlying regionview */
-
- /* XXX really need to check if we are in the name highlight,
- and proxy to that when required.
- */
-
- TimeAxisView& tv (xfv->get_time_axis_view());
- AudioTimeAxisView* atv;
-
- if ((atv = dynamic_cast<AudioTimeAxisView*>(&tv)) != 0) {
-
- if (atv->is_audio_track()) {
-
- boost::shared_ptr<AudioPlaylist> pl;
- if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->get_diskstream()->playlist())) != 0) {
-
- Playlist::RegionList* rl = pl->regions_at (event_frame (event));
- if (!rl->empty()) {
-
- if (atv->layer_display() == Overlaid) {
-
- /* we're in overlaid mode; proxy to the uppermost region view */
-
- DescendingRegionLayerSorter cmp;
- rl->sort (cmp);
-
- RegionView* rv = atv->view()->find_view (rl->front());
-
- delete rl;
-
- /* proxy */
- return canvas_region_view_event (event, rv->get_canvas_group(), rv);
-
- } else {
-
- /* we're in stacked mode; proxy to the region view under the mouse */
-
- /* XXX: FIXME: this is an evil hack; it assumes that any event for which
- this proxy is being used has its GdkEvent laid out such that the y
- member is in the same place as that for a GdkEventButton */
-
- /* position of the event within the track */
- double cx = event->button.x;
- double cy = event->button.y;
- atv->view()->canvas_item()->w2i (cx, cy);
-
- /* hence layer that we're over */
- double const c = atv->view()->child_height ();
- layer_t const l = pl->top_layer () + 1 - (cy / c);
-
- /* hence region */
- Playlist::RegionList::iterator i = rl->begin();
- while (i != rl->end() && (*i)->layer() != l) {
- ++i;
- }
-
- if (i != rl->end()) {
- RegionView* rv = atv->view()->find_view (*i);
- delete rl;
-
- /* proxy */
- return canvas_region_view_event (event, rv->get_canvas_group(), rv);
- }
- }
- }
-
- delete rl;
- }
- }
- }
-
- return TRUE;
-}
-
bool
Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp)
{
perspective. XXX change this ??
*/
+ ItemType type;
+
+ if (item->get_data ("isleft")) {
+ type = LeftFrameHandle;
+ } else {
+ type = RightFrameHandle;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
clicked_control_point = 0;
clicked_axisview = &clicked_regionview->get_time_axis_view();
clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
- ret = button_press_handler (item, event, RegionViewNameHighlight);
+ ret = button_press_handler (item, event, type);
break;
case GDK_BUTTON_RELEASE:
- ret = button_release_handler (item, event, RegionViewNameHighlight);
+ ret = button_release_handler (item, event, type);
break;
case GDK_MOTION_NOTIFY:
ret = motion_handler (item, event);
break;
case GDK_ENTER_NOTIFY:
- ret = enter_handler (item, event, RegionViewNameHighlight);
+ set_entered_regionview (rv);
+ ret = enter_handler (item, event, type);
break;
case GDK_LEAVE_NOTIFY:
- ret = leave_handler (item, event, RegionViewNameHighlight);
+ set_entered_regionview (0);
+ ret = leave_handler (item, event, type);
break;
default:
ret = button_release_handler (item, event, RegionViewNameHighlight);
break;
case GDK_MOTION_NOTIFY:
- ret = motion_handler (item, event);
+ motion_handler (item, event);
+ ret = true; // force this to avoid progagating the event into the regionview
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, RegionViewNameHighlight);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, RegionViewNameHighlight);
break;
ret = motion_handler (item, event);
break;
case GDK_ENTER_NOTIFY:
+ set_entered_regionview (rv);
ret = enter_handler (item, event, RegionViewName);
break;
case GDK_LEAVE_NOTIFY:
+ set_entered_regionview (0);
ret = leave_handler (item, event, RegionViewName);
break;
return ret;
}
+bool
+Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView*)
+{
+ bool ret = false;
+
+ switch (event->type) {
+ case GDK_BUTTON_PRESS:
+ case GDK_2BUTTON_PRESS:
+ case GDK_3BUTTON_PRESS:
+ clicked_regionview = 0;
+ clicked_control_point = 0;
+ clicked_axisview = 0;
+ clicked_routeview = 0; //dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+ ret = button_press_handler (item, event, FeatureLineItem);
+ break;
+
+ case GDK_BUTTON_RELEASE:
+ ret = button_release_handler (item, event, FeatureLineItem);
+ break;
+
+ case GDK_MOTION_NOTIFY:
+ ret = motion_handler (item, event);
+ break;
+
+ case GDK_ENTER_NOTIFY:
+ ret = enter_handler (item, event, FeatureLineItem);
+ break;
+
+ case GDK_LEAVE_NOTIFY:
+ ret = leave_handler (item, event, FeatureLineItem);
+ break;
+
+ default:
+ break;
+ }
+
+ return ret;
+}
+
bool
Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/)
{
/* assume we're dragging with button 1 */
event.motion.state = Gdk::BUTTON1_MASK;
- if (_drag == 0) {
+ if (!_drags->active ()) {
double px;
double py;
- nframes64_t const pos = event_frame (&event, &px, &py);
+ framepos_t const pos = event_frame (&event, &px, &py);
std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
if (tv.first == 0) {
boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+ if (!region) {
+ return true;
+ }
+
boost::shared_ptr<Region> region_copy = RegionFactory::create (region);
if (boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
return true;
}
- if (boost::dynamic_pointer_cast<MidiRegion> (region_copy) == 0 &&
- dynamic_cast<MidiTimeAxisView*> (tv.first) != 0) {
+ if (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 &&
+ dynamic_cast<MidiTimeAxisView*> (tv.first) == 0) {
/* MIDI -> non-MIDI */
return true;
}
- _drag = new RegionInsertDrag (this, region_copy, rtav, pos);
- _drag->start_grab (&event);
+ _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
}
- _drag->motion_handler (&event, false);
+ _drags->motion_handler (&event, false);
return true;
}
+
+bool
+Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType)
+{
+ return false;
+}
+
+bool
+Editor::key_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType type)
+{
+
+ bool handled = false;
+
+ switch (type) {
+ case TempoMarkerItem:
+ switch (event->key.keyval) {
+ case GDK_Delete:
+ remove_tempo_marker (item);
+ handled = true;
+ break;
+ default:
+ break;
+ }
+ break;
+
+ case MeterMarkerItem:
+ switch (event->key.keyval) {
+ case GDK_Delete:
+ remove_meter_marker (item);
+ handled = true;
+ break;
+ default:
+ break;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return handled;
+}
projects / ardour.git / blobdiff