+ // GtkAccelMap* accelmap = gtk_accel_map_get();
+ // g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
+}
+
+XMLNode&
+ArdourKeyboard::get_state (void)
+{
+ XMLNode* node = &Keyboard::get_state ();
+
+ node->set_property ("constraint-modifier", constraint_mod);
+ node->set_property ("trim-contents-modifier", trim_contents_mod);
+ node->set_property ("trim-overlap-modifier", trim_overlap_mod);
+ node->set_property ("trim-anchored-modifier", trim_anchored_mod);
+ node->set_property ("fine-adjust-modifier", fine_adjust_mod);
+ node->set_property ("push-points-modifier", push_points_mod);
+ node->set_property ("note-size-relative-modifier", note_size_relative_mod);
+
+ return *node;
+}
+
+int
+ArdourKeyboard::set_state (const XMLNode& node, int version)
+{
+ node.get_property ("constraint-modifier", constraint_mod);
+ node.get_property ("trim-contents-modifier", trim_contents_mod);
+ node.get_property ("trim-overlap-modifier", trim_overlap_mod);
+ node.get_property ("trim-anchored-modifier", trim_anchored_mod);
+ node.get_property ("fine-adjust-modifier", fine_adjust_mod);
+ node.get_property ("push-points-modifier", push_points_mod);
+ node.get_property ("note-size-relative-modifier", note_size_relative_mod);
+
+ 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:
+ */
+bool
+ArdourKeyboard::indicates_snap (guint state)
+{
+ const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier ());
+ const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier ());
+ const bool s_contains_d = Keyboard::modifier_state_contains (Keyboard::snap_modifier (), Keyboard::snap_delta_modifier ());
+
+ return (contains_s && ((contains_d && s_contains_d) || !contains_d));
+}
+
+bool
+ArdourKeyboard::indicates_snap_delta (guint state)
+{
+ const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier ());
+ const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier ());
+ const bool d_contains_s = Keyboard::modifier_state_contains (Keyboard::snap_delta_modifier (), Keyboard::snap_modifier ());
+
+ 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)
+{
+ constraint_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();
+}
+
+void
+ArdourKeyboard::set_trim_contents_modifier (guint mod)
+{
+ trim_contents_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();
+}
+
+void
+ArdourKeyboard::set_trim_overlap_modifier (guint mod)
+{
+ trim_overlap_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();
+}
+
+void
+ArdourKeyboard::set_trim_anchored_modifier (guint mod)
+{
+ trim_anchored_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();
+}
+
+void
+ArdourKeyboard::set_fine_adjust_modifier (guint mod)
+{
+ fine_adjust_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();
+}
+
+void
+ArdourKeyboard::set_push_points_modifier (guint mod)
+{
+ push_points_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();
+}
+
+void
+ArdourKeyboard::set_note_size_relative_modifier (guint mod)
+{
+ note_size_relative_mod = mod;
+ the_keyboard().reset_relevant_modifier_key_mask();