X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=ff336c2f698a31d40eda2c02d503e85966bbfdb1;hb=d3bb4e8b08ac3bc80013bce1a82eeae2ea53eea1;hp=6181e41e848ad1401cec6a9c569797b3446599bc;hpb=6991a07902cc844b87c895aa56de613c96b88b4f;p=ardour.git

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 6181e41e84..ff336c2f69 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -30,7 +30,7 @@
 #include "opts.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -38,17 +38,34 @@ using namespace PBD;
 using namespace ARDOUR;
 using Gtkmm2ext::Keyboard;
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier;
 #else
-guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier;
+guint ArdourKeyboard::constraint_mod = Keyboard::TertiaryModifier;
 #endif
+
+/* TrimDrag::start_grab() */
 guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier;
+
+/* TrimDrag::motion() */
 guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier;
-guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier;
-guint ArdourKeyboard::fine_adjust_mod = Keyboard::SecondaryModifier;
-guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier;
-guint ArdourKeyboard::note_size_relative_mod = Keyboard::PrimaryModifier;
+
+/* TrimDrag::start_grab() */
+guint ArdourKeyboard::trim_anchored_mod = Keyboard::PrimaryModifier|Keyboard::TertiaryModifier;
+
+/* ControlPointDrag::motion() && LineDrag::motion()*/
+guint ArdourKeyboard::fine_adjust_mod = Keyboard::PrimaryModifier|Keyboard::SecondaryModifier;
+
+/* ControlPointDrag::start_grab() && MarkerDrag::motion() */
+guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier|Keyboard::Level4Modifier;
+
+/* NoteResizeDrag::start_grab() */
+guint ArdourKeyboard::note_size_relative_mod = Keyboard::TertiaryModifier;
+
+ArdourKeyboard::ArdourKeyboard (ARDOUR_UI& ardour_ui) : ui (ardour_ui)
+{
+	Keyboard::RelevantModifierKeysChanged.connect (sigc::mem_fun (*this, &ArdourKeyboard::reset_relevant_modifier_key_mask));
+}
 
 void
 ArdourKeyboard::find_bindings_files (map<string,string>& files)
@@ -56,7 +73,7 @@ ArdourKeyboard::find_bindings_files (map<string,string>& files)
 	vector<std::string> found;
 	Searchpath spath = ardour_config_search_path();
 
-	find_files_matching_pattern (found, spath, string_compose ("*.%1", Keyboard::binding_filename_suffix));
+	find_files_matching_pattern (found, spath, string_compose ("*%1", Keyboard::binding_filename_suffix));
 
 	if (found.empty()) {
 		return;
@@ -227,7 +244,7 @@ ArdourKeyboard::get_state (void)
 int
 ArdourKeyboard::set_state (const XMLNode& node, int version)
 {
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 
 	if ((prop = node.property ("constraint-modifier")) != 0) {
 		sscanf (prop->value().c_str(), "%d", &constraint_mod);
@@ -260,6 +277,18 @@ ArdourKeyboard::set_state (const XMLNode& node, int version)
 	return Keyboard::set_state (node, version);
 }
 
+void
+ArdourKeyboard::reset_relevant_modifier_key_mask ()
+{
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | constraint_mod);
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_contents_mod);
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_overlap_mod);
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_anchored_mod);
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | fine_adjust_mod);
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | push_points_mod);
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | note_size_relative_mod);
+}
+
 /* Snap and snap delta modifiers may contain each other, so we use the
  * following two methods to sort that out:
  */
@@ -283,60 +312,72 @@ ArdourKeyboard::indicates_snap_delta (guint state)
 	return (contains_d && ((contains_s && d_contains_s) || !contains_s));
 }
 
+/* Constraint and copy modifiers are both in effect at the beginning of some drags, and may be set ambiguously */
+bool
+ArdourKeyboard::indicates_copy (guint state)
+{
+	const bool contains_c = Keyboard::modifier_state_contains (state, Keyboard::CopyModifier);
+	const bool equals_cs = Keyboard::modifier_state_equals (state, constraint_modifier ());
+
+	return  contains_c && !equals_cs;
+}
+
+bool
+ArdourKeyboard::indicates_constraint (guint state)
+{
+	const bool contains_cs = Keyboard::modifier_state_contains (state, constraint_modifier ());
+	const bool equals_c = Keyboard::modifier_state_equals (state, Keyboard::CopyModifier);
+
+	return contains_cs && !equals_c;
+}
+
 void
 ArdourKeyboard::set_constraint_modifier (guint mod)
 {
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~constraint_mod);
 	constraint_mod = mod;
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | constraint_mod);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 void
 ArdourKeyboard::set_trim_contents_modifier (guint mod)
 {
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_contents_mod);
 	trim_contents_mod = mod;
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_contents_mod);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 void
 ArdourKeyboard::set_trim_overlap_modifier (guint mod)
 {
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_overlap_mod);
 	trim_overlap_mod = mod;
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_overlap_mod);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 void
 ArdourKeyboard::set_trim_anchored_modifier (guint mod)
 {
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_anchored_mod);
 	trim_anchored_mod = mod;
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_anchored_mod);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 void
 ArdourKeyboard::set_fine_adjust_modifier (guint mod)
 {
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~fine_adjust_mod);
 	fine_adjust_mod = mod;
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | fine_adjust_mod);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 void
 ArdourKeyboard::set_push_points_modifier (guint mod)
 {
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~push_points_mod);
 	push_points_mod = mod;
-	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | push_points_mod);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 void
 ArdourKeyboard::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);
+	the_keyboard().reset_relevant_modifier_key_mask();
 }
 
 Selection::Operation