Small cleanup

[ardour.git] / gtk2_ardour / editor_drag.h

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index ef4a0f0b28830a6630cb5bfb7dd2ab01dc2656e0..7d02a23e5296b4114808a4fb5f2cee723c9dd232 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -29,6 +29,7 @@
 
 #include "cursor_context.h"
 #include "editor_items.h"
+#include "mouse_cursors.h"
 
 namespace ARDOUR {
        class Location;
@@ -58,8 +59,8 @@ public:
 
        void abort ();
        void add (Drag *);
-       void set (Drag *, GdkEvent *, Gdk::Cursor* c = 0);
-       void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
+       void set (Drag *, GdkEvent *, Gdk::Cursor* c = MouseCursors::invalid_cursor());
+       void start_grab (GdkEvent *, Gdk::Cursor* c = MouseCursors::invalid_cursor());
        bool end_grab (GdkEvent *);
        bool have_item (ArdourCanvas::Item *) const;
 
@@ -177,6 +178,10 @@ public:
                return true;
        }
 
+       bool initially_vertical() const {
+               return _initially_vertical;
+       }
+       
        /** Set up the _pointer_frame_offset */
        virtual void setup_pointer_frame_offset () {
                _pointer_frame_offset = 0;
@@ -208,13 +213,18 @@ protected:
                return _last_pointer_y;
        }
 
-       double last_pointer_frame () const {
+       ARDOUR::framepos_t last_pointer_frame () const {
                return _last_pointer_frame;
        }
 
+       ARDOUR::frameoffset_t snap_delta (guint const) const;
+
        double current_pointer_x () const;
        double current_pointer_y () const;
 
+       /* sets snap delta from unsnapped pos */
+       void setup_snap_delta (framepos_t pos);
+
        boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*);
 
        void show_verbose_cursor_time (framepos_t);
@@ -233,7 +243,8 @@ protected:
 private:
        bool _trackview_only; ///< true if pointer y value should always be relative to the top of the trackview group
        bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false
-    bool _starting_point_passed; ///< true if we called move () with first_move flag, otherwise false
+       bool _starting_point_passed; ///< true if we called move () with first_move flag, otherwise false
+       bool _initially_vertical; ///< true if after move threshold is passed we appear to be moving vertically; undefined before that
         bool _was_double_click; ///< true if drag initiated by a double click event
        double _grab_x; ///< trackview x of the grab start position
        double _grab_y; ///< y of the grab start position, possibly adjusted if _trackview_only is true
@@ -242,6 +253,11 @@ private:
        ARDOUR::framepos_t _raw_grab_frame; ///< unsnapped frame that the mouse was at when start_grab was called, or 0
        ARDOUR::framepos_t _grab_frame; ///< adjusted_frame that the mouse was at when start_grab was called, or 0
        ARDOUR::framepos_t _last_pointer_frame; ///< adjusted_frame the last time a motion occurred
+
+       /* difference between some key position's snapped and unsnapped
+        *  framepos. used for relative snap.
+        */
+       ARDOUR::frameoffset_t _snap_delta;
        CursorContext::Handle _cursor_ctx; ///< cursor change context
 };
 
@@ -286,9 +302,11 @@ protected:
        /** a list of the non-hidden TimeAxisViews sorted by editor order key */
        std::vector<TimeAxisView*> _time_axis_views;
        int find_time_axis_view (TimeAxisView *) const;
+       int apply_track_delta (const int start, const int delta, const int skip, const bool distance_only = false) const;
 
        int _visible_y_low;
        int _visible_y_high;
+       uint32_t _ntracks;
 
        friend class DraggingView;
 
@@ -320,13 +338,17 @@ public:
 protected:
 
        double compute_x_delta (GdkEvent const *, ARDOUR::framepos_t *);
-       virtual bool y_movement_allowed (int, double) const;
+       virtual bool y_movement_allowed (int, double, int skip_invisible = 0) const;
 
        bool _brushing;
        ARDOUR::framepos_t _last_frame_position; ///< last position of the thing being dragged
        double _total_x_delta;
        int _last_pointer_time_axis_view;
        double _last_pointer_layer;
+private:
+       uint32_t _ndropzone;
+       uint32_t _pdropzone;
+       uint32_t _ddropzone;
 };
 
 
@@ -429,7 +451,7 @@ public:
        void finished (GdkEvent *, bool);
        void aborted (bool);
 protected:
-       bool y_movement_allowed (int delta_track, double delta_layer) const;
+       bool y_movement_allowed (int delta_track, double delta_layer, int skip_invisible = 0) const;
 
 private:
        TimeAxisView *prev_tav;         // where regions were most recently dragged from
@@ -489,6 +511,7 @@ private:
        MidiRegionView*     region;
        bool                relative;
        bool                at_front;
+       double              _snap_delta;
 };
 
 /** Drags to move MIDI notes */
@@ -504,7 +527,7 @@ class NoteDrag : public Drag
 
   private:
 
-       ARDOUR::frameoffset_t total_dx () const;
+       ARDOUR::frameoffset_t total_dx (guint const) const;
        int8_t total_dy () const;
 
        MidiRegionView* _region;
@@ -975,7 +998,6 @@ public:
 private:
        Operation _operation;
        bool _add;
-       int _original_pointer_time_axis;
        std::list<TimeAxisView*> _added_time_axes;
        bool _time_selection_at_start;
         framepos_t start_at_start;
@@ -994,7 +1016,8 @@ public:
        };
 
        RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation);
-
+       ~RangeMarkerBarDrag ();
+       
        void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
        void motion (GdkEvent *, bool);
        void finished (GdkEvent *, bool);