Revert "Revert "patch for waflib internals to allow tarball to be created even when...

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 20e8b4f05472a02ce6bc19e0cce3cd8fb58bfc62..0c046e56ab1eb188144e6edf6882619417760672 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -237,6 +237,7 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i, bool trackview_only)
        , _grab_frame (0)
        , _last_pointer_frame (0)
        , _snap_delta (0)
+       , _constraint_pressed (false)
 {
 
 }
@@ -261,6 +262,7 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor)
 {
 
        /* we set up x/y dragging constraints on first move */
+       _constraint_pressed = ArdourKeyboard::indicates_constraint (event->button.state);
 
        _raw_grab_frame = _editor->canvas_event_sample (event, &_grab_x, &_grab_y);
 
@@ -420,14 +422,14 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
                                if (Config->get_edit_mode() != Lock) {
                                        if (event->motion.state & Gdk::BUTTON2_MASK) {
                                                // if dragging with button2, the motion is x constrained, with constraint modifier it is y constrained
-                                               if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) {
+                                               if (_constraint_pressed) {
                                                        _x_constrained = false;
                                                        _y_constrained = true;
                                                } else {
                                                        _x_constrained = true;
                                                        _y_constrained = false;
                                                }
-                                       } else if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) {
+                                       } else if (_constraint_pressed) {
                                                // if dragging normally, the motion is constrained to the first direction of movement.
                                                if (_initially_vertical) {
                                                        _x_constrained = true;
@@ -3343,7 +3345,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 
        }
 
-       if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier ())) {
+       if (ArdourKeyboard::indicates_constraint (event->button.state)) {
                /* use vertical movement to alter tempo .. should be log */
                double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0);
                stringstream strs;
@@ -3353,11 +3355,21 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                show_verbose_cursor_text (strs.str());
 
        } else if (_movable && !_real_section->locked_to_meter()) {
-               const framepos_t pf = adjusted_current_frame (event);
+               framepos_t pf;
+
+               if (_editor->snap_musical()) {
+                       /* we can't snap to a grid that we are about to move.
+                        * gui_move_tempo() will sort out snap using the supplied beat divisions.
+                       */
+                       pf = adjusted_current_frame (event, false);
+               } else {
+                       pf = adjusted_current_frame (event);
+               }
+
                TempoMap& map (_editor->session()->tempo_map());
 
                /* snap to beat is 1, snap to bar is -1 (sorry) */
-               int sub_num = _editor->get_grid_music_divisions (event->button.state);
+               const int sub_num = _editor->get_grid_music_divisions (event->button.state);
 
                map.gui_move_tempo (_real_section, pf, sub_num);
 
@@ -3469,7 +3481,7 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move)
                pf = adjusted_current_frame (event);
        }
 
-       if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier())) {
+       if (ArdourKeyboard::indicates_constraint (event->button.state)) {
                /* adjust previous tempo to match pointer frame */
                _editor->session()->tempo_map().gui_dilate_tempo (_tempo, map.frame_at_pulse (_pulse), pf, _pulse);
        }
@@ -5562,6 +5574,10 @@ NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
 frameoffset_t
 NoteDrag::total_dx (const guint state) const
 {
+       if (_x_constrained) {
+               return 0;
+       }
+
        /* dx in frames */
        frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x());
 
@@ -5608,6 +5624,10 @@ NoteDrag::total_dx (const guint state) const
 int8_t
 NoteDrag::total_dy () const
 {
+       if (_y_constrained) {
+               return 0;
+       }
+
        MidiStreamView* msv = _region->midi_stream_view ();
        double const y = _region->midi_view()->y_position ();
        /* new current note */
@@ -5627,8 +5647,8 @@ NoteDrag::motion (GdkEvent * event, bool)
        int8_t const dy = total_dy ();
 
        /* Now work out what we have to do to the note canvas items to set this new drag delta */
-       double const tdx = _editor->sample_to_pixel (dx) - _cumulative_dx;
-       double const tdy = -dy * _note_height - _cumulative_dy;
+       double const tdx = _x_constrained ? 0 : _editor->sample_to_pixel (dx) - _cumulative_dx;
+       double const tdy = _y_constrained ? 0 : -dy * _note_height - _cumulative_dy;
 
        if (tdx || tdy) {
                _cumulative_dx += tdx;
@@ -5636,17 +5656,19 @@ NoteDrag::motion (GdkEvent * event, bool)
 
                int8_t note_delta = total_dy();
 
-               _region->move_selection (tdx, tdy, note_delta);
+               if (tdx || tdy) {
+                       _region->move_selection (tdx, tdy, note_delta);
 
-               /* the new note value may be the same as the old one, but we
-                * don't know what that means because the selection may have
-                * involved more than one note and we might be doing something
-                * odd with them. so show the note value anyway, always.
-                */
+                       /* the new note value may be the same as the old one, but we
+                        * don't know what that means because the selection may have
+                        * involved more than one note and we might be doing something
+                        * odd with them. so show the note value anyway, always.
+                        */
 
-               uint8_t new_note = min (max (_primary->note()->note() + note_delta, 0), 127);
+                       uint8_t new_note = min (max (_primary->note()->note() + note_delta, 0), 127);
 
-               _region->show_verbose_cursor_for_new_note_value (_primary->note(), new_note);
+                       _region->show_verbose_cursor_for_new_note_value (_primary->note(), new_note);
+               }
        }
 }