X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=af5f5b8223eaf1c685bb7654c6672b606a010123;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=67384b5adffb43dfa7eef489ad830929fd8852b8;hpb=b89cc942eb458284f40f4d4e7db58890c3288979;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 67384b5adf..af5f5b8223 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -3,10 +3,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,13 +15,19 @@
 
 #include "KeyMap.h"
 
-#include "support/debug.h"
 #include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/TempFile.h"
+
+#include "frontends/alert.h"
 
 #include <fstream>
 #include <sstream>
@@ -32,7 +38,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-
 string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 {
 	string buf;
@@ -41,8 +46,15 @@ string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 
 	if (mod & ControlModifier)
 		buf += "C-";
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+	if (mod & MetaModifier)
+		buf += "M-";
+	if (mod & AltModifier)
+		buf += "A-";
+#else
 	if (mod & AltModifier)
 		buf += "M-";
+#endif
 	if (mod & ShiftModifier)
 		buf += "S-";
 
@@ -54,7 +66,7 @@ string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 size_t KeyMap::bind(string const & seq, FuncRequest const & func)
 {
 	LYXERR(Debug::KBMAP, "BIND: Sequence `" << seq << "' Action `"
-	       << func.action << '\'');
+	       << func.action() << '\'');
 
 	KeySequence k(0, 0);
 
@@ -84,12 +96,101 @@ size_t KeyMap::unbind(string const & seq, FuncRequest const & func)
 }
 
 
-bool KeyMap::hasBinding(KeySequence const & seq, FuncRequest const & func,
-		unsigned int r)
+void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
+{
+	KeySymbol code = seq->sequence[r];
+	if (!code.isOK())
+		return;
+
+	KeyModifier const mod1 = seq->modifiers[r].first;
+	KeyModifier const mod2 = seq->modifiers[r].second;
+
+	// check if key is already there
+	// FIXME perf: Profiling shows that this is responsible of 99% of the
+	// cost of GuiPrefs::applyView()
+	Table::iterator end = table.end();
+	for (Table::iterator it = table.begin(); it != end; ++it) {
+		if (code == it->code
+		    && mod1 == it->mod.first
+		    && mod2 == it->mod.second) {
+			// overwrite binding
+			if (r + 1 == seq->length()) {
+				LYXERR(Debug::KBMAP, "Warning: New binding for '"
+					<< to_utf8(seq->print(KeySequence::Portable))
+					<< "' is overriding old binding...");
+				if (it->prefixes)
+					it->prefixes.reset();
+				it->func = func;
+				it->func.setOrigin(FuncRequest::KEYBOARD);
+				return;
+			} else if (!it->prefixes) {
+				lyxerr << "Error: New binding for '"
+				       << to_utf8(seq->print(KeySequence::Portable))
+				       << "' is overriding old binding..."
+				       << endl;
+				return;
+			} else {
+				it->prefixes->bind(seq, func, r + 1);
+				return;
+			}
+		}
+	}
+
+	Table::iterator newone = table.insert(table.end(), Key());
+	newone->code = code;
+	newone->mod = seq->modifiers[r];
+	if (r + 1 == seq->length()) {
+		newone->func = func;
+		newone->func.setOrigin(FuncRequest::KEYBOARD);
+		newone->prefixes.reset();
+	} else {
+		newone->prefixes.reset(new KeyMap);
+		newone->prefixes->bind(seq, func, r + 1);
+	}
+}
+
+
+void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
+{
+	KeySymbol code = seq->sequence[r];
+	if (!code.isOK())
+		return;
+
+	KeyModifier const mod1 = seq->modifiers[r].first;
+	KeyModifier const mod2 = seq->modifiers[r].second;
+
+	// check if key is already there
+	Table::iterator end = table.end();
+	Table::iterator remove = end;
+	for (Table::iterator it = table.begin(); it != end; ++it) {
+		if (code == it->code
+		    && mod1 == it->mod.first
+		    && mod2 == it->mod.second) {
+			// remove
+			if (r + 1 == seq->length()) {
+				if (it->func == func) {
+					remove = it;
+					if (it->prefixes)
+						it->prefixes.reset();
+				}
+			} else if (it->prefixes) {
+				it->prefixes->unbind(seq, func, r + 1);
+				if (it->prefixes->empty())
+					remove = it;
+				return;
+			}
+		}
+	}
+	if (remove != end)
+		table.erase(remove);
+}
+
+
+FuncRequest KeyMap::getBinding(KeySequence const & seq, unsigned int r)
 {
 	KeySymbol code = seq.sequence[r];
 	if (!code.isOK())
-		return false;
+		return FuncRequest::unknown;
 
 	KeyModifier const mod1 = seq.modifiers[r].first;
 	KeyModifier const mod2 = seq.modifiers[r].second;
@@ -101,12 +202,12 @@ bool KeyMap::hasBinding(KeySequence const & seq, FuncRequest const & func,
 		    && mod1 == it->mod.first
 		    && mod2 == it->mod.second) {
 			if (r + 1 == seq.length())
-				return it->func == func;
-			else if (it->table.get())
-				return it->table->hasBinding(seq, func, r + 1);
+				return it->func;
+			else if (it->prefixes)
+				return it->prefixes->getBinding(seq, r + 1);
 		}
 	}
