X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=294599d1cf3e0042c23799418b6aea525c7b3c9b;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=db9dbddf897b4cfce28d662492cabd3247740d9d;hpb=59fefa0759d0330d7db8066f5a1197f4f1dfc5a8;p=lyx.git

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index db9dbddf89..294599d1cf 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -40,10 +40,11 @@
 #include "frontends/LyXView.h"
 
 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
+#include <boost/bind.hpp>
+
 #include <algorithm>
 
 using lyx::support::compare_ascii_no_case;
@@ -51,8 +52,11 @@ using lyx::support::contains;
 using lyx::support::MakeDisplayPath;
 using lyx::support::token;
 
+using boost::bind;
+
 using std::auto_ptr;
 using std::endl;
+using std::equal_to;
 using std::find_if;
 using std::max;
 using std::sort;
@@ -63,6 +67,23 @@ using std::vector;
 extern BufferList bufferlist;
 extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
+namespace {
+
+class MenuNamesEqual : public std::unary_function<Menu, bool> {
+public:
+	MenuNamesEqual(string const & name)
+		: name_(name) {}
+	bool operator()(Menu const & menu) const
+	{
+		return menu.name() == name_;
+	}
+private:
+	string name_;
+};
+
+} // namespace anon
+
+
 // This is the global menu definition
 MenuBackend menubackend;
 
@@ -84,7 +105,9 @@ MenuItem::MenuItem(Kind kind, string const & label,
 MenuItem::MenuItem(Kind kind, string const & label,
 		   FuncRequest const & func, bool optional)
 	: kind_(kind), label_(label), func_(func), optional_(optional)
-{}
+{
+	func_.origin = FuncRequest::UI;
+}
 
 
 MenuItem::~MenuItem()
@@ -116,13 +139,13 @@ string const MenuItem::binding() const
 
 	// Get the keys bound to this action, but keep only the
 	// first one later
-	string bindings = toplevel_keymap->findbinding(func_);
+	kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_);
 
