X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.cc;h=f3542054aafad01d36673719dc2a8439e1259988;hb=3162ffb4f418d85088d53d5e0a4a5d6ce7235e04;hp=17390b8b4db79020fb24d82c5e855a55eaa95d4d;hpb=912da52a539981193941d8739fa6f103b5e406db;p=ardour.git

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 17390b8b4d..f3542054aa 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -15,27 +15,38 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
+#include <vector>
+#include "ardour/ardour.h"
+
 #include "ardour_ui.h"
 
 #include <algorithm>
 #include <fstream>
+#include <iostream>
 
 #include <ctype.h>
 
-#include <X11/keysymdef.h>
-#include <gdk/gdkx.h>
+#include <gtkmm/accelmap.h>
+
 #include <gdk/gdkkeysyms.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
+
+#include "ardour/filesystem_paths.h"
 
 #include "keyboard.h"
 #include "gui_thread.h"
+#include "opts.h"
+#include "actions.h"
 
 #include "i18n.h"
 
 using namespace PBD;
+using namespace ARDOUR;
+using namespace Gtk;
+using namespace std;
 
 #define KBD_DEBUG 1
 bool debug_keyboard = false;
@@ -46,18 +57,57 @@ 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;
+#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;
+#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;
 
-Keyboard* Keyboard::_the_keyboard = 0;
+std::string Keyboard::user_keybindings_path;
+bool Keyboard::can_save_keybindings = false;
+bool Keyboard::bindings_changed_after_save_became_legal = false;
+map<string,string> Keyboard::binding_files;
+string Keyboard::_current_binding_name = _("Unknown");
+map<AccelKey,pair<string,string>,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 = 
-                               GdkModifierType (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD3_MASK);
+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 ()
 {
@@ -65,9 +115,16 @@ Keyboard::Keyboard ()
 		_the_keyboard = this;
 	}
 
-	collecting_prefix = false;
+	RelevantModifierKeyMask = (GdkModifierType) gtk_accelerator_get_default_mod_mask ();
 
-	get_modifier_masks ();
+	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);
 
@@ -78,7 +135,6 @@ Keyboard::Keyboard ()
 Keyboard::~Keyboard ()
 {
 	gtk_key_snooper_remove (snooper_id);
-	delete [] modifier_masks;
 }
 
 XMLNode& 
@@ -139,6 +195,13 @@ gint
 Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 {
 	uint32_t keyval;
+	bool ret = false;
+
+#if 0
+	cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type 
+	     << " state " << std::hex << event->state << std::dec
+	     << endl;
+#endif
 
 #if KBD_DEBUG
 	if (debug_keyboard) {
@@ -158,64 +221,26 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 	}
 		
 	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;
-			}
-		}
 
 		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<AccelKey,two_strings,AccelKeyLess>::iterator k = release_keys.begin(); k != release_keys.end(); ++k) {
+
+				const AccelKey& ak (k->first);
+				
+				if (keyval == ak.get_key() && (Gdk::ModifierType)(event->state | Gdk::RELEASE_MASK) == ak.get_mod()) {
+					ret = true;
+					break;
+				}
+			}
 		}
 
 	} else if (event->type == GDK_KEY_RELEASE) {
@@ -227,480 +252,85 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 			sort (state.begin(), state.end());
 		} 
 
-	}
-
-	return false;
-}
-
-bool
-Keyboard::key_is_down (uint32_t keyval)
-{
-	return find (state.begin(), state.end(), keyval) != state.end();
-}
-
-Keyboard::State
-Keyboard::translate_key_name (const string& name)
+		for (map<AccelKey,two_strings,AccelKeyLess>::iterator k = release_keys.begin(); k != release_keys.end(); ++k) {
 
-{
-	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) {
+			const AccelKey& ak (k->first);
+			two_strings ts (k->second);
 
-		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;
-
-		} else {
-
-			/* There is a hyphen. */
-			
-			if (hyphen == 0 && whatevers_left.length() == 1) {
-				/* its the first and only character */
-			
-				keyname = "-";
-				at_end = true;
-
-			} else {
-
-				/* use the text before the hypen */
-				
-				keyname = whatevers_left.substr (0, hyphen);
-				
-				if (hyphen == len - 1) {
-					at_end = true;
-				} else {
-					i += hyphen + 1;
-					at_end = (i >= len);
+			if (keyval == ak.get_key() && (Gdk::ModifierType)(event->state | Gdk::RELEASE_MASK) == ak.get_mod()) {
+				Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (ts.first.c_str(), ts.second.c_str());
+				if (act) {
+					act->activate();
+					ret = true;
 				}
+				break;
 			}
 		}
-		
-		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 << string_compose(_("KeyboardTarget: keyname \"%1\" is unknown."), keyname) << endmsg;
-			result.clear();
-			return result;
-		}
-		
-		result.push_back (keycode);
-	}
-
-	sort (result.begin(), result.end());
-
-	return result;
-}
-
-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";
-	}
-
-	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) {
+	/* Special keys that we want to handle in
+	   any dialog, no matter whether it uses
+	   the regular set of accelerators or not
+	*/
 
-			if (keys[i] & (1<<j)) {
-				modifier_mask |= modifier_masks[(i*8)+j];
+	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;
 		}
 	}
