From ea3154184833f4f2426eb2a956878e83ddd822d9 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Fri, 13 Apr 2012 02:57:25 +0200
Subject: [PATCH] Fix bugs #6871 and #8119.

Both bugs above were due to a missing screen update. This patch
updates the current view after dispatching a lyxserver command
and thus solves both.

The patch is quite strightforward and the only difficulty was due
to the fact that the lyxserver needs the result of the dispatched
command. Now, GuiApplication::dispatch(FuncRequest const &) does
right this, but does not return the result, while
GuiApplication::dispatch(FuncRequest const &, DispatchResult &)
is called by the former but does not return the result. So, I
split the first one, isolating the code performing the update,
such that the second one can also update the current view when
the caller is the lyx server. When the action is initiated by
anything different from the lyx server, the behavior is unchanged.
---
 src/FuncRequest.h                    |  1 +
 src/Server.cpp                       |  4 ++--
 src/ServerSocket.cpp                 |  5 +++--
 src/frontends/qt4/GuiApplication.cpp | 15 +++++++++++++++
 src/frontends/qt4/GuiApplication.h   |  2 ++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 7fd3e1222f..175eb59fd1 100644
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -35,6 +35,7 @@ public:
 		TOOLBAR, // A toolbar icon
 		KEYBOARD, // a keyboard binding
 		COMMANDBUFFER, 
+		LYXSERVER, 
 		TOC
 	};
 
diff --git a/src/Server.cpp b/src/Server.cpp
index fed89ace5b..1e673e6f87 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -1173,10 +1173,10 @@ void Server::callback(string const & msg)
 			// connect to the lyxfunc in the single GuiView we
 			// support currently. (Lgb)
 
-			FuncRequest const fr(lyxaction.lookupFunc(cmd), arg);
+			FuncRequest fr(lyxaction.lookupFunc(cmd), arg);
+			fr.setOrigin(FuncRequest::LYXSERVER);
 			DispatchResult dr;
 			theApp()->dispatch(fr, dr);
-			theApp()->dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
 			string const rval = to_utf8(dr.message());
 
 			// all commands produce an INFO or ERROR message
diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 7940b7fc38..7b9d6df5af 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -141,9 +141,10 @@ void ServerSocket::dataCallback(int fd)
 		string const key = line.substr(0, pos);
 		if (key == "LYXCMD") {
 			string const cmd = line.substr(pos + 1);
+			FuncRequest fr(lyxaction.lookupFunc(cmd));
+			fr.setOrigin(FuncRequest::LYXSERVER);
 			DispatchResult dr;
-			theApp()->dispatch(lyxaction.lookupFunc(cmd), dr);
-			theApp()->dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
+			theApp()->dispatch(fr, dr);
 			string const rval = to_utf8(dr.message());
 			if (dr.error())
 				client->writeln("ERROR:" + cmd + ':' + rval);
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index e4a4797f61..2cec2e333a 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1140,7 +1140,12 @@ void GuiApplication::dispatch(FuncRequest const & cmd)
 	// This is done unless explicitly requested otherwise
 	dr.screenUpdate(Update::FitCursor);
 	dispatch(cmd, dr);
+	updateCurrentView(cmd, dr);
+}
+
 
+void GuiApplication::updateCurrentView(FuncRequest const & cmd, DispatchResult & dr)
+{
 	if (!current_view_)
 		return;
 
@@ -1311,6 +1316,13 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		return;
 	};
 
+	if (cmd.origin() == FuncRequest::LYXSERVER) {
+		if (current_view_ && current_view_->currentBufferView())
+			current_view_->currentBufferView()->cursor().saveBeforeDispatchPosXY();
+		// we will also need to redraw the screen at the end
+		dr.screenUpdate(Update::FitCursor);
+	}
+
 	// Assumes that the action will be dispatched.
 	dr.dispatched(true);
 
@@ -1663,6 +1675,9 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			current_view_->dispatch(cmd, dr);
 		break;
 	}
+
+	if (cmd.origin() == FuncRequest::LYXSERVER)
+		updateCurrentView(cmd, dr);
 }
 
 
diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index b4c7615749..7691452881 100644
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -192,6 +192,8 @@ private:
 	///
 	void validateCurrentView();
 	///
+	void updateCurrentView(FuncRequest const & cmd, DispatchResult & dr);
+	///
 	bool closeAllViews();
 	/// read the given ui (menu/toolbar) file
 	bool readUIFile(QString const & name, bool include = false);
-- 
2.39.5