X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=a45bfc6998181f54e63ad4a8599f467dbb682f6c;hb=4df7d8ab1ae443119057562fb76c2e438c053eef;hp=7d8d4e91d460588baf550b962c008eec2e4fc78c;hpb=62beaaa37fa2e7b31f89aeb32dfd447fcb0fc09b;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 7d8d4e91d4..a45bfc6998 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -85,6 +85,95 @@ size_t KeyMap::unbind(string const & seq, FuncRequest const & func)
 }
 
 
+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->prefixes.get()) {
+					it->prefixes.reset();
+				}
+				it->func = func;
+				it->func.origin = FuncRequest::KEYBOARD;
+				return;
+			} else if (!it->prefixes.get()) {
+				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.origin = 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.get())
+						it->prefixes.reset();
+				}
+			} else if (it->prefixes.get()) {
+				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];
@@ -305,95 +394,6 @@ 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->prefixes.get()) {
-					it->prefixes.reset();
-				}
-				it->func = func;
-				it->func.origin = FuncRequest::KEYBOARD;
-				return;
-			} else if (!it->prefixes.get()) {
-				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.origin = 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.get())
-						it->prefixes.reset();
-				}
-			} else if (it->prefixes.get()) {
-				it->prefixes->unbind(seq, func, r + 1);
-				if (it->prefixes->empty())
-					remove = it;
-				return;
-			}
-		}
-	}
-	if (remove != end)
-		table.erase(remove);
-}
-
-
 docstring KeyMap::printBindings(FuncRequest const & func,
 				KeySequence::outputFormat format) const
 {