X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=6341071451f94d3b5e99b72169e8405652ff53e2;hb=ad34eb7e0baa801b579782c8235562a1c90ca993;hp=96c73f63d41b64f8da0f53191061d11172488cf1;hpb=a14c7ff066476aae1a30b3573c90153ed1565e66;p=ardour.git diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 96c73f63d4..6341071451 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -20,6 +20,7 @@ #include "pbd/convert.h" #include "pbd/error.h" #include "pbd/file_utils.h" +#include "pbd/basename.h" #include "ardour/filesystem_paths.h" @@ -27,8 +28,9 @@ #include "public_editor.h" #include "keyboard.h" #include "opts.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -36,19 +38,11 @@ using namespace PBD; using namespace ARDOUR; using Gtkmm2ext::Keyboard; -static void -accel_map_changed (GtkAccelMap* /*map*/, - gchar* /*path*/, - guint /*key*/, - GdkModifierType /*mod*/, - gpointer keyboard) -{ - ArdourKeyboard* me = (ArdourKeyboard*)keyboard; - Keyboard::keybindings_changed (); - me->ui.setup_tooltips (); -} - +#ifdef __APPLE__ +guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier; +#else guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier; +#endif guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier; guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier; guint ArdourKeyboard::trim_anchored_mod = Keyboard::TertiaryModifier; @@ -56,22 +50,43 @@ guint ArdourKeyboard::fine_adjust_mod = Keyboard::SecondaryModifier; guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier; guint ArdourKeyboard::note_size_relative_mod = Keyboard::PrimaryModifier; +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 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 */ - string lowercase_program_name = downcase (PROGRAM_NAME); + string lowercase_program_name = downcase (string(PROGRAM_NAME)); - user_keybindings_path = Glib::build_filename (user_config_directory(), lowercase_program_name + ".bindings"); + 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; @@ -80,11 +95,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. @@ -105,7 +119,7 @@ ArdourKeyboard::setup_keybindings () keybindings_path += "-us"; } - keybindings_path += ".bindings"; + keybindings_path += binding_filename_suffix; } if (keybindings_path.empty()) { @@ -128,6 +142,8 @@ ArdourKeyboard::setup_keybindings () keybindings_path = default_bindings; } + cerr << "KP is " << keybindings_path << endl; + while (true) { if (!Glib::path_is_absolute (keybindings_path)) { @@ -135,7 +151,7 @@ ArdourKeyboard::setup_keybindings () /* not absolute - look in the usual places */ std::string keybindings_file; - if ( ! find_file (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; @@ -174,12 +190,14 @@ ArdourKeyboard::setup_keybindings () } } + info << string_compose (_("Loading keybindings from %1"), keybindings_path) << endmsg; + 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& @@ -209,7 +227,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); @@ -242,27 +260,27 @@ ArdourKeyboard::set_state (const XMLNode& node, int version) return Keyboard::set_state (node, version); } -/* Snap and snap delta modifiers may contain each other, so we use the +/* 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 equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier()); + 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 && !equals_d) || !contains_d)); + 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 equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier()); + 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 && !equals_s) || !contains_s)); + return (contains_d && ((contains_s && d_contains_s) || !contains_s)); } void