Use context-sensitive command termination

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index d2484d152e1f25195eeca966702258200a77744d..047e26515d813d397b1bec419b91441871aae5f8 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -61,13 +61,12 @@
 #include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
-
-#include "support/bind.h"
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
 
 #include <algorithm>
-#include <iostream>
 #include <csignal>
+#include <iostream>
+#include <functional>
 #include <map>
 #include <stdlib.h>
 #include <string>
@@ -93,6 +92,12 @@ namespace os = support::os;
 bool use_gui = true;
 
 
+// Report on the terminal about spawned commands. The default is false
+// and can be changed with the option -v (--verbose).
+
+bool verbose = false;
+
+
 // We default to open documents in an already running instance, provided that
 // the lyxpipe has been setup. This can be overridden either on the command
 // line or through preference settings.
@@ -150,13 +155,13 @@ struct LyX::Impl {
        ///
        CmdDef toplevel_cmddef_;
        ///
-       boost::scoped_ptr<Server> lyx_server_;
+       unique_ptr<Server> lyx_server_;
        ///
-       boost::scoped_ptr<ServerSocket> lyx_socket_;
+       unique_ptr<ServerSocket> lyx_socket_;
        ///
-       boost::scoped_ptr<frontend::Application> application_;
+       unique_ptr<frontend::Application> application_;
        /// lyx session, containing lastfiles, lastfilepos, and lastopened
-       boost::scoped_ptr<Session> session_;
+       unique_ptr<Session> session_;
 
        /// Files to load at start.
        vector<string> files_to_load_;
@@ -491,14 +496,14 @@ int LyX::execWithoutGui(int & argc, char * argv[])
 
                Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
                LYXERR(Debug::FILES, "Loading " << fname);
-               if (buf->loadLyXFile() == Buffer::ReadSuccess) {
+               if (buf && buf->loadLyXFile() == Buffer::ReadSuccess) {
                        ErrorList const & el = buf->errorList("Parse");
-                       if (!el.empty())
-                                       for_each(el.begin(), el.end(),
-                                                                        bind(&LyX::printError, this, _1));
+                       for(ErrorItem const & e : el)
+                               printError(e);
                        command_line_buffers.push_back(buf);
                } else {
-                       pimpl_->buffer_list_.release(buf);
+                       if (buf)
+                               pimpl_->buffer_list_.release(buf);
                        docstring const error_message =
                                        bformat(_("LyX failed to load the following file: %1$s"),
                                                                        from_utf8(fname.absFileName()));
@@ -826,7 +831,7 @@ bool LyX::init()
 #endif
 
        lyxrc.tempdir_path = package().temp_dir().absFileName();
-       lyxrc.document_path = package().document_dir().absFileName();
+       lyxrc.document_path = ".";
 
        if (lyxrc.example_path.empty()) {
                lyxrc.example_path = addPath(package().system_support().absFileName(),
@@ -1109,7 +1114,7 @@ bool LyX::readEncodingsFile(string const & enc_name,
 namespace {
 
 /// return the the number of arguments consumed
-typedef boost::function<int(string const &, string const &, string &)> cmd_helper;
+typedef function<int(string const &, string const &, string &)> cmd_helper;
 
 int parse_dbg(string const & arg, string const &, string &)
 {
@@ -1162,6 +1167,8 @@ int parse_help(string const &, string const &, string &)
                  "\t-r [--remote]\n"
                  "                  open documents in an already running instance\n"
                  "                  (a working lyxpipe is needed)\n"
+                 "\t-v [--verbose]\n"
+                 "                  report on terminal about spawned commands.\n"
                  "\t-batch    execute commands without launching GUI and exit.\n"
                  "\t-version  summarize version and build info\n"
                               "Check the LyX man page for more details.")) << endl;
@@ -1296,6 +1303,13 @@ int parse_remote(string const &, string const &, string &)
 }
 
 
+int parse_verbose(string const &, string const &, string &)
+{
+       verbose = true;
+       return 0;
+}
+
+
 int parse_force(string const & arg, string const &, string &)
 {
        if (arg == "all") {
@@ -1343,6 +1357,8 @@ void LyX::easyParse(int & argc, char * argv[])
        cmdmap["--no-remote"] = parse_noremote;
        cmdmap["-r"] = parse_remote;
        cmdmap["--remote"] = parse_remote;
+       cmdmap["-v"] = parse_verbose;
+       cmdmap["--verbose"] = parse_verbose;
 
        for (int i = 1; i < argc; ++i) {
                map<string, cmd_helper>::const_iterator it
@@ -1415,7 +1431,7 @@ Server & theServer()
        // FIXME: this should not be use_gui dependent
        LWARNIF(use_gui);
        LAPPERR(singleton_);
-       return *singleton_->pimpl_->lyx_server_.get();
+       return *singleton_->pimpl_->lyx_server_;
 }
 
 
@@ -1424,7 +1440,7 @@ ServerSocket & theServerSocket()
        // FIXME: this should not be use_gui dependent
        LWARNIF(use_gui);
        LAPPERR(singleton_);
-       return *singleton_->pimpl_->lyx_socket_.get();
+       return *singleton_->pimpl_->lyx_socket_;
 }