Allow all drag -related modifiers to be set, re-instate "jump after trim"

	- Copy modifier still doesn't save
	- Testers please edit the Extra section of ~/.ardourN/config to allow
	defaults to "take"
	- Note that the current defaults overlap.
	- warning - absolute snap modifier has no default and will be always
	"on" unless you set it!

2 files changed, 108 insertions, 3 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 5be93fe4f6..a10a6dbb3e 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -132,10 +132,35 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	static ModifierMask trim_contents_modifier () { return ModifierMask (trim_contents_mod); }
 
 	static void set_trim_overlap_modifier (guint);
-	/** @return Modifier mask to remove region overlaps after trim;
+	/** @return Modifier mask to remove region overlaps during trim;
 	 */
 	static ModifierMask trim_overlap_modifier () { return ModifierMask (trim_overlap_mod); }
 
+	static void set_trim_anchored_modifier (guint);
+	/** @return Modifier mask to use anchored trim;
+	 */
+	static ModifierMask trim_anchored_modifier () { return ModifierMask (trim_anchored_mod); }
+
+	static void set_fine_adjust_modifier (guint);
+	/** @return Modifier mask to fine adjust (control points only atm);
+	 */
+	static ModifierMask fine_adjust_modifier () { return ModifierMask (fine_adjust_mod); }
+
+	static void set_push_points_modifier (guint);
+	/** @return Modifier mask to push proceeding points;
+	 */
+	static ModifierMask push_points_modifier () { return ModifierMask (push_points_mod); }
+
+	static void set_note_size_relative_modifier (guint);
+	/** @return Modifier mask to resize notes relatively;
+	 */
+	static ModifierMask note_size_relative_modifier () { return ModifierMask (note_size_relative_mod); }
+
+	static void set_trim_jump_modifier (guint);
+	/** @return Modifier mask to jump position after trim;
+	 */
+	static ModifierMask trim_jump_modifier () { return ModifierMask (trim_jump_mod); }
+
 	static guint edit_button() { return edit_but; }
 	static void set_edit_button (guint);
 	static guint edit_modifier() { return edit_mod; }
@@ -203,6 +228,11 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	static guint     snap_delta_mod;
 	static guint     trim_contents_mod;
 	static guint     trim_overlap_mod;
+	static guint     trim_anchored_mod;
+	static guint     fine_adjust_mod;
+	static guint     push_points_mod;
+	static guint     note_size_relative_mod;
+	static guint     trim_jump_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 f60b91cb4d..17e41a4b85 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -60,8 +60,6 @@ guint Keyboard::insert_note_but = 1;
 guint Keyboard::insert_note_mod = GDK_CONTROL_MASK;
 guint Keyboard::snap_mod = GDK_MOD3_MASK;
 guint Keyboard::snap_delta_mod = 0;
-guint Keyboard::trim_contents_mod = 0;
-guint Keyboard::trim_overlap_mod = 0;
 
 #ifdef GTKOSX
 
@@ -106,6 +104,13 @@ guint Keyboard::ScrollZoomVerticalModifier = Keyboard::SecondaryModifier;
 guint Keyboard::ScrollZoomHorizontalModifier = Keyboard::PrimaryModifier;
 guint Keyboard::ScrollHorizontalModifier = Keyboard::TertiaryModifier;
 
+guint Keyboard::trim_contents_mod = Keyboard::PrimaryModifier;
+guint Keyboard::trim_overlap_mod = Keyboard::TertiaryModifier;
+guint Keyboard::trim_anchored_mod = Keyboard::TertiaryModifier;
+guint Keyboard::trim_jump_mod = Keyboard::TertiaryModifier;
+guint Keyboard::fine_adjust_mod = Keyboard::SecondaryModifier;
+guint Keyboard::push_points_mod = Keyboard::PrimaryModifier;
+guint Keyboard::note_size_relative_mod = Keyboard::PrimaryModifier;
 
 Keyboard*    Keyboard::_the_keyboard = 0;
 Gtk::Window* Keyboard::current_window = 0;
@@ -188,6 +193,16 @@ Keyboard::get_state (void)
 	node->add_property ("trim-contents-modifier", buf);
 	snprintf (buf, sizeof (buf), "%d", trim_overlap_mod);
 	node->add_property ("trim-overlap-modifier", buf);
+	snprintf (buf, sizeof (buf), "%d", trim_anchored_mod);
+	node->add_property ("trim-anchored-modifier", buf);
+	snprintf (buf, sizeof (buf), "%d", trim_jump_mod);
+	node->add_property ("trim-jump-modifier", buf);
+	snprintf (buf, sizeof (buf), "%d", fine_adjust_mod);
+	node->add_property ("fine-adjust-modifier", buf);
+	snprintf (buf, sizeof (buf), "%d", push_points_mod);
+	node->add_property ("push-points-modifier", buf);
+	snprintf (buf, sizeof (buf), "%d", note_size_relative_mod);
+	node->add_property ("note-size-relative-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);
@@ -233,6 +248,26 @@ Keyboard::set_state (const XMLNode& node, int /*version*/)
 		sscanf (prop->value().c_str(), "%d", &trim_overlap_mod);
 	}
 
+	if ((prop = node.property ("trim-anchored-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &trim_anchored_mod);
+	}
+
+	if ((prop = node.property ("trim-jump-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &trim_jump_mod);
+	}
+
+	if ((prop = node.property ("fine-adjust-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &fine_adjust_mod);
+	}
+
+	if ((prop = node.property ("push-points-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &push_points_mod);
+	}
+
+	if ((prop = node.property ("note-size-relative-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &note_size_relative_mod);
+	}
+
 	if ((prop = node.property ("insert-note-button")) != 0) {
 		sscanf (prop->value().c_str(), "%d", &insert_note_but);
 	}
@@ -511,6 +546,46 @@ Keyboard::set_trim_overlap_modifier (guint mod)
 	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_overlap_mod);
 }
 
+void
+Keyboard::set_trim_anchored_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_anchored_mod);
+	trim_anchored_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_anchored_mod);
+}
+
+void
+Keyboard::set_trim_jump_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_jump_mod);
+	trim_jump_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_jump_mod);
+}
+
+void
+Keyboard::set_fine_adjust_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~fine_adjust_mod);
+	fine_adjust_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | fine_adjust_mod);
+}
+
+void
+Keyboard::set_push_points_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~push_points_mod);
+	push_points_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | push_points_mod);
+}
+
+void
+Keyboard::set_note_size_relative_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~note_size_relative_mod);
+	note_size_relative_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | note_size_relative_mod);
+}
+
 bool
 Keyboard::is_edit_event (GdkEventButton *ev)
 {