X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.h;h=215b7e930d5854e6c7b08c0d073d6d793e72957f;hb=5c055034c2076160bcb6ea7ae6d42de694cc2ca7;hp=967263a7e0d0dfccfc0fe19e9c5b97df672ede99;hpb=377cdd5f6cc2dd67fabd0b03703d20722a9ed0ea;p=lyx.git diff --git a/src/Server.h b/src/Server.h index 967263a7e0..215b7e930d 100644 --- a/src/Server.h +++ b/src/Server.h @@ -14,7 +14,9 @@ #ifndef SERVER_H #define SERVER_H -#include +#include +#include +#include #ifdef _WIN32 #include @@ -28,7 +30,22 @@ namespace lyx { class Server; -/** This class managed the pipes used for communicating with clients. +/// A small utility to track the lifetime of an object. +class Trackable { +public: + Trackable() : p_(std::make_shared(0)) {} + Trackable(Trackable const &) : Trackable() {} + Trackable(Trackable &&) : Trackable() {} + Trackable & operator=(Trackable const &) { return *this; } + Trackable & operator=(Trackable &&) { return *this; } + // This weak pointer lets you know if the parent object has been destroyed + std::weak_ptr p() const { return p_; } +private: + std::shared_ptr const p_; +}; + + +/** This class manages the pipes used for communicating with clients. Usage: Initialize with pipe-filename-base, client class to receive messages, and callback-function that will be called with the messages. When you want to send, use "send()". @@ -36,7 +53,7 @@ class Server; a clean string interface. */ #ifndef _WIN32 -class LyXComm : public boost::signals::trackable { +class LyXComm { #else class LyXComm : public QObject { Q_OBJECT @@ -101,6 +118,9 @@ public: void read_ready(DWORD); #endif + /// Tell whether we asked another instance of LyX to open the files + bool deferredLoading() const { return deferred_loading_; } + private: /// the filename of the in pipe std::string const inPipeName() const; @@ -114,6 +134,9 @@ private: /// Close pipes void closeConnection(); + /// Load files in another running instance of LyX + bool loadFilesInOtherInstance() const; + #ifndef _WIN32 /// start a pipe int startPipe(std::string const &, bool); @@ -178,6 +201,12 @@ private: /// The client callback function ClientCallbackfct clientcb_; + + /// Did we defer loading of files to another instance? + bool deferred_loading_; + + /// Track object's liveness + Trackable tracker_; }; @@ -192,11 +221,13 @@ public: // 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(std::string const & pip); + Server(std::string const & pipes); /// ~Server(); /// void notifyClient(std::string const &); + /// + bool deferredLoadingToOtherInstance() const { return pipes_.deferredLoading(); } /// whilst crashing etc. void emergencyCleanup() { pipes_.emergencyCleanup(); } @@ -221,6 +252,9 @@ private: /// Implementation is in LyX.cpp Server & theServer(); +/// Implementation is in LyX.cpp +extern std::vector & theFilesToLoad(); + } // namespace lyx