-}
-
-void
-Keyboard::check_meta_numlock (char keycode, guint mod, string modname)
-{
-	guint alternate_meta_mod;
-	string alternate_meta_modname;
 
-	if (mod == Meta) {
-		
-		guint keysym = XKeycodeToKeysym  (GDK_DISPLAY(), keycode, 0);
-		
-		if (keysym == GDK_Num_Lock) {
-
-			switch (mod) {
-			case GDK_MOD2_MASK:
-				alternate_meta_mod = GDK_MOD3_MASK;
-				alternate_meta_modname = "Mod3";
-				break;
-			case GDK_MOD3_MASK:
-				alternate_meta_mod = GDK_MOD2_MASK;
-				alternate_meta_modname = "Mod2";
-				break;
-			case GDK_MOD4_MASK:
-				alternate_meta_mod = GDK_MOD2_MASK;
-				alternate_meta_modname = "Mod2";
-				break;
-			case GDK_MOD5_MASK:
-				alternate_meta_mod = GDK_MOD2_MASK;
-				alternate_meta_modname = "Mod2";
-				break;
-			default:
-				error << string_compose (_("Your system is completely broken - NumLock uses \"%1\""
-						    "as its modifier. This is madness - see the man page "
-						    "for xmodmap to find out how to fix this."),
-						  modname)
-				      << endmsg;
-				return;
-			}
-
-			warning << string_compose (_("Your system generates \"%1\" when the NumLock key "
-					      "is pressed. This can cause problems when editing "
-					      "so Ardour will use %2 to mean Meta rather than %1"),
-					    modname, alternate_meta_modname)
-				<< endmsg;
-
-			set_meta_modifier (alternate_meta_mod);
-		}
-	}
+	return ret;
 }
 
-void
-Keyboard::get_modifier_masks ()
+bool
+Keyboard::key_is_down (uint32_t keyval)
 {
-	XModifierKeymap *modifiers;
-	KeyCode *keycode;
-	int i;
-	int bound;
-
-	XDisplayKeycodes (GDK_DISPLAY(), &min_keycode, &max_keycode);
-
-	/* This function builds a lookup table to provide rapid answers to
-	   the question: what, if any, modmask, is associated with a given
-	   keycode ?
-	*/
-	
-	modifiers = XGetModifierMapping (GDK_DISPLAY());
-	
-	modifier_masks = new int32_t [max_keycode+1];
-	
-	keycode = modifiers->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 << string_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 << string_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 << string_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 << string_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 << string_compose (_("You have %1 keys bound to \"mod5\""), bound) << endmsg;
-	}
-#endif
-
-	XFreeModifiermap (modifiers);
+	return find (state.begin(), state.end(), keyval) != state.end();
 }
 
 bool
-Keyboard::enter_window (GdkEventCrossing *ev, Gtk::Window* win)
+Keyboard::enter_window (GdkEventCrossing *, Gtk::Window* win)
 {
-	switch (ev->detail) {
-	case GDK_NOTIFY_INFERIOR:
-		break;
-
-	case GDK_NOTIFY_VIRTUAL:
-		/* fallthru */
-
-	default:
-		check_modifier_state ();
-	}
-
-	return FALSE;
+	current_window = win;
+	return false;
 }
 
 bool
-Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* win)
+Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/)
 {
-	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";
+	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;
 		}
-		state.clear ();
-		clear_modifier_state ();
+	} else {
+		current_window = 0;
 	}
-	return FALSE;
 
+	return false;
 }
 
 void
@@ -732,15 +362,11 @@ Keyboard::set_delete_modifier (guint mod)
 }
 
 void
-Keyboard::set_meta_modifier (guint mod)
+Keyboard::set_modifier (uint32_t newval, uint32_t& var)
 {
-	/* 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;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~var);
+	var = newval;
+	RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | var);
 }
 
 void
@@ -759,6 +385,18 @@ Keyboard::is_edit_event (GdkEventButton *ev)
 		((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)
 {
@@ -796,11 +434,248 @@ Keyboard::modifier_state_equals (guint state, ModifierMask mask)
 Selection::Operation
 Keyboard::selection_type (guint state)
 {
-	if (modifier_state_equals (state, Shift)) {
+	/* note that there is no modifier for "Add" */
+
+	if (modifier_state_equals (state, RangeSelectModifier)) {
 		return Selection::Extend;
-	} else if (modifier_state_equals (state, Control)) {
+	} else if (modifier_state_equals (state, PrimaryModifier)) {
 		return Selection::Toggle;
 	} else {
 		return Selection::Set;
 	}
 }
