along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdlib>
#include <cmath>
+#include <pbd/stacktrace.h>
+
#include <ardour/audio_diskstream.h>
#include <ardour/audioplaylist.h>
#include "editor.h"
+#include "keyboard.h"
#include "public_editor.h"
#include "audio_region_view.h"
#include "audio_streamview.h"
{
int x, y;
double wx, wy;
+ nframes_t xdelta;
+ int direction = ev->direction;
- switch (ev->direction) {
+ 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
event.button.x = wx;
event.button.y = wy;
- jack_nframes_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (true, where);
+ nframes_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 = dynamic_cast<AudioTimeAxisView*> (trackview_by_y_position (ev->y)))) {
+ if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
return false;
}
}
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);
event.button.x = wx;
event.button.y = wy;
- jack_nframes_t where = event_frame (&event, 0, 0);
- temporal_zoom_to_frame (false, where);
+ nframes_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 = dynamic_cast<AudioTimeAxisView*> (trackview_by_y_position (ev->y)))) {
+ if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
return 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:
- /* no left/right handling yet */
+ /* what? */
break;
}
-
+
return false;
}
-
bool
-Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
+Editor::track_canvas_scroll_event (GdkEventScroll *event)
{
- gint x, y;
-
- /* this is the handler for events that are not handled by
- items.
- */
-
- switch (event->type) {
- case GDK_MOTION_NOTIFY:
- /* keep those motion events coming */
- track_canvas.get_pointer (x, y);
- return track_canvas_motion (event);
-
- case GDK_BUTTON_PRESS:
- track_canvas.grab_focus();
- break;
-
- case GDK_BUTTON_RELEASE:
- switch (event->button.button) {
- case 4:
- case 5:
- button_release_handler (item, event, NoItem);
- break;
- }
- break;
+ track_canvas.grab_focus();
+ track_canvas_scroll (event);
+ return false;
+}
- case GDK_SCROLL:
- track_canvas.grab_focus();
- track_canvas_scroll (&event->scroll);
- break;
+bool
+Editor::track_canvas_button_press_event (GdkEventButton *event)
+{
+ selection->clear ();
+ track_canvas.grab_focus();
+ return false;
+}
- default:
- break;
+bool
+Editor::track_canvas_button_release_event (GdkEventButton *event)
+{
+ if (drag_info.item) {
+ end_grab (drag_info.item, (GdkEvent*) event);
}
+ return false;
+}
- return FALSE;
+bool
+Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
+{
+ int x, y;
+ /* keep those motion events coming */
+ track_canvas.get_pointer (x, y);
+ return false;
}
bool
verbose_canvas_cursor->property_x() = ev->motion.x + 20;
verbose_canvas_cursor->property_y() = ev->motion.y + 20;
}
+
+#ifdef GTKOSX
+ flush_canvas ();
+#endif
+
return false;
}
default:
break;
}
-
return ret;
}
bool
Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv)
{
- gint ret = FALSE;
+ bool ret = false;
+
+ if (!rv->sensitive ()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
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)
{
bool ret = false;
+
switch (event->type) {
case GDK_BUTTON_PRESS:
{
/* we handle only button 3 press/release events */
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
clicked_regionview = rv;
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
{
/* we handle only button 3 press/release events */
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
clicked_regionview = rv;
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
}
+ /* XXX do not forward double clicks */
+
+ if (event->type == GDK_2BUTTON_PRESS) {
+ return false;
+ }
/* proxy for the upper most regionview */
if (atv->is_audio_track()) {
- AudioPlaylist* pl;
- if ((pl = dynamic_cast<AudioPlaylist*> (atv->get_diskstream()->playlist())) != 0) {
+ 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));
RegionView* rv = atv->view()->find_view (rl->front());
- /* proxy */
-
delete rl;
+ /* proxy */
+
return canvas_region_view_event (event, rv->get_canvas_group(), rv);
}
+
+ delete rl;
}
}
}
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
{
bool ret = false;
+ if (!rv->sensitive()) {
+ return false;
+ }
+
switch (event->type) {
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
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