Add more modifier preferences.

	Note that no defaults are set - go to prefs->user interaction to
	ensure that nothing is set to "no modifer"

	also - the copy modifier doesn't actually save its state yet.

2 files changed, 42 insertions, 2 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 6cccca762b..5be93fe4f6 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -115,7 +115,6 @@ 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
@@ -123,11 +122,20 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	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;
 	 */
 	static ModifierMask snap_delta_modifier () { return ModifierMask (snap_delta_mod); }
 
+	static void set_trim_contents_modifier (guint);
+	/** @return Modifier mask to move contents rather than region bounds during trim;
+	 */
+	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;
+	 */
+	static ModifierMask trim_overlap_modifier () { return ModifierMask (trim_overlap_mod); }
+
 	static guint edit_button() { return edit_but; }
 	static void set_edit_button (guint);
 	static guint edit_modifier() { return edit_mod; }
@@ -193,6 +201,8 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	static guint     insert_note_mod;
 	static guint     snap_mod;
 	static guint     snap_delta_mod;
+	static guint     trim_contents_mod;
+	static guint     trim_overlap_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 4e35b3b80a..f60b91cb4d 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -60,6 +60,8 @@ 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
 
@@ -182,6 +184,10 @@ Keyboard::get_state (void)
 	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", trim_contents_mod);
+	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", insert_note_but);
 	node->add_property ("insert-note-button", buf);
 	snprintf (buf, sizeof (buf), "%d", insert_note_mod);
@@ -219,6 +225,14 @@ Keyboard::set_state (const XMLNode& node, int /*version*/)
 		sscanf (prop->value().c_str(), "%d", &snap_delta_mod);
 	}
 
+	if ((prop = node.property ("trim-contents-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &trim_contents_mod);
+	}
+
+	if ((prop = node.property ("trim-overlap-modifier")) != 0) {
+		sscanf (prop->value().c_str(), "%d", &trim_overlap_mod);
+	}
+
 	if ((prop = node.property ("insert-note-button")) != 0) {
 		sscanf (prop->value().c_str(), "%d", &insert_note_but);
 	}
@@ -481,6 +495,22 @@ Keyboard::set_snap_delta_modifier (guint mod)
 	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_delta_mod);
 }
 
+void
+Keyboard::set_trim_contents_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_contents_mod);
+	trim_contents_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_contents_mod);
+}
+
+void
+Keyboard::set_trim_overlap_modifier (guint mod)
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_overlap_mod);
+	trim_overlap_mod = mod;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_overlap_mod);
+}
+
 bool
 Keyboard::is_edit_event (GdkEventButton *ev)
 {