From 65b0e84b5428897e36ff05fdf701bbba4acee8e8 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 19 Aug 2016 14:53:31 +0200
Subject: [PATCH] Let M-x give focus to minibuffer when it is already open

---
 src/frontends/qt4/GuiToolbar.cpp | 3 +--
 src/frontends/qt4/GuiView.cpp    | 7 ++++++-
 src/frontends/qt4/GuiView.h      | 2 ++
 src/frontends/qt4/Toolbars.h     | 3 ++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 77471c98af..2f0b510991 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -324,9 +324,8 @@ void GuiToolbar::add(ToolbarItem const & item)
 void GuiToolbar::update(int context)
 {
 	if (visibility_ & Toolbars::AUTO) {
-		bool const was_visible = isVisible();
 		setVisible(visibility_ & context & Toolbars::ALLOWAUTO);
-		if (isVisible() && !was_visible && commandBuffer())
+		if (isVisible() && commandBuffer() && (context & Toolbars::MINIBUFFER_FOCUS))
 			commandBuffer()->setFocus();
 	}
 
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index b6d4522318..39a72bb7bb 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -513,7 +513,7 @@ QSet<Buffer const *> GuiView::GuiViewPrivate::busyBuffers;
 
 GuiView::GuiView(int id)
 	: d(*new GuiViewPrivate(this)), id_(id), closing_(false), busy_(0),
-	  command_execute_(false)
+	  command_execute_(false), minibuffer_focus_(false)
 {
 	// GuiToolbars *must* be initialised before the menu bar.
 	normalSizedIcons(); // at least on Mac the default is 32 otherwise, which is huge
@@ -1564,6 +1564,10 @@ void GuiView::updateToolbars()
 			context |= Toolbars::IPA;
 		if (command_execute_)
 			context |= Toolbars::MINIBUFFER;
+		if (minibuffer_focus_) {
+			context |= Toolbars::MINIBUFFER_FOCUS;
+			minibuffer_focus_ = false;
+		}
 
 		for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
 			it->second->update(context);
@@ -3661,6 +3665,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
 		case LFUN_COMMAND_EXECUTE: {
 			command_execute_ = true;
+			minibuffer_focus_ = true;
 			break;
 		}
 		case LFUN_DROP_LAYOUTS_CHOICE:
diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 33bfd97b05..0d8cf8d1d2 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -452,6 +452,8 @@ private:
 
 	/// Request to open the command toolbar if it is "auto"
 	bool command_execute_;
+	/// Request to give focus to minibuffer
+	bool minibuffer_focus_;
 
 };
 
diff --git a/src/frontends/qt4/Toolbars.h b/src/frontends/qt4/Toolbars.h
index 02d0ebe5a4..dbaf3aaa21 100644
--- a/src/frontends/qt4/Toolbars.h
+++ b/src/frontends/qt4/Toolbars.h
@@ -108,9 +108,10 @@ public:
 		TABLE = 256, //< show when in table
 		REVIEW = 512, //< show when change tracking is enabled
 		MATHMACROTEMPLATE = 1024, //< show in math macro template
-		SAMEROW = 2048, //place to the current row, no new line
+		SAMEROW = 2048, //< place to the current row, no new line
 		IPA = 4096, //< show when in IPA inset
 		MINIBUFFER = 8192, //< show when command-execute has been invoked
+		MINIBUFFER_FOCUS = 16384, //< set focus to minibuffer
 		ALLOWAUTO = MATH | TABLE | REVIEW | MATHMACROTEMPLATE | IPA | MINIBUFFER
 	};