X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=501c81ee6ddaa347926f1299c00208ba171c54a5;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=75a96ec98b3a0d4112cdd352cf798c8d58b7cd28;hpb=6a436fd826d1c9d88b60287696cc0836ccce35aa;p=ardour.git diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 75a96ec98b..501c81ee6d 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -17,20 +17,21 @@ */ +#include "pbd/convert.h" #include "pbd/error.h" #include "pbd/file_utils.h" +#include "pbd/basename.h" #include "ardour/filesystem_paths.h" +#include "ardour/revision.h" #include "ardour_ui.h" +#include "public_editor.h" #include "keyboard.h" #include "opts.h" +#include "ui_config.h" -#include "i18n.h" - -#ifdef SearchPath -#undef SearchPath -#endif +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -38,32 +39,80 @@ using namespace PBD; using namespace ARDOUR; using Gtkmm2ext::Keyboard; -static void -accel_map_changed (GtkAccelMap* /*map*/, - gchar* /*path*/, - guint /*key*/, - GdkModifierType /*mod*/, - gpointer keyboard) +#ifdef __APPLE__ +guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier; +#else +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; + +/* 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; // XXX better just 2ndary + +/* 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; // XXX better: 2ndary + +ArdourKeyboard::ArdourKeyboard (ARDOUR_UI& ardour_ui) : ui (ardour_ui) { - ArdourKeyboard* me = (ArdourKeyboard*)keyboard; - Keyboard::keybindings_changed (); - me->ui.setup_tooltips (); + Keyboard::RelevantModifierKeysChanged.connect (sigc::mem_fun (*this, &ArdourKeyboard::reset_relevant_modifier_key_mask)); +} + +void +ArdourKeyboard::find_bindings_files (map& files) +{ + vector found; + Searchpath spath = ardour_config_search_path(); + + find_files_matching_pattern (found, spath, string_compose ("*%1", Keyboard::binding_filename_suffix)); + + if (found.empty()) { + return; + } + + for (vector::iterator x = found.begin(); x != found.end(); ++x) { + std::string path(*x); + pair namepath; + namepath.second = path; + namepath.first = PBD::basename_nosuffix (path); + files.insert (namepath); + } } void ArdourKeyboard::setup_keybindings () { - using namespace ARDOUR_COMMAND_LINE; - string default_bindings = "mnemonic-us.bindings"; + string keybindings_path = ARDOUR_COMMAND_LINE::keybindings_path; + string default_bindings = string_compose ("%1%2", UIConfiguration::instance().get_default_bindings(), Keyboard::binding_filename_suffix); vector strs; binding_files.clear (); - ARDOUR::find_bindings_files (binding_files); + find_bindings_files (binding_files); /* set up the per-user bindings path */ - user_keybindings_path = Glib::build_filename (user_config_directory(), "ardour.bindings"); + string lowercase_program_name = downcase (string(PROGRAM_NAME)); + + /* extract and append minor vesion */ + std::string rev (revision); + std::size_t pos = rev.find_first_of("-"); + if (pos != string::npos && pos > 0) { + lowercase_program_name += "-"; + lowercase_program_name += rev.substr (0, pos); + } + + user_keybindings_path = Glib::build_filename (user_config_directory(), lowercase_program_name + binding_filename_suffix); if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) { std::pair newpair; @@ -72,11 +121,10 @@ ArdourKeyboard::setup_keybindings () binding_files.insert (newpair); } - /* check to see if they gave a style name ("SAE", "ergonomic") or - an actual filename (*.bindings) + /* check to see if they gave a style name ("ergonomic") or an actual filename (*.bindings) */ - if (!keybindings_path.empty() && keybindings_path.find (".bindings") == string::npos) { + if (!keybindings_path.empty() && keybindings_path.find (binding_filename_suffix) == string::npos) { // just a style name - allow user to // specify the layout type. @@ -97,7 +145,7 @@ ArdourKeyboard::setup_keybindings () keybindings_path += "-us"; } - keybindings_path += ".bindings"; + keybindings_path += binding_filename_suffix; } if (keybindings_path.empty()) { @@ -127,7 +175,7 @@ ArdourKeyboard::setup_keybindings () /* not absolute - look in the usual places */ std::string keybindings_file; - if ( ! find_file_in_search_path (ardour_config_search_path(), keybindings_path, keybindings_file)) { + if (!find_file (ardour_config_search_path(), keybindings_path, keybindings_file)) { if (keybindings_path == default_bindings) { error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg; @@ -157,9 +205,6 @@ ArdourKeyboard::setup_keybindings () error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg; return; } else { - warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), - keybindings_path) - << endmsg; keybindings_path = default_bindings; } @@ -171,10 +216,143 @@ ArdourKeyboard::setup_keybindings () load_keybindings (keybindings_path); - /* catch changes */ + /* catch changes made via some GTK mechanism */ - GtkAccelMap* accelmap = gtk_accel_map_get(); - g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this); + // 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(); } Selection::Operation @@ -190,5 +368,3 @@ ArdourKeyboard::selection_type (guint state) return Selection::Set; } } - -