X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fkeyboard.h;h=2feed694032778aef254c7d4c0446905889552f7;hb=6c19a776f43b4a9869780e3312764d039a16cd39;hp=8ed30efb72210f609e72ba9244d5d682dc8f8884;hpb=eaf49f02ff92f22cbfa214ae89ec0a2fc3861d29;p=ardour.git

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index 8ed30efb72..2feed69403 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -20,6 +20,9 @@
 #ifndef __ardour_keyboard_h__
 #define __ardour_keyboard_h__
 
+#include <map>
+#include <string>
+
 #include "ardour/types.h"
 #include "gtkmm2ext/keyboard.h"
 
@@ -29,8 +32,8 @@ class ARDOUR_UI;
 
 class ArdourKeyboard : public Gtkmm2ext::Keyboard
 {
-  public:
-	ArdourKeyboard(ARDOUR_UI& ardour_ui) : ui(ardour_ui) {}
+public:
+	ArdourKeyboard(ARDOUR_UI&);
 
 	XMLNode& get_state (void);
 	int set_state (const XMLNode&, int version);
@@ -41,45 +44,65 @@ class ArdourKeyboard : public Gtkmm2ext::Keyboard
 
 	ARDOUR_UI& ui;
 
+	void reset_relevant_modifier_key_mask ();
+
+	/** @param state The button state from a GdkEvent.
+	 *  @return true if the modifier state indicates snap modifier
+	 */
 	static bool indicates_snap (guint state);
+
+	/** @param state The button state from a GdkEvent.
+	 *  @return true if the modifier state indicates snap delta
+	 */
 	static bool indicates_snap_delta (guint state);
 
-	static void set_trim_contents_modifier (guint);
-	/** @return Modifier mask to move contents rather than region bounds during trim;
+	/** @param state The button state from a GdkEvent.
+	 *  @return true if the modifier state indicates copy modifier
+	 */
+	static bool indicates_copy (guint state);
+
+	/** @param state The button state from a GdkEvent.
+	 *  @return true if the modifier state indicates constraint modifier
 	 */
+	static bool indicates_constraint (guint state);
+
+	static void set_constraint_modifier (guint);
+	/** @return Modifier mask to constrain drags in a particular direction; */
+	static ModifierMask constraint_modifier () { return ModifierMask (constraint_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 during 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;
-	 */
+	/** @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);
-	 */
+	/** @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;
-	 */
+	/** @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;
-	 */
+	/** @return Modifier mask to resize notes relatively; */
 	static ModifierMask note_size_relative_modifier () { return ModifierMask (note_size_relative_mod); }
 private:
+	static guint     constraint_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;
+
+	void find_bindings_files (std::map<std::string,std::string>& files);
 };
 
 #endif /* __ardour_keyboard_h__ */