Merge branch 'relative_snap'

      - Many changes to the "User Interaction" pane wrt key modifiers.
      - Snap is now relative by default (override to absolute with the
        "Snap to absolute using:" modifier).
      - Midi notes now obey both snap modifiers (disable snap and absolute snap)
      - Timefx drag now selects the primary region (less user confusion).
      - Includes MIDI event id fix.

3 files changed, 39 insertions, 5 deletions

diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp
index da31662951..45935ccf8d 100644
--- a/libs/evoral/src/Event.cpp
+++ b/libs/evoral/src/Event.cpp
@@ -86,7 +86,7 @@ Event<Timestamp>::Event(const Event& copy, bool owns_buf)
 	, _nominal_time(copy._nominal_time)
 	, _size(copy._size)
 	, _buf(copy._buf)
-	, _id(copy.id())
+	, _id (next_event_id ())
 	, _owns_buf(owns_buf)
 {
 	if (owns_buf) {
@@ -110,7 +110,7 @@ template<typename Timestamp>
 const Event<Timestamp>&
 Event<Timestamp>::operator=(const Event& copy)
 {
-	_id = copy.id(); // XXX is this right? do we want ID copy semantics?
+	_id = next_event_id ();
 	_type = copy._type;
 	_original_time = copy._original_time;
 	_nominal_time = copy._nominal_time;
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 328638373f..3ffa09f036 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -115,13 +115,22 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	static bool no_modifiers_active (guint state);
 
 	static void set_snap_modifier (guint);
-
 	/** @return Modifier mask to temporarily toggle grid setting; with this modifier
 	 *  - magnetic or normal grid should become no grid and
 	 *  - no grid should become normal grid
 	 */
 	static ModifierMask snap_modifier () { return ModifierMask (snap_mod); }
 
+	static void set_snap_delta_modifier (guint);
+	/** @return Modifier mask to temporarily toggle between relative and absolute grid setting.
+	 *  Absolute grid is for aligning objects with the grid lines.
+	 *  Relative grid is for maintaining an initial position relative to the grid lines.
+	 *  With this modifier:
+	 *  - magnetic or normal grid should snap absolutely to the grid lines
+	 *  - no grid should become absolute grid.
+	 */
+	static ModifierMask snap_delta_modifier () { return ModifierMask (snap_delta_mod); }
+
 	static guint edit_button() { return edit_but; }
 	static void set_edit_button (guint);
 	static guint edit_modifier() { return edit_mod; }
@@ -186,6 +195,7 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	static guint     insert_note_but;
 	static guint     insert_note_mod;
 	static guint     snap_mod;
+	static guint     snap_delta_mod;
 	static guint     button2_modifiers;
 	static Gtk::Window* current_window;
 	static std::string user_keybindings_path;
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 420d42209b..48bdaf0052 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -58,7 +58,6 @@ guint Keyboard::delete_but = 3;
 guint Keyboard::delete_mod = GDK_SHIFT_MASK;
 guint Keyboard::insert_note_but = 1;
 guint Keyboard::insert_note_mod = GDK_CONTROL_MASK;
-guint Keyboard::snap_mod = GDK_MOD3_MASK;
 
 #ifdef GTKOSX
 
@@ -77,6 +76,9 @@ const char* Keyboard::level4_modifier_name() { return _("Option"); }
 const char* Keyboard::copy_modifier_name() { return _("Control"); }
 const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); }
 
+guint Keyboard::snap_mod = Keyboard::Level4Modifier|Keyboard::TertiaryModifier; // XXX this is probably completely wrong
+guint Keyboard::snap_delta_mod = Keyboard::Level4Modifier;
+
 #else
 
 guint Keyboard::PrimaryModifier = GDK_CONTROL_MASK; // Control
@@ -94,6 +96,9 @@ const char* Keyboard::level4_modifier_name() { return _("Meta"); }
 const char* Keyboard::copy_modifier_name() { return _("Control"); }
 const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); }
 
+guint Keyboard::snap_mod = Keyboard::SecondaryModifier|Keyboard::Level4Modifier;
+guint Keyboard::snap_delta_mod = Keyboard::SecondaryModifier;
+
 #endif
 
 guint Keyboard::GainFineScaleModifier = Keyboard::PrimaryModifier;
@@ -103,7 +108,6 @@ guint Keyboard::ScrollZoomVerticalModifier = Keyboard::SecondaryModifier;
 guint Keyboard::ScrollZoomHorizontalModifier = Keyboard::PrimaryModifier;
 guint Keyboard::ScrollHorizontalModifier = Keyboard::TertiaryModifier;
 
-
 Keyboard*    Keyboard::_the_keyboard = 0;
 Gtk::Window* Keyboard::current_window = 0;
 bool         Keyboard::_some_magic_widget_has_focus = false;
@@ -169,6 +173,8 @@ Keyboard::get_state (void)
 	XMLNode* node = new XMLNode ("Keyboard");
 	char buf[32];
 
+	snprintf (buf, sizeof (buf), "%d", CopyModifier);
+	node->add_property ("copy-modifier", buf);
 	snprintf (buf, sizeof (buf), "%d", edit_but);
 	node->add_property ("edit-button", buf);
 	snprintf (buf, sizeof (buf), "%d", edit_mod);
@@ -179,6 +185,8 @@ Keyboard::get_state (void)
 	node->add_property ("delete-modifier", buf);
 	snprintf (buf, sizeof (buf), "%d", snap_mod);
 	node->add_property ("snap-modifier", buf);
+	snprintf (buf, sizeof (buf), "%d", snap_delta_mod);
+	node->add_property ("snap-delta-modifier", buf);
 	snprintf (buf, sizeof (buf), "%d", insert_note_but);
 	node->add_property ("insert-note-button", buf);
 	snprintf (buf, sizeof (buf), "%d", insert_note_mod);
@@ -192,6 +200,10 @@ Keyboard::set_state (const XMLNode& node, int /*version*/)
 {
 	const XMLProperty* prop;
 
+	if ((prop = node.property ("copy-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &CopyModifier);
+	}
+
 	if ((prop = node.property ("edit-button")) != 0) {
 		sscanf (prop->value().c_str(), "%d", &edit_but);
 	}
@@ -212,6 +224,10 @@ Keyboard::set_state (const XMLNode& node, int /*version*/)
 		sscanf (prop->value().c_str(), "%d", &snap_mod);
 	}
 
+	if ((prop = node.property ("snap-delta-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &snap_delta_mod);
+	}
+
 	if ((prop = node.property ("insert-note-button")) != 0) {
 		sscanf (prop->value().c_str(), "%d", &insert_note_but);
 	}
@@ -466,6 +482,14 @@ Keyboard::set_snap_modifier (guint mod)
 	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_mod);
 }
 
+void
+Keyboard::set_snap_delta_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~snap_delta_mod);
+	snap_delta_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_delta_mod);
+}
+
 bool
 Keyboard::is_edit_event (GdkEventButton *ev)
 {