X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=501c81ee6ddaa347926f1299c00208ba171c54a5;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=d4d8a5f03523dfb3dd9e97d228031781db0ba702;hpb=4b233612261e2d13ebbd1931f4d999c6da1451e9;p=ardour.git diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index d4d8a5f035..501c81ee6d 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,992 +15,356 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include "ardour_ui.h" - -#include -#include - -#include +#include "pbd/convert.h" +#include "pbd/error.h" +#include "pbd/file_utils.h" +#include "pbd/basename.h" -#include -#include -#include -#include +#include "ardour/filesystem_paths.h" +#include "ardour/revision.h" +#include "ardour_ui.h" +#include "public_editor.h" #include "keyboard.h" -#include "keyboard_target.h" -#include "ardour_dialog.h" -#include "gui_thread.h" - -#include "i18n.h" - -#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; - -uint32_t Keyboard::Control = GDK_CONTROL_MASK; -uint32_t Keyboard::Shift = GDK_SHIFT_MASK; -uint32_t Keyboard::Alt = GDK_MOD1_MASK; -uint32_t Keyboard::Meta = GDK_MOD2_MASK; - -Keyboard* Keyboard::_the_keyboard = 0; +#include "opts.h" +#include "ui_config.h" -/* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ +#include "pbd/i18n.h" -GdkModifierType Keyboard::RelevantModifierKeyMask = - GdkModifierType (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD3_MASK); +using namespace std; +using namespace Gtk; +using namespace PBD; +using namespace ARDOUR; +using Gtkmm2ext::Keyboard; +#ifdef __APPLE__ +guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier; +#else +guint ArdourKeyboard::constraint_mod = Keyboard::TertiaryModifier; +#endif -Keyboard::Keyboard () -{ - if (_the_keyboard == 0) { - _the_keyboard = this; - } - - target = 0; - default_target = 0; - _queue_events = false; - _flush_queue = false; - playback_ignore_count = 0; - focus_allowed = false; - collecting_prefix = false; - current_dialog = 0; +/* TrimDrag::start_grab() */ +guint ArdourKeyboard::trim_contents_mod = Keyboard::PrimaryModifier; - get_modifier_masks (); +/* TrimDrag::motion() */ +guint ArdourKeyboard::trim_overlap_mod = Keyboard::TertiaryModifier; - snooper_id = gtk_key_snooper_install (_snooper, (gpointer) this); +/* TrimDrag::start_grab() */ +guint ArdourKeyboard::trim_anchored_mod = Keyboard::PrimaryModifier|Keyboard::TertiaryModifier; - /* some global key actions */ +/* ControlPointDrag::motion() && LineDrag::motion()*/ +guint ArdourKeyboard::fine_adjust_mod = Keyboard::PrimaryModifier|Keyboard::SecondaryModifier; // XXX better just 2ndary - KeyboardTarget::add_action ("close-dialog", mem_fun(*this, &Keyboard::close_current_dialog)); +/* ControlPointDrag::start_grab() && MarkerDrag::motion() */ +guint ArdourKeyboard::push_points_mod = Keyboard::PrimaryModifier|Keyboard::Level4Modifier; - XMLNode* node = ARDOUR_UI::instance()->keyboard_settings(); - set_state (*node); -} +/* NoteResizeDrag::start_grab() */ +guint ArdourKeyboard::note_size_relative_mod = Keyboard::TertiaryModifier; // XXX better: 2ndary -Keyboard::~Keyboard () +ArdourKeyboard::ArdourKeyboard (ARDOUR_UI& ardour_ui) : ui (ardour_ui) { - gtk_key_snooper_remove (snooper_id); - delete [] modifier_masks; + Keyboard::RelevantModifierKeysChanged.connect (sigc::mem_fun (*this, &ArdourKeyboard::reset_relevant_modifier_key_mask)); } -XMLNode& -Keyboard::get_state (void) +void +ArdourKeyboard::find_bindings_files (map& files) { - 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); + vector found; + Searchpath spath = ardour_config_search_path(); - return *node; + 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); + } } -int -Keyboard::set_state (const XMLNode& node) +void +ArdourKeyboard::setup_keybindings () { - const XMLProperty* prop; - - if ((prop = node.property ("edit-button")) != 0) { - sscanf (prop->value().c_str(), "%d", &edit_but); - } + 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; - if ((prop = node.property ("edit-modifier")) != 0) { - sscanf (prop->value().c_str(), "%d", &edit_mod); - } + binding_files.clear (); - if ((prop = node.property ("delete-button")) != 0) { - sscanf (prop->value().c_str(), "%d", &delete_but); - } + find_bindings_files (binding_files); - if ((prop = node.property ("delete-modifier")) != 0) { - sscanf (prop->value().c_str(), "%d", &delete_mod); - } + /* set up the per-user bindings path */ - if ((prop = node.property ("snap-modifier")) != 0) { - sscanf (prop->value().c_str(), "%d", &snap_mod); - } + string lowercase_program_name = downcase (string(PROGRAM_NAME)); - return 0; -} + /* 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); + } -gint -Keyboard::_snooper (GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - return ((Keyboard *) data)->snooper (widget, event); -} + user_keybindings_path = Glib::build_filename (user_config_directory(), lowercase_program_name + binding_filename_suffix); -gint -Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) -{ - bool handled = false; - uint32_t keyval; - -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type - << " focus allowed? " << focus_allowed << " current dialog = " << current_dialog - << endl; + if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) { + std::pair newpair; + newpair.first = _("your own"); + newpair.second = user_keybindings_path; + binding_files.insert (newpair); } -#endif - /* Only allow key events to propagate to the - usual GTK model when specifically allowed. - Returning FALSE here does that. + /* check to see if they gave a style name ("ergonomic") or an actual filename (*.bindings) */ - if (focus_allowed) { - return FALSE; - } - - if (event->keyval == GDK_Shift_R) { - keyval = GDK_Shift_L; - - } else if (event->keyval == GDK_Control_R) { - keyval = GDK_Control_L; + if (!keybindings_path.empty() && keybindings_path.find (binding_filename_suffix) == string::npos) { - } else { - keyval = event->keyval; - } - - - if (event->type == GDK_KEY_PRESS) { - bool was_prefix = false; - - if (collecting_prefix) { - switch (keyval) { - case GDK_0: - current_prefix += '0'; - was_prefix = true; - break; - case GDK_1: - current_prefix += '1'; - was_prefix = true; - break; - case GDK_2: - current_prefix += '2'; - was_prefix = true; - break; - case GDK_3: - current_prefix += '3'; - was_prefix = true; - break; - case GDK_4: - current_prefix += '4'; - was_prefix = true; - break; - case GDK_5: - current_prefix += '5'; - was_prefix = true; - break; - case GDK_6: - current_prefix += '6'; - was_prefix = true; - break; - case GDK_7: - current_prefix += '7'; - was_prefix = true; - break; - case GDK_8: - current_prefix += '8'; - was_prefix = true; - break; - case GDK_9: - current_prefix += '9'; - was_prefix = true; - break; - case GDK_period: - current_prefix += '.'; - was_prefix = true; - break; - default: - was_prefix = false; - collecting_prefix = false; - break; - } - } + // just a style name - allow user to + // specify the layout type. - if (find (state.begin(), state.end(), keyval) == state.end()) { - state.push_back (keyval); - sort (state.begin(), state.end()); - } + char* layout; -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "STATE: "; - for (State::iterator i = state.begin(); i != state.end(); ++i) { - cerr << (*i) << ' '; - } - cerr << endl; - } -#endif + if ((layout = getenv ("ARDOUR_KEYBOARD_LAYOUT")) != 0 && layout[0] != '\0') { - if (!was_prefix) { + /* user-specified keyboard layout */ - bool old_collecting_prefix = collecting_prefix; + keybindings_path += '-'; + keybindings_path += layout; - if (target) { -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "PRESS: delivering to target " << target << endl; - } -#endif - target->key_press_event (event, state, handled); - } - - if (!handled && default_target) { -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "PRESS: not handled, delivering to default target " << default_target << endl; - } -#endif - default_target->key_press_event (event, state, handled); - } + } else { -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "PRESS: handled ? " << handled << endl; - } -#endif + /* default to US/ANSI - we have to pick something */ - if (handled) { - - /* don't reset collecting prefix is start_prefix() - was called by the handler. - */ - - if (collecting_prefix == old_collecting_prefix) { - collecting_prefix = false; - current_prefix = ""; - } - } + keybindings_path += "-us"; } - } else if (event->type == GDK_KEY_RELEASE) { - - State::iterator i; - - if ((i = find (state.begin(), state.end(), keyval)) != state.end()) { - state.erase (i); - sort (state.begin(), state.end()); - } - - if (target) { -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "RELEASE: delivering to target " << target << endl; - } -#endif - target->key_release_event (event, state); - } - - if (default_target) { -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "RELEASE: delivering to default target " << default_target << endl; - } -#endif - default_target->key_release_event (event, state); - } + keybindings_path += binding_filename_suffix; } - return TRUE; -} + if (keybindings_path.empty()) { -bool -Keyboard::key_is_down (uint32_t keyval) -{ - return find (state.begin(), state.end(), keyval) != state.end(); -} + /* no path or binding name given: check the user one first */ -void -Keyboard::set_target (KeyboardTarget *kt) -{ - /* XXX possible thread issues here */ - target = kt; -} + if (!Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) { -void -Keyboard::maybe_unset_target (KeyboardTarget* kt) -{ - if (target == kt) { - target = 0; - } -} + keybindings_path = ""; -void -Keyboard::set_default_target (KeyboardTarget *kt) -{ - /* XXX possible thread issues here */ + } else { - default_target = kt; -} + keybindings_path = user_keybindings_path; + } + } -void -Keyboard::allow_focus (bool yn) -{ - focus_allowed = yn; -} + /* if we still don't have a path at this point, use the default */ -Keyboard::State -Keyboard::translate_key_name (const string& name) + if (keybindings_path.empty()) { + keybindings_path = default_bindings; + } -{ - string::size_type i; - string::size_type len; - bool at_end; - string::size_type hyphen; - string keyname; - string whatevers_left; - State result; - guint keycode; - - i = 0; - len = name.length(); - at_end = (len == 0); - - while (!at_end) { - - whatevers_left = name.substr (i); - - if ((hyphen = whatevers_left.find_first_of ('-')) == string::npos) { - - /* no hyphen, so use the whole thing */ - - keyname = whatevers_left; - at_end = true; + while (true) { - } else { + if (!Glib::path_is_absolute (keybindings_path)) { - /* There is a hyphen. */ - - if (hyphen == 0 && whatevers_left.length() == 1) { - /* its the first and only character */ - - keyname = "-"; - at_end = true; + /* not absolute - look in the usual places */ + std::string keybindings_file; - } else { + if (!find_file (ardour_config_search_path(), keybindings_path, keybindings_file)) { - /* use the text before the hypen */ - - keyname = whatevers_left.substr (0, hyphen); - - if (hyphen == len - 1) { - at_end = true; + if (keybindings_path == default_bindings) { + error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg; + return; } else { - i += hyphen + 1; - at_end = (i >= len); + warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), + keybindings_path) + << endmsg; + keybindings_path = default_bindings; } - } - } - - if (keyname.length() == 1 && isupper (keyname[0])) { - result.push_back (GDK_Shift_L); - } - - if ((keycode = gdk_keyval_from_name(get_real_keyname (keyname).c_str())) == GDK_VoidSymbol) { - error << compose(_("KeyboardTarget: keyname \"%1\" is unknown."), keyname) << endmsg; - result.clear(); - return result; - } - - result.push_back (keycode); - } - sort (result.begin(), result.end()); + } else { - return result; -} + /* use it */ -string -Keyboard::get_real_keyname (const string& name) -{ - - if (name == "Control" || name == "Ctrl") { - return "Control_L"; - } - if (name == "Meta" || name == "MetaL") { - return "Meta_L"; - } - if (name == "MetaR") { - return "Meta_R"; - } - if (name == "Alt" || name == "AltL") { - return "Alt_L"; - } - if (name == "AltR") { - return "Alt_R"; - } - if (name == "Shift") { - return "Shift_L"; - } - if (name == "Shift_R") { - return "Shift_L"; - } - if (name == " ") { - return "space"; - } - if (name == "!") { - return "exclam"; - } - if (name == "\"") { - return "quotedbl"; - } - if (name == "#") { - return "numbersign"; - } - if (name == "$") { - return "dollar"; - } - if (name == "%") { - return "percent"; - } - if (name == "&") { - return "ampersand"; - } - if (name == "'") { - return "apostrophe"; - } - if (name == "'") { - return "quoteright"; - } - if (name == "(") { - return "parenleft"; - } - if (name == ")") { - return "parenright"; - } - if (name == "*") { - return "asterisk"; - } - if (name == "+") { - return "plus"; - } - if (name == ",") { - return "comma"; - } - if (name == "-") { - return "minus"; - } - if (name == ".") { - return "period"; - } - if (name == "/") { - return "slash"; - } - if (name == ":") { - return "colon"; - } - if (name == ";") { - return "semicolon"; - } - if (name == "<") { - return "less"; - } - if (name == "=") { - return "equal"; - } - if (name == ">") { - return "greater"; - } - if (name == "?") { - return "question"; - } - if (name == "@") { - return "at"; - } - if (name == "[") { - return "bracketleft"; - } - if (name == "\\") { - return "backslash"; - } - if (name == "]") { - return "bracketright"; - } - if (name == "^") { - return "asciicircum"; - } - if (name == "_") { - return "underscore"; - } - if (name == "`") { - return "grave"; - } - if (name == "`") { - return "quoteleft"; - } - if (name == "{") { - return "braceleft"; - } - if (name == "|") { - return "bar"; - } - if (name == "}") { - return "braceright"; - } - if (name == "~") { - return "asciitilde"; - } + keybindings_path = keybindings_file; + break; - return name; -} + } -int -Keyboard::get_prefix (float& val, bool& was_floating) -{ - if (current_prefix.length()) { - if (current_prefix.find ('.') != string::npos) { - was_floating = true; } else { - was_floating = false; - } - if (sscanf (current_prefix.c_str(), "%f", &val) == 1) { - return 0; - } - current_prefix = ""; - } - return -1; -} -void -Keyboard::start_prefix () -{ - collecting_prefix = true; - current_prefix = ""; -} - -void -Keyboard::clear_modifier_state () -{ - modifier_mask = 0; -} - -void -Keyboard::check_modifier_state () -{ - char keys[32]; - int i, j; - - clear_modifier_state (); - XQueryKeymap (GDK_DISPLAY(), keys); - - for (i = 0; i < 32; ++i) { - for (j = 0; j < 8; ++j) { + /* path is absolute already */ - if (keys[i] & (1<modifiermap; - - for (i = 0; i < modifiers->max_keypermod; ++i) { /* shift */ - if (*keycode) { - modifier_masks[*keycode] = GDK_SHIFT_MASK; - // cerr << "Shift = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - } - keycode++; - } - - for (i = 0; i < modifiers->max_keypermod; ++i) keycode++; /* skip lock */ - - for (i = 0; i < modifiers->max_keypermod; ++i) { /* control */ - if (*keycode) { - modifier_masks[*keycode] = GDK_CONTROL_MASK; - // cerr << "Control = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - } - keycode++; - } - - bound = 0; - for (i = 0; i < modifiers->max_keypermod; ++i) { /* mod 1 */ - if (*keycode) { - modifier_masks[*keycode] = GDK_MOD1_MASK; - // cerr << "Mod1 = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - bound++; - } - keycode++; - } -#ifdef WARN_ABOUT_DUPLICATE_MODIFIERS - if (bound > 1) { - warning << compose (_("You have %1 keys bound to \"mod1\""), bound) << endmsg; - } -#endif - bound = 0; - for (i = 0; i < modifiers->max_keypermod; ++i) { /* mod2 */ - if (*keycode) { - modifier_masks[*keycode] = GDK_MOD2_MASK; - check_meta_numlock (*keycode, GDK_MOD2_MASK, "Mod2"); - //cerr << "Mod2 = " << std::hex << (int) *keycode << std::dec << " = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - bound++; - } - keycode++; - } -#ifdef WARN_ABOUT_DUPLICATE_MODIFIERS - if (bound > 1) { - warning << compose (_("You have %1 keys bound to \"mod2\""), bound) << endmsg; - } -#endif - bound = 0; - for (i = 0; i < modifiers->max_keypermod; ++i) { /* mod3 */ - if (*keycode) { - modifier_masks[*keycode] = GDK_MOD3_MASK; - check_meta_numlock (*keycode, GDK_MOD3_MASK, "Mod3"); - // cerr << "Mod3 = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - bound++; - } - keycode++; - } -#ifdef WARN_ABOUT_DUPLICATE_MODIFIERS - if (bound > 1) { - warning << compose (_("You have %1 keys bound to \"mod3\""), bound) << endmsg; - } -#endif - bound = 0; - for (i = 0; i < modifiers->max_keypermod; ++i) { /* mod 4 */ - if (*keycode) { - modifier_masks[*keycode] = GDK_MOD4_MASK; - check_meta_numlock (*keycode, GDK_MOD4_MASK, "Mod4"); - // cerr << "Mod4 = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - bound++; - } - keycode++; - } -#ifdef WARN_ABOUT_DUPLICATE_MODIFIERS - if (bound > 1) { - warning << compose (_("You have %1 keys bound to \"mod4\""), bound) << endmsg; - } -#endif - bound = 0; - for (i = 0; i < modifiers->max_keypermod; ++i) { /* mod 5 */ - if (*keycode) { - modifier_masks[*keycode] = GDK_MOD5_MASK; - check_meta_numlock (*keycode, GDK_MOD5_MASK, "Mod5"); - // cerr << "Mod5 = " << XKeysymToString (XKeycodeToKeysym (GDK_DISPLAY(), *keycode, 0)) << endl; - bound++; - } - keycode++; - } -#ifdef WARN_ABOUT_DUPLICATE_MODIFIERS - if (bound > 1) { - warning << compose (_("You have %1 keys bound to \"mod5\""), bound) << endmsg; - } -#endif - - XFreeModifiermap (modifiers); + // GtkAccelMap* accelmap = gtk_accel_map_get(); + // g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this); } -gint -Keyboard::enter_window (GdkEventCrossing *ev, KeyboardTarget *kt) +XMLNode& +ArdourKeyboard::get_state (void) { - switch (ev->detail) { - case GDK_NOTIFY_INFERIOR: - if (debug_keyboard) { - cerr << "INFERIOR crossing to " << kt->name() << endl; - } - break; + XMLNode* node = &Keyboard::get_state (); - case GDK_NOTIFY_VIRTUAL: - if (debug_keyboard) { - cerr << "VIRTUAL crossing to " << kt->name() << endl; - } - /* fallthru */ + 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); - default: - if (debug_keyboard) { - cerr << "REAL crossing to " << kt->name() << endl; - cerr << "set current target to " << kt->name() << endl; - } - - set_target (kt); - check_modifier_state (); - } - - return FALSE; + return *node; } -gint -Keyboard::leave_window (GdkEventCrossing *ev) +int +ArdourKeyboard::set_state (const XMLNode& node, int version) { - 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"; - } - - set_target (0); - state.clear (); - clear_modifier_state (); - } - return FALSE; + 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 -Keyboard::register_target (KeyboardTarget *kt) +ArdourKeyboard::reset_relevant_modifier_key_mask () { - /* do not register the default - its not meant to be - an actual window, just a fallback if the current - target for keyboard events doesn't handle an event. - */ - - if (kt->name() == X_("default")) { - return; - } - - kt->window().signal_enter_notify_event().connect (bind (mem_fun(*this, &Keyboard::enter_window), kt)); - kt->window().signal_leave_notify_event().connect (mem_fun(*this, &Keyboard::leave_window)); - - kt->GoingAway.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt)); - kt->Hiding.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt)); + 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); } -void -Keyboard::set_current_dialog (ArdourDialog* dialog) +/* 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) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Keyboard::set_current_dialog), dialog)); - - current_dialog = dialog; - - if (current_dialog) { - - if (find (known_dialogs.begin(), known_dialogs.end(), dialog) == known_dialogs.end()) { - - current_dialog->GoingAway.connect - (bind (mem_fun(*this, &Keyboard::set_current_dialog), - reinterpret_cast(0))); - current_dialog->Hiding.connect - (bind (mem_fun(*this, &Keyboard::set_current_dialog), - reinterpret_cast(0))); - - current_dialog->signal_unmap_event().connect (mem_fun(*this, &Keyboard::current_dialog_vanished)); - - known_dialogs.push_back (dialog); - } - } + 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)); } -gint -Keyboard::current_dialog_vanished (GdkEventAny *ev) +bool +ArdourKeyboard::indicates_snap_delta (guint state) { - current_dialog = 0; - state.clear (); - focus_allowed = false; - clear_modifier_state (); - current_prefix = ""; + 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 FALSE; + return (contains_d && ((contains_s && d_contains_s) || !contains_s)); } -void -Keyboard::close_current_dialog () +/* 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) { - if (current_dialog) { - current_dialog->hide (); - } -} + const bool contains_c = Keyboard::modifier_state_contains (state, Keyboard::CopyModifier); + const bool equals_cs = Keyboard::modifier_state_equals (state, constraint_modifier ()); -void -Keyboard::set_edit_button (guint but) -{ - edit_but = but; + return contains_c && !equals_cs; } -void -Keyboard::set_edit_modifier (guint mod) +bool +ArdourKeyboard::indicates_constraint (guint state) { - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~edit_mod); - edit_mod = mod; - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | edit_mod); -} + const bool contains_cs = Keyboard::modifier_state_contains (state, constraint_modifier ()); + const bool equals_c = Keyboard::modifier_state_equals (state, Keyboard::CopyModifier); -void -Keyboard::set_delete_button (guint but) -{ - delete_but = but; + return contains_cs && !equals_c; } void -Keyboard::set_delete_modifier (guint mod) +ArdourKeyboard::set_constraint_modifier (guint mod) { - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~delete_mod); - delete_mod = mod; - RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | delete_mod); + constraint_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } void -Keyboard::set_meta_modifier (guint mod) +ArdourKeyboard::set_trim_contents_modifier (guint mod) { - /* we don't include Meta in the RelevantModifierKeyMask because its not used - in the same way as snap_mod, delete_mod etc. the only reason we allow it to be - set at all is that X Window has no convention for the keyboard modifier - that Meta should use. Some Linux distributions bind NumLock to Mod2, which - is our default Meta modifier, and this causes severe problems. - */ - Meta = mod; + trim_contents_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } 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_delete_event (GdkEventButton *ev) +ArdourKeyboard::set_trim_overlap_modifier (guint mod) { - return (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_BUTTON_RELEASE) && - (ev->button == Keyboard::delete_button()) && - ((ev->state & RelevantModifierKeyMask) == Keyboard::delete_modifier()); + trim_overlap_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } -bool -Keyboard::is_context_menu_event (GdkEventButton *ev) +void +ArdourKeyboard::set_trim_anchored_modifier (guint mod) { - return (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_BUTTON_RELEASE) && - (ev->button == 3) && - ((ev->state & RelevantModifierKeyMask) == 0); + trim_anchored_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } -bool -Keyboard::no_modifiers_active (guint state) +void +ArdourKeyboard::set_fine_adjust_modifier (guint mod) { - return (state & RelevantModifierKeyMask) == 0; + fine_adjust_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } -bool -Keyboard::modifier_state_contains (guint state, ModifierMask mask) +void +ArdourKeyboard::set_push_points_modifier (guint mod) { - return (state & mask) == (guint) mask; + push_points_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } -bool -Keyboard::modifier_state_equals (guint state, ModifierMask mask) +void +ArdourKeyboard::set_note_size_relative_modifier (guint mod) { - return (state & RelevantModifierKeyMask) == (guint) mask; + note_size_relative_mod = mod; + the_keyboard().reset_relevant_modifier_key_mask(); } -gint -Keyboard::focus_in_handler (GdkEventFocus* ev) +Selection::Operation +ArdourKeyboard::selection_type (guint state) { - allow_focus (true); - return FALSE; -} + /* note that there is no modifier for "Add" */ -gint -Keyboard::focus_out_handler (GdkEventFocus* ev) -{ - allow_focus (false); - return FALSE; + if (modifier_state_equals (state, RangeSelectModifier)) { + return Selection::Extend; + } else if (modifier_state_equals (state, PrimaryModifier)) { + return Selection::Toggle; + } else { + return Selection::Set; + } }