-	return false;
+	return FuncRequest::unknown;
 }
 
 
@@ -116,74 +217,124 @@ void KeyMap::clear()
 }
 
 
-namespace {
-
-enum BindTags {
-	BN_BIND,
-	BN_BINDFILE,
-	BN_UNBIND,
-};
+bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt)
+{
+	FileName bf = i18nLibFileSearch("bind", bind_file, "bind");
+	if (bf.empty()) {
+		if (rt == MissingOK)
+			return true;
+
+		lyxerr << "Could not find bind file: " << bind_file;
+		if (rt == Default) {
+			frontend::Alert::warning(_("Could not find bind file"),
+				bformat(_("Unable to find the bind file\n%1$s.\n"
+						"Please check your installation."), from_utf8(bind_file)));
+			return false;
+		}
 
-keyword_item bindTags[] = {
-	{ "\\bind", BN_BIND },
-	{ "\\bind_file", BN_BINDFILE },
-	{ "\\unbind", BN_UNBIND },
-};
+		static string const defaultBindfile = "cua";
+		if (bind_file == defaultBindfile) {
+			frontend::Alert::warning(_("Could not find `cua.bind' file"),
+				_("Unable to find the default bind file `cua.bind'.\n"
+				   "Please check your installation."));
+			return false;
+		}
 
+		// Try it with the default file.
+		frontend::Alert::warning(_("Could not find bind file"),
+			bformat(_("Unable to find the bind file\n%1$s.\n"
+			          "Falling back to default."), from_utf8(bind_file)));
+		return read(defaultBindfile, unbind_map);
+	}
+	return read(bf, unbind_map);
 }
 
 
-bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
+bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 {
-	const int bindCount = sizeof(bindTags) / sizeof(keyword_item);
+	ReturnValues retval = readWithoutConv(bind_file, unbind_map);
+	if (retval != FormatMismatch)
+		return retval == ReadOK;
+
+	LYXERR(Debug::FILES, "Converting bind file to " << LFUN_FORMAT);
+	TempFile tmp("convert_bind");
+	FileName const tempfile = tmp.name();
+	bool const success = prefs2prefs(bind_file, tempfile, true);
+	if (!success) {
+		LYXERR0 ("Unable to convert " << bind_file <<
+			" to format " << LFUN_FORMAT);
+		return false;
+	}
+	retval = readWithoutConv(tempfile, unbind_map);
+	return retval == ReadOK;
+}
 
-	Lexer lexrc(bindTags, bindCount);
+
+KeyMap::ReturnValues KeyMap::readWithoutConv(FileName const & bind_file, KeyMap * unbind_map)
+{
+	enum {
+		BN_BIND,
+		BN_BINDFILE,
+		BN_FORMAT,
+		BN_UNBIND
+	};
+
+	LexerKeyword bindTags[] = {
+		{ "\\bind",      BN_BIND },
+		{ "\\bind_file", BN_BINDFILE },
+		{ "\\unbind",    BN_UNBIND },
+		{ "format",      BN_FORMAT }
+	};
+
+	Lexer lexrc(bindTags);
 	if (lyxerr.debugging(Debug::PARSER))
 		lexrc.printTable(lyxerr);
 
-	FileName const tmp(i18nLibFileSearch("bind", bind_file, "bind"));
-	lexrc.setFile(tmp);
+	lexrc.setFile(bind_file);
 	if (!lexrc.isOK()) {
-		lyxerr << "KeyMap::read: cannot open bind file:"
-		       << tmp << endl;
-		return false;
+		LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFileName());
+		return FileError;
 	}
 
