X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.h;h=4fc11faf957359e98c762553bba2a00dde7d415c;hb=1cdd5fcb6f76ef8066707c521eef0c01cead00dd;hp=a7505448c828ff5c591bbfaa553a7ba04a84a450;hpb=50423d0e7c9a6514946c9cbfc02602bcaee0bedb;p=lyx.git

diff --git a/src/Server.h b/src/Server.h
index a7505448c8..4fc11faf95 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -25,7 +25,6 @@
 
 namespace lyx {
 
-class LyXFunc;
 class Server;
 
 
@@ -102,6 +101,9 @@ public:
 	void read_ready(DWORD);
 #endif
 
+	/// Tell whether we asked another instance of LyX to open the files
+	bool deferredLoading() { return deferred_loading_; }
+
 private:
 	/// the filename of the in pipe
 	std::string const inPipeName() const;
@@ -115,6 +117,9 @@ private:
 	/// Close pipes
 	void closeConnection();
 
+	/// Load files in another running instance of LyX
+	bool loadFilesInOtherInstance();
+
 #ifndef _WIN32
 	/// start a pipe
 	int startPipe(std::string const &, bool);
@@ -179,6 +184,9 @@ private:
 
 	/// The client callback function
 	ClientCallbackfct clientcb_;
+
+	/// Did we defer loading of files to another instance?
+	bool deferred_loading_;
 };
 
 
@@ -188,19 +196,18 @@ public:
 	// FIXME IN 0.13
 	// Hack! This should be changed in 0.13
 
-	// The lyx server should not take an argument "LyXFunc" but this is
-	// how it will be done for 0.12. In 0.13 we must write a non-gui
-	// bufferview.
 	// IMO lyxserver is atypical, and for the moment the only one, non-gui
 	// bufferview. We just have to find a way to handle situations like if
 	// lyxserver is using a buffer that is being edited with a bufferview.
 	// With a common buffer list this is not a problem, maybe. (Alejandro)
 	///
-	Server(LyXFunc * f, std::string const & pip);
+	Server(std::string const & pip);
 	///
 	~Server();
 	///
 	void notifyClient(std::string const &);
+	///
+	bool deferredLoadingToOtherInstance() { return pipes_.deferredLoading(); }
 
 	/// whilst crashing etc.
 	void emergencyCleanup() { pipes_.emergencyCleanup(); }
@@ -219,13 +226,14 @@ private:
 	///
 	int numclients_;
 	///
-	LyXFunc * func_;
-	///
 	LyXComm pipes_;
 };
 
 /// Implementation is in LyX.cpp
-extern Server & theServer();
+Server & theServer();
+
+/// Implementation is in LyX.cpp
+extern std::vector<std::string> & theFilesToLoad();
 
 
 } // namespace lyx