X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.cc;h=2a72adb5dd2b35119e795640a45a2f0cbb0799bd;hb=d8e93be2ee68fc6a18a7ca17d36ffc67c94207b3;hp=cdac398a30db958bcadf5d58e8fd111064152662;hpb=8aa9508c82f32efcf9c7c00e2c9e76268d4dddce;p=ardour.git

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index cdac398a30..2a72adb5dd 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -1,6 +1,6 @@
 #include <map>
 
-#include <ardour/profile.h>
+#include "ardour/profile.h"
 
 #include <gtkmm/stock.h>
 #include <gtkmm/label.h>
@@ -8,14 +8,17 @@
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
-#include <pbd/strsplit.h>
-#include <pbd/replace_all.h>
+#include "gtkmm2ext/utils.h"
 
-#include <ardour/profile.h>
+#include "pbd/strsplit.h"
+#include "pbd/replace_all.h"
+
+#include "ardour/profile.h"
 
 #include "actions.h"
 #include "keyboard.h"
 #include "keyeditor.h"
+#include "utils.h"
 
 #include "i18n.h"
 
@@ -24,11 +27,13 @@ using namespace Gtk;
 using namespace Gdk;
 using namespace PBD;
 
+using Gtkmm2ext::Keyboard;
+
 KeyEditor::KeyEditor ()
-	: ArdourDialog (_("Shortcut Editor"), false)
+	: ArdourDialog (_("Key Bindings"), false)
 	, unbind_button (_("Remove shortcut"))
 	, unbind_box (BUTTONBOX_END)
-	
+
 {
 	can_bind = false;
 	last_state = 0;
@@ -45,9 +50,9 @@ KeyEditor::KeyEditor ()
 	view.set_enable_search (false);
 	view.set_rules_hint (true);
 	view.set_name (X_("KeyEditorTree"));
-	
-	view.get_selection()->signal_changed().connect (mem_fun (*this, &KeyEditor::action_selected));
-	
+
+	view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &KeyEditor::action_selected));
+
 	scroller.add (view);
 	scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
@@ -62,12 +67,12 @@ KeyEditor::KeyEditor ()
 		unbind_box.set_spacing (6);
 		unbind_box.pack_start (*hint, false, true);
 		unbind_box.pack_start (unbind_button, false, false);
-		unbind_button.signal_clicked().connect (mem_fun (*this, &KeyEditor::unbind));
+		unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
 
 		get_vbox()->pack_start (unbind_box, false, false);
 		unbind_box.show ();
 		unbind_button.show ();
-		
+
 	}
 
 	get_vbox()->set_border_width (12);
@@ -82,15 +87,17 @@ void
 KeyEditor::unbind ()
 {
 	TreeModel::iterator i = view.get_selection()->get_selected();
-	
+
 	unbind_button.set_sensitive (false);
 
+	cerr << "trying to unbind\n";
+
 	if (i != model->children().end()) {
 		string path = (*i)[columns.path];
-		
+
 		if (!(*i)[columns.bindable]) {
 			return;
-		} 
+		}
 
 		bool result = AccelMap::change_entry (path,
 						      0,
@@ -124,16 +131,16 @@ KeyEditor::action_selected ()
 	}
 
 	TreeModel::iterator i = view.get_selection()->get_selected();
-	
+
 	unbind_button.set_sensitive (false);
 
 	if (i != model->children().end()) {
 
 		string path = (*i)[columns.path];
-		
+
 		if (!(*i)[columns.bindable]) {
 			return;
-		} 
+		}
 
 		string binding = (*i)[columns.binding];
 
@@ -162,27 +169,26 @@ KeyEditor::on_key_release_event (GdkEventKey* ev)
 
 	if (i != model->children().end()) {
 		string path = (*i)[columns.path];
-		
+
 		if (!(*i)[columns.bindable]) {
 			goto out;
-		} 
+		}
+
+		cerr << "real lkeyval: " << ev->keyval << endl;
+                Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
+		cerr << "using keyval = " << ev->keyval << endl;
+
 
 		bool result = AccelMap::change_entry (path,
 						      ev->keyval,
-						      (ModifierType) ev->state,
+						      ModifierType (Keyboard::RelevantModifierKeyMask & ev->state),
 						      true);
 
+		cerr << "New binding to " << ev->keyval << " worked: " << result << endl;
+
 		if (result) {
-			bool known;
 			AccelKey key;
-
-			known = ActionManager::lookup_entry (path, key);
-			
-			if (known) {
-				(*i)[columns.binding] = ActionManager::ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod()));
-			} else {
-				(*i)[columns.binding] = string();
-			}
+			(*i)[columns.binding] = ActionManager::get_key_representation (path, key);
 		}
 	}
 
@@ -201,9 +207,9 @@ KeyEditor::populate ()
 	typedef std::map<string,TreeIter> NodeMap;
 	NodeMap nodes;
 	NodeMap::iterator r;
-	
+
 	ActionManager::get_all_actions (labels, paths, keys, bindings);
-	
+
 	vector<string>::iterator k;
 	vector<string>::iterator p;
 	vector<string>::iterator l;
@@ -214,11 +220,11 @@ KeyEditor::populate ()
 
 		TreeModel::Row row;
 		vector<string> parts;
-		
+
 		parts.clear ();
 
 		split (*p, parts, '/');
-		
+
 		if (parts.empty()) {
 			continue;
 		}
@@ -238,17 +244,17 @@ KeyEditor::populate ()
 			row = *(model->append (parent.children()));
 
 		} else {
-			
+
 			row = *(model->append ((*r->second)->children()));
 
 		}
-		
+
 		/* add this action */
 
 		row[columns.action] = (*l);
 		row[columns.path] = (*p);
 		row[columns.bindable] = true;
-		
+
 		if (*k == ActionManager::unbound_string) {
 			row[columns.binding] = string();
 		} else {
@@ -258,7 +264,7 @@ KeyEditor::populate ()
 
 			/* Gtk/Quartz maps:
 			   NSAlternate/NSOption key to Mod1
-			   NSCommand key to Meta 
+			   NSCommand key to Meta
 			*/
 
 			replace_all (label, "<Meta>", _("Command-"));
@@ -266,7 +272,7 @@ KeyEditor::populate ()
 			replace_all (label, "<Shift>", _("Shift-"));
 			replace_all (label, "<Control>", _("Control-"));
 			row[columns.binding] = label;
-#else		
+#else
 			row[columns.binding] = (*k);
 #endif
 		}