X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=501c81ee6ddaa347926f1299c00208ba171c54a5;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=6094e3502e1d9547f62049daf10cde7d871b6ee8;hpb=ff9ddf510065305e13d169d35f9b4e6b88ce76d7;p=ardour.git diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 6094e3502e..501c81ee6d 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -17,489 +17,102 @@ */ -#include -#include "ardour/ardour.h" - -#include "ardour_ui.h" - -#include -#include -#include - -#include - -#include - -#include +#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 "gui_thread.h" #include "opts.h" -#include "actions.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" +using namespace std; +using namespace Gtk; using namespace PBD; using namespace ARDOUR; -using namespace Gtk; -using namespace std; +using Gtkmm2ext::Keyboard; -#define KBD_DEBUG 1 -bool debug_keyboard = false; - -guint Keyboard::edit_but = 3; -guint Keyboard::edit_mod = GDK_CONTROL_MASK; -guint Keyboard::delete_but = 3; -guint Keyboard::delete_mod = GDK_SHIFT_MASK; -guint Keyboard::snap_mod = GDK_MOD3_MASK; - -#ifdef GTKOSX -guint Keyboard::PrimaryModifier = GDK_META_MASK; // Command -guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option -guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift -guint Keyboard::Level4Modifier = GDK_CONTROL_MASK; // Control -guint Keyboard::CopyModifier = GDK_MOD1_MASK; // Alt/Option -guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; -guint Keyboard::button2_modifiers = Keyboard::SecondaryModifier|Keyboard::Level4Modifier; +#ifdef __APPLE__ +guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier; #else -guint Keyboard::PrimaryModifier = GDK_CONTROL_MASK; // Control -guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option -guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift -guint Keyboard::Level4Modifier = GDK_MOD4_MASK; // Mod4/Windows -guint Keyboard::CopyModifier = GDK_CONTROL_MASK; -guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; -guint Keyboard::button2_modifiers = 0; /* not used */ -#endif - - -Keyboard* Keyboard::_the_keyboard = 0; -Gtk::Window* Keyboard::current_window = 0; -bool Keyboard::_some_magic_widget_has_focus = false; - -std::string Keyboard::user_keybindings_path; -bool Keyboard::can_save_keybindings = false; -bool Keyboard::bindings_changed_after_save_became_legal = false; -map Keyboard::binding_files; -string Keyboard::_current_binding_name = _("Unknown"); -map,Keyboard::AccelKeyLess> Keyboard::release_keys; - -/* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ - -GdkModifierType Keyboard::RelevantModifierKeyMask; - -void -Keyboard::magic_widget_grab_focus () -{ - _some_magic_widget_has_focus = true; -} - -void -Keyboard::magic_widget_drop_focus () -{ - _some_magic_widget_has_focus = false; -} - -bool -Keyboard::some_magic_widget_has_focus () -{ - return _some_magic_widget_has_focus; -} - -Keyboard::Keyboard () -{ - if (_the_keyboard == 0) { - _the_keyboard = this; - } - - RelevantModifierKeyMask = (GdkModifierType) gtk_accelerator_get_default_mod_mask (); - - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | PrimaryModifier); - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | SecondaryModifier); - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | TertiaryModifier); - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | Level4Modifier); - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | CopyModifier); - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | RangeSelectModifier); - - gtk_accelerator_set_default_mod_mask (RelevantModifierKeyMask); - - snooper_id = gtk_key_snooper_install (_snooper, (gpointer) this); - - XMLNode* node = ARDOUR_UI::instance()->keyboard_settings(); - set_state (*node, Stateful::loading_state_version); -} - -Keyboard::~Keyboard () -{ - gtk_key_snooper_remove (snooper_id); -} - -XMLNode& -Keyboard::get_state (void) -{ - XMLNode* node = new XMLNode ("Keyboard"); - char buf[32]; - - snprintf (buf, sizeof (buf), "%d", edit_but); - node->add_property ("edit-button", buf); - snprintf (buf, sizeof (buf), "%d", edit_mod); - node->add_property ("edit-modifier", buf); - snprintf (buf, sizeof (buf), "%d", delete_but); - node->add_property ("delete-button", buf); - snprintf (buf, sizeof (buf), "%d", delete_mod); - node->add_property ("delete-modifier", buf); - snprintf (buf, sizeof (buf), "%d", snap_mod); - node->add_property ("snap-modifier", buf); - - return *node; -} - -int -Keyboard::set_state (const XMLNode& node, int /*version*/) -{ - const XMLProperty* prop; - - if ((prop = node.property ("edit-button")) != 0) { - sscanf (prop->value().c_str(), "%d", &edit_but); - } - - if ((prop = node.property ("edit-modifier")) != 0) { - sscanf (prop->value().c_str(), "%d", &edit_mod); - } - - if ((prop = node.property ("delete-button")) != 0) { - sscanf (prop->value().c_str(), "%d", &delete_but); - } - - if ((prop = node.property ("delete-modifier")) != 0) { - sscanf (prop->value().c_str(), "%d", &delete_mod); - } - - if ((prop = node.property ("snap-modifier")) != 0) { - sscanf (prop->value().c_str(), "%d", &snap_mod); - } - - return 0; -} - -gint -Keyboard::_snooper (GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - return ((Keyboard *) data)->snooper (widget, event); -} - -gint -Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) -{ - uint32_t keyval; - bool ret = false; - -#if 1 - cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type - << " state " << std::hex << event->state << std::dec - << endl; +guint ArdourKeyboard::constraint_mod = Keyboard::TertiaryModifier; #endif -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type - << endl; - } -#endif - - if (event->keyval == GDK_Shift_R) { - keyval = GDK_Shift_L; - - } else if (event->keyval == GDK_Control_R) { - keyval = GDK_Control_L; - - } else { - keyval = event->keyval; - } - - if (event->type == GDK_KEY_PRESS) { - - if (find (state.begin(), state.end(), keyval) == state.end()) { - state.push_back (keyval); - sort (state.begin(), state.end()); - - } else { - - /* key is already down. if its also used for release, - prevent auto-repeat events. - */ - - for (map::iterator k = release_keys.begin(); k != release_keys.end(); ++k) { - - const AccelKey& ak (k->first); - - if (keyval == ak.get_key() && (Gdk::ModifierType)((event->state & Keyboard::RelevantModifierKeyMask) | Gdk::RELEASE_MASK) == ak.get_mod()) { - cerr << "Suppress auto repeat\n"; - ret = true; - break; - } - } - } - - } else if (event->type == GDK_KEY_RELEASE) { +/* TrimDrag::start_grab() */ +guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier; - State::iterator i; +/* TrimDrag::motion() */ +guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier; - if ((i = find (state.begin(), state.end(), keyval)) != state.end()) { - state.erase (i); - sort (state.begin(), state.end()); - } +/* TrimDrag::start_grab() */ +guint ArdourKeyboard::trim_anchored_mod = Keyboard::PrimaryModifier|Keyboard::TertiaryModifier; - for (map::iterator k = release_keys.begin(); k != release_keys.end(); ++k) { +/* ControlPointDrag::motion() && LineDrag::motion()*/ +guint ArdourKeyboard::fine_adjust_mod = Keyboard::PrimaryModifier|Keyboard::SecondaryModifier; // XXX better just 2ndary - const AccelKey& ak (k->first); - two_strings ts (k->second); +/* ControlPointDrag::start_grab() && MarkerDrag::motion() */ +guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier|Keyboard::Level4Modifier; - if (keyval == ak.get_key() && (Gdk::ModifierType)((event->state & Keyboard::RelevantModifierKeyMask) | Gdk::RELEASE_MASK) == ak.get_mod()) { - Glib::RefPtr act = ActionManager::get_action (ts.first.c_str(), ts.second.c_str()); - if (act) { - act->activate(); - cerr << "use repeat, suppress other\n"; - ret = true; - } - break; - } - } - } - - /* Special keys that we want to handle in - any dialog, no matter whether it uses - the regular set of accelerators or not - */ - - if (event->type == GDK_KEY_RELEASE && modifier_state_equals (event->state, PrimaryModifier)) { - switch (event->keyval) { - case GDK_w: - if (current_window) { - current_window->hide (); - current_window = 0; - ret = true; - } - break; - } - } - - return ret; -} +/* NoteResizeDrag::start_grab() */ +guint ArdourKeyboard::note_size_relative_mod = Keyboard::TertiaryModifier; // XXX better: 2ndary -bool -Keyboard::key_is_down (uint32_t keyval) -{ - return find (state.begin(), state.end(), keyval) != state.end(); -} - -bool -Keyboard::enter_window (GdkEventCrossing *, Gtk::Window* win) +ArdourKeyboard::ArdourKeyboard (ARDOUR_UI& ardour_ui) : ui (ardour_ui) { - current_window = win; - return false; -} - -bool -Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/) -{ - if (ev) { - switch (ev->detail) { - case GDK_NOTIFY_INFERIOR: - if (debug_keyboard) { - cerr << "INFERIOR crossing ... out\n"; - } - break; - - case GDK_NOTIFY_VIRTUAL: - if (debug_keyboard) { - cerr << "VIRTUAL crossing ... out\n"; - } - /* fallthru */ - - default: - if (debug_keyboard) { - cerr << "REAL CROSSING ... out\n"; - cerr << "clearing current target\n"; - } - state.clear (); - current_window = 0; - } - } else { - current_window = 0; - } - - return false; -} - -void -Keyboard::set_edit_button (guint but) -{ - edit_but = but; -} - -void -Keyboard::set_edit_modifier (guint mod) -{ - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~edit_mod); - edit_mod = mod; - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | edit_mod); + Keyboard::RelevantModifierKeysChanged.connect (sigc::mem_fun (*this, &ArdourKeyboard::reset_relevant_modifier_key_mask)); } void -Keyboard::set_delete_button (guint but) +ArdourKeyboard::find_bindings_files (map& files) { - delete_but = but; -} + vector found; + Searchpath spath = ardour_config_search_path(); -void -Keyboard::set_delete_modifier (guint mod) -{ - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~delete_mod); - delete_mod = mod; - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | delete_mod); -} + find_files_matching_pattern (found, spath, string_compose ("*%1", Keyboard::binding_filename_suffix)); -void -Keyboard::set_modifier (uint32_t newval, uint32_t& var) -{ - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~var); - var = newval; - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | var); -} - -void -Keyboard::set_snap_modifier (guint mod) -{ - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~snap_mod); - snap_mod = mod; - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_mod); -} - -bool -Keyboard::is_edit_event (GdkEventButton *ev) -{ - return (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_BUTTON_RELEASE) && - (ev->button == Keyboard::edit_button()) && - ((ev->state & RelevantModifierKeyMask) == Keyboard::edit_modifier()); -} - -bool -Keyboard::is_button2_event (GdkEventButton* ev) -{ -#ifdef GTKOSX - return (ev->button == 2) || - ((ev->button == 1) && - ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers)); -#else - return ev->button == 2; -#endif -} - -bool -Keyboard::is_delete_event (GdkEventButton *ev) -{ - return (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_BUTTON_RELEASE) && - (ev->button == Keyboard::delete_button()) && - ((ev->state & RelevantModifierKeyMask) == Keyboard::delete_modifier()); -} - -bool -Keyboard::is_context_menu_event (GdkEventButton *ev) -{ - return (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_BUTTON_RELEASE) && - (ev->button == 3) && - ((ev->state & RelevantModifierKeyMask) == 0); -} - -bool -Keyboard::no_modifiers_active (guint state) -{ - return (state & RelevantModifierKeyMask) == 0; -} - -bool -Keyboard::modifier_state_contains (guint state, ModifierMask mask) -{ - return (state & mask) == (guint) mask; -} - -bool -Keyboard::modifier_state_equals (guint state, ModifierMask mask) -{ - return (state & RelevantModifierKeyMask) == (guint) mask; -} - -Selection::Operation -Keyboard::selection_type (guint state) -{ - /* note that there is no modifier for "Add" */ - - if (modifier_state_equals (state, RangeSelectModifier)) { - return Selection::Extend; - } else if (modifier_state_equals (state, PrimaryModifier)) { - return Selection::Toggle; - } else { - return Selection::Set; + if (found.empty()) { + return; } -} - -static void -accel_map_changed (GtkAccelMap* /*map*/, - gchar* /*path*/, - guint /*key*/, - GdkModifierType /*mod*/, - gpointer /*arg*/) -{ - Keyboard::keybindings_changed (); -} - -void -Keyboard::keybindings_changed () -{ - if (Keyboard::can_save_keybindings) { - Keyboard::bindings_changed_after_save_became_legal = true; - } - - Keyboard::save_keybindings (); -} - -void -Keyboard::set_can_save_keybindings (bool yn) -{ - can_save_keybindings = yn; -} - -void -Keyboard::save_keybindings () -{ - if (can_save_keybindings && bindings_changed_after_save_became_legal) { - Gtk::AccelMap::save (user_keybindings_path); + 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 -Keyboard::setup_keybindings () +ArdourKeyboard::setup_keybindings () { - using namespace ARDOUR_COMMAND_LINE; - std::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 */ - strs.push_back (Glib::get_home_dir()); - strs.push_back (".ardour3"); - strs.push_back ("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 (strs); + 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; @@ -508,11 +121,10 @@ Keyboard::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. @@ -533,7 +145,7 @@ Keyboard::setup_keybindings () keybindings_path += "-us"; } - keybindings_path += ".bindings"; + keybindings_path += binding_filename_suffix; } if (keybindings_path.empty()) { @@ -561,14 +173,12 @@ Keyboard::setup_keybindings () if (!Glib::path_is_absolute (keybindings_path)) { /* not absolute - look in the usual places */ - sys::path keybindings_file; - - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); + std::string keybindings_file; - if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) { + if (!find_file (ardour_config_search_path(), keybindings_path, keybindings_file)) { if (keybindings_path == default_bindings) { - error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg; + 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"), @@ -581,7 +191,7 @@ Keyboard::setup_keybindings () /* use it */ - keybindings_path = keybindings_file.to_string(); + keybindings_path = keybindings_file; break; } @@ -592,12 +202,9 @@ Keyboard::setup_keybindings () if (!Glib::file_test (keybindings_path, Glib::FILE_TEST_EXISTS)) { if (keybindings_path == default_bindings) { - error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg; + 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; } @@ -609,75 +216,155 @@ Keyboard::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, 0); + // GtkAccelMap* accelmap = gtk_accel_map_get(); + // g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this); } -bool -Keyboard::load_keybindings (string path) +XMLNode& +ArdourKeyboard::get_state (void) { - try { - info << "Loading bindings from " << path << endl; + XMLNode* node = &Keyboard::get_state (); - Gtk::AccelMap::load (path); + 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); - _current_binding_name = _("Unknown"); + return *node; +} - for (map::iterator x = binding_files.begin(); x != binding_files.end(); ++x) { - if (path == x->second) { - _current_binding_name = x->first; - break; - } - } +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); +} - } catch (...) { - error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), path) - << endmsg; - return false; - } +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); +} - /* now find all release-driven bindings */ +/* 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 ()); - vector groups; - vector names; - vector bindings; + return (contains_s && ((contains_d && s_contains_d) || !contains_d)); +} - ActionManager::get_all_actions (groups, names, bindings); +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 ()); - vector::iterator g; - vector::iterator b; - vector::iterator n; + return (contains_d && ((contains_s && d_contains_s) || !contains_s)); +} - release_keys.clear (); +/* 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 ()); - bool show_bindings = (getenv ("ARDOUR_SHOW_BINDINGS") != 0); + return contains_c && !equals_cs; +} - for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) { +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); - if (show_bindings) { + return contains_cs && !equals_c; +} - cerr << "Action: " << (*n) << " Group: " << (*g) << " binding = "; +void +ArdourKeyboard::set_constraint_modifier (guint mod) +{ + constraint_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); +} - if ((*b).get_key() != GDK_VoidSymbol) { - cerr << (*b).get_key() << " w/mod = " << hex << (*b).get_mod() << dec << " = " << (*b).get_abbrev(); - } else { - cerr << "unbound"; - } +void +ArdourKeyboard::set_trim_contents_modifier (guint mod) +{ + trim_contents_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); +} - cerr << endl; - } - } +void +ArdourKeyboard::set_trim_overlap_modifier (guint mod) +{ + trim_overlap_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); +} - for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) { - if ((*b).get_mod() & Gdk::RELEASE_MASK) { - release_keys.insert (pair (*b, two_strings (*g, *n))); - } - } +void +ArdourKeyboard::set_trim_anchored_modifier (guint mod) +{ + trim_anchored_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); +} - return true; +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 +ArdourKeyboard::selection_type (guint state) +{ + /* note that there is no modifier for "Add" */ + + if (modifier_state_equals (state, RangeSelectModifier)) { + return Selection::Extend; + } else if (modifier_state_equals (state, PrimaryModifier)) { + return Selection::Toggle; + } else { + return Selection::Set; + } +}