X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeySequence.cpp;h=c0985b78b9b75d8f252437812a307798ad89cbc9;hb=b37929fdb33222bf55505343647838d0665a9e02;hp=5a7623b7f626fc86afb4c8f601596091525573f9;hpb=91baeb2c5579790ecac82e71f963da649b3808c2;p=lyx.git

diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp
index 5a7623b7f6..c0985b78b9 100644
--- a/src/KeySequence.cpp
+++ b/src/KeySequence.cpp
@@ -3,7 +3,7 @@
  * 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
  *
@@ -17,8 +17,6 @@
 
 #include "support/gettext.h"
 
-#include "frontends/KeySymbol.h"
-
 using namespace std;
 
 namespace lyx {
@@ -40,8 +38,7 @@ FuncRequest const & KeySequence::addkey(KeySymbol const & key,
 	if (curmap)
 		return curmap->lookup(key, mod, this);
 
-	static FuncRequest unknown(LFUN_UNKNOWN_ACTION);
-	return unknown;
+	return FuncRequest::unknown;
 }
 
 
@@ -71,6 +68,12 @@ size_t KeySequence::parse(string const & s)
 				i += 2;
 				continue;
 			case 'm': case 'M':
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+				mod |= MetaModifier;
+				i += 2;
+				continue;
+#endif
+			case 'a': case 'A':
 				mod |= AltModifier;
 				i += 2;
 				continue;
@@ -89,6 +92,12 @@ size_t KeySequence::parse(string const & s)
 				i += 3;
 				continue;
 			case 'm': case 'M':
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+				nmod |= MetaModifier;
+				i += 3;
+				continue;
+#endif
+			case 'a': case 'A':
 				nmod |= AltModifier;
 				i += 3;
 				continue;
@@ -114,8 +123,7 @@ size_t KeySequence::parse(string const & s)
 		}
 	}
 
-	// empty sequence?
-	if (sequence.size() == 0)
+	if (sequence.empty())
 		return 0;
 
 	// everything is fine
@@ -123,7 +131,7 @@ size_t KeySequence::parse(string const & s)
 }
 
 
-docstring const KeySequence::print(outputFormat format) const
+docstring const KeySequence::print(outputFormat format, bool const untranslated) const
 {
 	docstring buf;
 
@@ -132,20 +140,24 @@ docstring const KeySequence::print(outputFormat format) const
 	for (size_t i = 0; i != length; ++i) {
 		switch (format) {
 		case Portable:
-			buf += sequence[i].print(modifiers[i].first, false);
+			buf += sequence[i].print(modifiers[i].first, false, untranslated);
 			break;
 		case ForGui:
-			buf += sequence[i].print(modifiers[i].first, true);
+			buf += sequence[i].print(modifiers[i].first, true, untranslated);
 			break;
 		case BindFile:
 			KeyModifier mod = modifiers[i].first;
 			if (mod & ControlModifier)
 				buf += "C-";
 			if (mod & AltModifier)
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+				buf += "A-";
+			if (mod & MetaModifier)
+#endif
 				buf += "M-";
 			if (mod & ShiftModifier)
 				buf += "S-";
-		
+
 			buf += from_utf8(sequence[i].getSymbolName());
 			break;
 		}
@@ -170,15 +182,9 @@ docstring const KeySequence::printOptions(bool forgui) const
 }
 
 
-void KeySequence::mark_deleted()
-{
-	deleted_ = true;
-}
-
-
 void KeySequence::reset()
 {
-	mark_deleted();
+	deleted_ = true;
 	curmap = stdmap;
 }
 
@@ -196,6 +202,8 @@ void KeySequence::removeKey()
 		return;
 	sequence.pop_back();
 	modifiers.pop_back();
+	if (sequence.empty())
+		deleted_ = true;
 }