make click on empty canvas area clear selection; change zoom-ot-region to be a toggle...

[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 33136306fbaef3e67d8fc23a1dcc4086ff72edc0..f7e7a590dd39596ad8887304c6bc061dd0ab8e37 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -52,10 +52,13 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
        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
@@ -75,7 +78,10 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                        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 = trackview_by_y_position (ev->y))) {
@@ -90,8 +96,9 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                        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);
@@ -106,7 +113,10 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                        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 = trackview_by_y_position (ev->y))) {
@@ -122,8 +132,26 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                }
                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;
        }
 
@@ -140,6 +168,7 @@ Editor::track_canvas_scroll_event (GdkEventScroll *event)
 bool
 Editor::track_canvas_button_press_event (GdkEventButton *event)
 {
+       selection->clear ();
        track_canvas.grab_focus();
        return false;
 }
@@ -170,7 +199,10 @@ Editor::track_canvas_motion (GdkEvent *ev)
                verbose_canvas_cursor->property_y() = ev->motion.y + 20;
        }
 
+#ifdef GTKOSX
        flush_canvas ();
+#endif
+
        return false;
 }