+
+
+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);
+	} 
+}
+
+void
+Keyboard::setup_keybindings ()
+{
+	using namespace ARDOUR_COMMAND_LINE;
+	std::string default_bindings = "mnemonic-us.bindings";
+	vector<string> strs;
+
+	binding_files.clear ();
+
+	ARDOUR::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");
+
+	user_keybindings_path = Glib::build_filename (strs);
+
+	if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) {
+		std::pair<string,string> newpair;
+		newpair.first = _("your own");
+		newpair.second = user_keybindings_path;
+		binding_files.insert (newpair);
+	}
+
+	/* check to see if they gave a style name ("SAE", "ergonomic") or
+	   an actual filename (*.bindings)
+	*/
+
+	if (!keybindings_path.empty() && keybindings_path.find (".bindings") == string::npos) {
+		
+		// just a style name - allow user to
+		// specify the layout type. 
+		
+		char* layout;
+		
+		if ((layout = getenv ("ARDOUR_KEYBOARD_LAYOUT")) != 0 && layout[0] != '\0') {
+			
+			/* user-specified keyboard layout */
+			
+			keybindings_path += '-';
+			keybindings_path += layout;
+
+		} else {
+
+			/* default to US/ANSI - we have to pick something */
+
+			keybindings_path += "-us";
+		}
+		
+		keybindings_path += ".bindings";
+	} 
+
+	if (keybindings_path.empty()) {
+
+		/* no path or binding name given: check the user one first */
+
+		if (!Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) {
+			
+			keybindings_path = "";
+
+		} else {
+			
+			keybindings_path = user_keybindings_path;
+		}
+	} 
+
+	/* if we still don't have a path at this point, use the default */
+
+	if (keybindings_path.empty()) {
+		keybindings_path = default_bindings;
+	}
+
+	while (true) {
+
+		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();
+
+			if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
+				
+				if (keybindings_path == default_bindings) {
+					error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+					return;
+				} else {
+					warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), 
+								   keybindings_path)
+						<< endmsg;
+					keybindings_path = default_bindings;
+				}
+
+			} else {
+
+				/* use it */
+
+				keybindings_path = keybindings_file.to_string();
+				break;
+				
+			}
+
+		} else {
+			
+			/* path is absolute already */
+
+			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;
+					return;
+				} else {
+					warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"), 
+								   keybindings_path)
+						<< endmsg;
+					keybindings_path = default_bindings;
+				}
+
+			} else {
+				break;
+			}
+		}
+	}
+
+	load_keybindings (keybindings_path);
+
+	/* catch changes */
+
+	GtkAccelMap* accelmap = gtk_accel_map_get();
+	g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, 0);
+}
+
+bool
+Keyboard::load_keybindings (string path)
+{
+	try {
+		cerr << "Loading bindings from " << path << endl;
+
+		Gtk::AccelMap::load (path);
+
+		_current_binding_name = _("Unknown");
+
+		for (map<string,string>::iterator x = binding_files.begin(); x != binding_files.end(); ++x) {
+			if (path == x->second) {
+				_current_binding_name = x->first;
+				break;
+			}
+		}
+
+
+	} catch (...) {
+		error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), path)
+		      << endmsg;
+		return false;
+	}
+
+	/* now find all release-driven bindings */
+
+	vector<string> groups;
+	vector<string> names;
+	vector<AccelKey> bindings;
+	
+	ActionManager::get_all_actions (groups, names, bindings);
+	
+	vector<string>::iterator g;
+	vector<AccelKey>::iterator b;
+	vector<string>::iterator n;
+
+	release_keys.clear ();
+
+	bool show_bindings = (getenv ("ARDOUR_SHOW_BINDINGS") != 0);
+	
+	for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) {
+		
+		if (show_bindings) {
+			
+			cerr << "Action: " << (*n) << " Group: " << (*g) << " binding = ";
+			
+			if ((*b).get_key() != GDK_VoidSymbol) {
+				cerr << (*b).get_key() << " w/mod = " << hex << (*b).get_mod() << dec << " = " << (*b).get_abbrev();
+			} else {
+				cerr << "unbound";
+			}
+			
+			cerr << endl;
+		}
+	}
+
+	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<AccelKey,two_strings> (*b, two_strings (*g, *n)));
+		}
+	}
+
+	return true;
+}
+
+