-	LYXERR(Debug::KBMAP, "Reading bind file:" << tmp);
+	LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFileName());
 
+	// format of pre-2.0 bind files, before this tag was introduced.
+	unsigned int format = 0;
 	bool error = false;
 	while (lexrc.isOK()) {
 		switch (lexrc.lex()) {
+
 		case Lexer::LEX_UNDEF:
 			lexrc.printError("Unknown tag `$$Token'");
 			error = true;
 			continue;
+
 		case Lexer::LEX_FEOF:
 			continue;
-		case BN_BIND:
-		{
-			string seq, cmd;
 
-			if (lexrc.next()) {
-				seq = lexrc.getString();
-			} else {
+		case BN_FORMAT:
+			if (lexrc.next())
+				format = lexrc.getInteger();
+			break;
+
+		case BN_BIND: {
+			if (!lexrc.next()) {
 				lexrc.printError("BN_BIND: Missing key sequence");
 				error = true;
 				break;
 			}
+			string seq = lexrc.getString();
 
-			if (lexrc.next(true)) {
-				cmd = lexrc.getString();
-			} else {
+			if (!lexrc.next(true)) {
 				lexrc.printError("BN_BIND: missing command");
 				error = true;
 				break;
 			}
+			string cmd = lexrc.getString();
 
 			FuncRequest func = lyxaction.lookupFunc(cmd);
-			if (func. action == LFUN_UNKNOWN_ACTION) {
-				lexrc.printError("BN_BIND: Unknown LyX"
-						 " function `$$Token'");
+			if (func.action() == LFUN_UNKNOWN_ACTION) {
+				lexrc.printError("BN_BIND: Unknown LyX function `$$Token'");
 				error = true;
 				break;
 			}
@@ -191,84 +342,86 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 			bind(seq, func);
 			break;
 		}
-		case BN_UNBIND:
-		{
-			string seq, cmd;
 
-			if (lexrc.next()) {
-				seq = lexrc.getString();
-			} else {
+		case BN_UNBIND: {
+			if (!lexrc.next()) {
 				lexrc.printError("BN_UNBIND: Missing key sequence");
 				error = true;
 				break;
 			}
+			string seq = lexrc.getString();
 
-			if (lexrc.next(true)) {
-				cmd = lexrc.getString();
-			} else {
+			if (!lexrc.next(true)) {
 				lexrc.printError("BN_UNBIND: missing command");
 				error = true;
 				break;
 			}
+			string cmd = lexrc.getString();
 
 			FuncRequest func = lyxaction.lookupFunc(cmd);
-			if (func. action == LFUN_UNKNOWN_ACTION) {
+			if (func.action() == LFUN_UNKNOWN_ACTION) {
 				lexrc.printError("BN_UNBIND: Unknown LyX"
 						 " function `$$Token'");
 				error = true;
 				break;
 			}
-			
+
 			if (unbind_map)
 				unbind_map->bind(seq, func);
 			else
 				unbind(seq, func);
 			break;
 		}
+
 		case BN_BINDFILE:
-			if (lexrc.next()) {
-				string const tmp(lexrc.getString());
-				error |= !read(tmp, unbind_map);
-			} else {
+			if (!lexrc.next()) {
 				lexrc.printError("BN_BINDFILE: Missing file name");
 				error = true;
 				break;
-
 			}
+			string const tmp = lexrc.getString();
+			error |= !read(tmp, unbind_map);
 			break;
 		}
+
+		// This is triggered the first time through the loop unless
+		// we hit a format tag.
+		if (format != LFUN_FORMAT)
+			return FormatMismatch;
 	}
 
-	if (error)
-		lyxerr << "KeyMap::read: error while reading bind file:"
-		       << tmp << endl;
-	return !error;
+	if (error) {
+		LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFileName());
+		return ReadError;
+	}
+	return ReadOK;
 }
 
 
 void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 {
-	ofstream os(bind_file.c_str(), 
-		append ? (ios::app | ios:: out): ios::out);
+	ofstream os(bind_file.c_str(),
+		append ? (ios::app | ios::out) : ios::out);
 
 	if (!append)
 		os << "## This file is automatically generated by lyx\n"
-		   << "## All modifications will be lost\n\n";
-	
+		   << "## All modifications will be lost\n\n"
+		   << "Format " << LFUN_FORMAT << "\n\n";
+
 	string tag = unbind ? "\\unbind" : "\\bind";
 	BindingList const list = listBindings(false);
 	BindingList::const_iterator it = list.begin();
 	BindingList::const_iterator it_end = list.end();
 	for (; it != it_end; ++it) {
-		kb_action action = it->request.action;
+		FuncCode action = it->request.action();
 		string arg = to_utf8(it->request.argument());
 
+		string const cmd = lyxaction.getActionName(action)
+			+ (arg.empty() ? string() : " " + arg) ;
 		os << tag << " \""
-				<< to_utf8(it->sequence.print(KeySequence::BindFile))
-				<< "\" \""
-				<< lyxaction.getActionName(action)
-				<< (arg.empty() ? "" : " ") << arg
-				<< "\"\n";
+		   << to_utf8(it->sequence.print(KeySequence::BindFile))
+		   << "\" " << Lexer::quoteString(cmd)
+		   << "\n";
 	}
 	os << "\n";
 	os.close();
@@ -278,12 +431,9 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 FuncRequest const & KeyMap::lookup(KeySymbol const &key,
 		  KeyModifier mod, KeySequence * seq) const
 {
-	static FuncRequest const unknown(LFUN_UNKNOWN_ACTION);
-
 	if (table.empty()) {
-		seq->curmap = seq->stdmap;
-		seq->mark_deleted();
-		return unknown;
+		seq->reset();
+		return FuncRequest::unknown;
 	}
 
 	Table::const_iterator end = table.end();
@@ -293,25 +443,23 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key,
 
 		if (cit->code == key && cit->mod.first == check) {
 			// match found
-			if (cit->table.get()) {
+			if (cit->prefixes) {
 				// this is a prefix key - set new map
-				seq->curmap = cit->table.get();
-				static FuncRequest prefix(LFUN_COMMAND_PREFIX);
+				seq->curmap = cit->prefixes.get();
+				static const FuncRequest prefix(LFUN_COMMAND_PREFIX);
 				return prefix;
 			} else {
 				// final key - reset map
-				seq->curmap = seq->stdmap;
-				seq->mark_deleted();
+				seq->reset();
 				return cit->func;
 			}
 		}
 	}
 
 	// error - key not found:
-	seq->curmap = seq->stdmap;
-	seq->mark_deleted();
+	seq->reset();
 
-	return unknown;
+	return FuncRequest::unknown;
 }
 
 
@@ -327,111 +475,21 @@ docstring const KeyMap::print(bool forgui) const
 }
 
 
-void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r)
-{
-	KeySymbol code = seq->sequence[r];
-	if (!code.isOK())
-		return;
-
-	KeyModifier const mod1 = seq->modifiers[r].first;
-	KeyModifier const mod2 = seq->modifiers[r].second;
-
-	// check if key is already there
-	Table::iterator end = table.end();
-	for (Table::iterator it = table.begin(); it != end; ++it) {
-		if (code == it->code
-		    && mod1 == it->mod.first
-		    && mod2 == it->mod.second) {
-			// overwrite binding
-			if (r + 1 == seq->length()) {
-				LYXERR(Debug::KBMAP, "Warning: New binding for '"
-					<< to_utf8(seq->print(KeySequence::Portable))
-					<< "' is overriding old binding...");
-				if (it->table.get()) {
-					it->table.reset();
-				}
-				it->func = func;
-				it->func.origin = FuncRequest::KEYBOARD;
-				return;
-			} else if (!it->table.get()) {
-				lyxerr << "Error: New binding for '"
-				       << to_utf8(seq->print(KeySequence::Portable))
-				       << "' is overriding old binding..."
-					       << endl;
-				return;
-			} else {
-				it->table->bind(seq, func, r + 1);
-				return;
-			}
-		}
-	}
-
-	Table::iterator newone = table.insert(table.end(), Key());
-	newone->code = code;
-	newone->mod = seq->modifiers[r];
-	if (r + 1 == seq->length()) {
-		newone->func = func;
-		newone->func.origin = FuncRequest::KEYBOARD;
-		newone->table.reset();
-	} else {
-		newone->table.reset(new KeyMap);
-		newone->table->bind(seq, func, r + 1);
-	}
-}
-
-
-void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
-{
-	KeySymbol code = seq->sequence[r];
-	if (!code.isOK())
-		return;
-
-	KeyModifier const mod1 = seq->modifiers[r].first;
-	KeyModifier const mod2 = seq->modifiers[r].second;
-
-	// check if key is already there
-	Table::iterator end = table.end();
-	Table::iterator remove = end;
-	for (Table::iterator it = table.begin(); it != end; ++it) {
-		if (code == it->code
-		    && mod1 == it->mod.first
-		    && mod2 == it->mod.second) {
-			// remove
-			if (r + 1 == seq->length()) {
-				if (it->func == func) {
-					remove = it;
-					if (it->table.get())
-						it->table.reset();
-					}
-			} else if (it->table.get()) {
-				it->table->unbind(seq, func, r + 1);
-				if (it->table->empty())
-					remove = it;
-				return;
-			}
-		}
-	}
-	if (remove != end) {
-		table.erase(remove);
-		return;
-	}
-}
-
-
-docstring KeyMap::printBindings(FuncRequest const & func) const
+docstring KeyMap::printBindings(FuncRequest const & func,
+				KeySequence::outputFormat format) const
 {
 	Bindings bindings = findBindings(func);
 	if (bindings.empty())
 		return docstring();
-	
+
 	odocstringstream res;
 	Bindings::const_iterator cit = bindings.begin();
 	Bindings::const_iterator cit_end = bindings.end();
-	// prin the first item
-	res << cit->print(KeySequence::ForGui);
+	// print the first item
+	res << cit->print(format);
 	// more than one shortcuts?
 	for (++cit; cit != cit_end; ++cit)
-		res << ", " << cit->print(KeySequence::ForGui);
+		res << ", " << cit->print(format);
 	return res.str();
 }
 
@@ -451,10 +509,10 @@ KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func,
 
 	Table::const_iterator end = table.end();
 	for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
-		if (cit->table.get()) {
+		if (cit->prefixes) {
 			KeySequence seq = prefix;
 			seq.addkey(cit->code, cit->mod.first);
-			Bindings res2 = cit->table->findBindings(func, seq);
+			Bindings res2 = cit->prefixes->findBindings(func, seq);
 			res.insert(res.end(), res2.begin(), res2.end());
 		} else if (cit->func == func) {
 			KeySequence seq = prefix;
@@ -467,42 +525,42 @@ KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func,
 }
 
 
-KeyMap::BindingList KeyMap::listBindings(bool unbound, int tag) const
+KeyMap::BindingList KeyMap::listBindings(bool unbound, KeyMap::ItemType tag) const
 {
 	BindingList list;
 	listBindings(list, KeySequence(0, 0), tag);
 	if (unbound) {
-		LyXAction::const_func_iterator fit = lyxaction.func_begin();
-		LyXAction::const_func_iterator fit_end = lyxaction.func_end();
-		for (; fit != fit_end; ++fit) {
-			kb_action action = fit->second;
+		LyXAction::const_iterator fit = lyxaction.func_begin();
+		LyXAction::const_iterator const fen = lyxaction.func_end();
+		for (; fit != fen; ++fit) {
+			FuncCode action = fit->second;
 			bool has_action = false;
-			BindingList::const_iterator it = list.begin();
-			BindingList::const_iterator it_end = list.end();
-			for (; it != it_end; ++it)
-				if (it->request.action == action) {
+			BindingList::const_iterator bit = list.begin();
+			BindingList::const_iterator const ben = list.end();
+			for (; bit != ben; ++bit)
+				if (bit->request.action() == action) {
 					has_action = true;
 					break;
 				}
 			if (!has_action)
 				list.push_back(Binding(FuncRequest(action), KeySequence(0, 0), tag));
-		}	
+		}
 	}
 	return list;
 }
 
 
 void KeyMap::listBindings(BindingList & list,
-	KeySequence const & prefix, int tag) const
+	KeySequence const & prefix, KeyMap::ItemType tag) const
 {
 	Table::const_iterator it = table.begin();
 	Table::const_iterator it_end = table.end();
 	for (; it != it_end; ++it) {
 		// a LFUN_COMMAND_PREFIX
-		if (it->table.get()) {
+		if (it->prefixes) {
 			KeySequence seq = prefix;
 			seq.addkey(it->code, it->mod.first);
-			it->table->listBindings(list, seq, tag);
+			it->prefixes->listBindings(list, seq, tag);
 		} else {
 			KeySequence seq = prefix;
 			seq.addkey(it->code, it->mod.first);