-	if (!bindings.empty()) {
-		return bindings.substr(1, bindings.find(']') - 1);
+	if (bindings.size()) {
+		return bindings.begin()->print();
 	} else {
 		lyxerr[Debug::KBMAP]
-			<< "No bindings for "
+			<< "No binding for "
 			<< lyxaction.getActionName(func_.action)
 			<< '(' << func_.argument << ')' << endl;
 		return string();
@@ -139,44 +162,46 @@ Menu & Menu::add(MenuItem const & i, LyXView const * view)
 	}
 
 	switch (i.kind()) {
-	case MenuItem::Command:
-	{
+
+	case MenuItem::Command: {
 		FuncStatus status =
 			view->getLyXFunc().getStatus(i.func());
 		if (status.unknown()
-		    || (status.disabled() && i.optional()))
+		    || (!status.enabled() && i.optional()))
 			break;
 		items_.push_back(i);
 		items_.back().status(status);
 		break;
 	}
-	case MenuItem::Submenu:
-	{
+
+	case MenuItem::Submenu: {
 		if (i.submenu()) {
-			bool disabled = true;
+			bool enabled = false;
 			for (const_iterator cit = i.submenu()->begin();
 			     cit != i.submenu()->end(); ++cit) {
 				if ((cit->kind() == MenuItem::Command
 				     || cit->kind() == MenuItem::Submenu)
-				    && !cit->status().disabled()) {
-					disabled = false;
+				    && cit->status().enabled()) {
+					enabled = true;
 					break;
 				}
 			}
-			if (!disabled || !i.optional()) {
+			if (enabled || !i.optional()) {
 				items_.push_back(i);
-				items_.back().status().disabled(disabled);
+				items_.back().status().enabled(enabled);
 			}
 		}
 		else
 			items_.push_back(i);
 		break;
 	}
+
 	case MenuItem::Separator:
 		if (!items_.empty()
 		    && items_.back().kind() != MenuItem::Separator)
 			items_.push_back(i);
 		break;
+
 	default:
 		items_.push_back(i);
 	}
@@ -334,6 +359,20 @@ Menu & Menu::read(LyXLex & lex)
 }
 
 
+MenuItem const & Menu::operator[](size_type i) const
+{
+	return items_[i];
+}
+
+
+bool Menu::hasFunc(FuncRequest const & func) const
+{
+	return find_if(begin(), end(),
+		       bind(std::equal_to<FuncRequest>(),
+			    bind(&MenuItem::func, _1),
+			    func)) != end();
+}
+
 void Menu::checkShortcuts() const
 {
 	// This is a quadratic algorithm, but we do not care because
@@ -360,6 +399,13 @@ void Menu::checkShortcuts() const
 }
 
 
+void MenuBackend::specialMenu(string const &name)
+{
+	if (hasMenu(name))
+		specialmenu_ = &getMenu(name);
+}
+
+
 namespace {
 
 class compare_format {
@@ -539,7 +585,7 @@ void expandCharStyleInsert(Menu & tomenu, LyXView const * view)
 			   view);
 		return;
 	}
-	CharStyles & charstyles = 
+	CharStyles & charstyles =
 		view->buffer()->params().getLyXTextClass().charstyles();
 	CharStyles::iterator cit = charstyles.begin();
 	CharStyles::iterator end = charstyles.end();
@@ -661,11 +707,11 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view)
 	if (!view || !view->buffer())
 		return;
 
-	vector<string> const selL =
-		CutAndPaste::availableSelections(*view->buffer());
+	vector<string> const sel =
+		lyx::cap::availableSelections(*view->buffer());
 
-	vector<string>::const_iterator cit = selL.begin();
-	vector<string>::const_iterator end = selL.end();
+	vector<string>::const_iterator cit = sel.begin();
+	vector<string>::const_iterator end = sel.end();
 
 	for (unsigned int index = 0; cit != end; ++cit, ++index) {
 		tomenu.add(MenuItem(MenuItem::Command, *cit,
@@ -752,8 +798,14 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 		}
 		break;
 
-		default:
+		case MenuItem::Separator:
 			tomenu.add(*cit, view);
+			break;
+
+		case MenuItem::Command:
+			if (!specialmenu_
+			    || !specialmenu_->hasFunc(cit->func()))
+				tomenu.add(*cit, view);
 		}
 	}
 
@@ -767,14 +819,6 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 }
 
 
-bool Menu::hasSubmenu(string const & name) const
-{
-	return find_if(begin(), end(),
-		       lyx::compare_memfun(&MenuItem::submenuname,
-					   name)) != end();
-}
-
-
 void MenuBackend::read(LyXLex & lex)
 {
 	enum Menutags {
@@ -840,15 +884,13 @@ void MenuBackend::add(Menu const & menu)
 
 bool MenuBackend::hasMenu(string const & name) const
 {
-	return find_if(begin(), end(),
-		       lyx::compare_memfun(&Menu::name, name)) != end();
+	return find_if(begin(), end(), MenuNamesEqual(name)) != end();
 }
 
 
 Menu const & MenuBackend::getMenu(string const & name) const
 {
-	const_iterator cit = find_if(begin(), end(),
-				     lyx::compare_memfun(&Menu::name, name));
+	const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
 	if (cit == end())
 		lyxerr << "No submenu named " << name << endl;
 	BOOST_ASSERT(cit != end());
@@ -858,10 +900,10 @@ Menu const & MenuBackend::getMenu(string const & name) const
 
 Menu & MenuBackend::getMenu(string const & name)
 {
-	MenuList::iterator it =
-		find_if(menulist_.begin(), menulist_.end(),
-			lyx::compare_memfun(&Menu::name, name));
-	BOOST_ASSERT(it != menulist_.end());
+	iterator it = find_if(begin(), end(), MenuNamesEqual(name));
+	if (it == end())
+		lyxerr << "No submenu named " << name << endl;
+	BOOST_ASSERT(it != end());
 	return (*it);
 }