last Friday's text*.C -> text_func shuffle

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 18b69a1629ddf1d8cc40151671f7e242f41134d5..436ec5d8087cc51ff47df46513aae1ee7e6ccace 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -24,6 +24,7 @@
 
 #include "bufferlist.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "lyxserver.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
@@ -40,9 +41,14 @@
 #include "frontends/lyx_gui.h"
 
 #include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/signals/signal1.hpp>
 
 #include <cstdlib>
 #include <csignal>
+#include <iostream>
+
+using namespace lyx::support;
 
 using std::vector;
 using std::endl;
@@ -139,18 +145,24 @@ LyX::LyX(int & argc, char * argv[])
 
                Buffer * last_loaded = 0;
 
-               vector<string>::iterator it = files.begin();
-               vector<string>::iterator end = files.end();
+               vector<string>::const_iterator it = files.begin();
+               vector<string>::const_iterator end = files.end();
+
                for (; it != end; ++it) {
-                       last_loaded = bufferlist.loadLyXFile(*it);
+                       // get absolute path of file and add ".lyx" to
+                       // the filename if necessary
+                       string s = FileSearch(string(), *it, "lyx");
+                       if (s.empty()) {
+                               s = *it;
+                       }
+
+                       last_loaded = bufferlist.newBuffer(s, false);
+                       last_loaded->parseError.connect(boost::bind(&LyX::printError, this, _1));
+                       loadLyXFile(last_loaded, s);
                }
 
                files.clear();
 
-               // no buffer loaded, create one
-               if (!last_loaded)
-                       last_loaded = bufferlist.newFile("tmpfile", string());
-
                bool success = false;
 
                // try to dispatch to last loaded buffer first
@@ -205,13 +217,21 @@ static void error_handler(int err_sig)
        lyxerr << "Bye." << endl;
        if (err_sig!= SIGHUP &&
           (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
-               lyx::abort();
+               lyx::support::abort();
        exit(0);
 }
 
 }
 
 
+void LyX::printError(ErrorItem const & ei)
+{
+       std::cerr << _("LyX: ") << ei.error
+                 << ':' << ei.description << std::endl;
+
+}
+
+
 void LyX::init(bool gui)
 {
        signal(SIGHUP, error_handler);
@@ -243,7 +263,7 @@ void LyX::init(bool gui)
 
        // Directories are searched in this order:
        // 1) -sysdir command line parameter
-       // 2) LYX_DIR_13x environment variable
+       // 2) LYX_DIR_14x environment variable
        // 3) Maybe <path of binary>/TOP_SRCDIR/lib
        // 4) <path of binary>/../share/<name of binary>/
        // 4a) repeat 4 after following the Symlink if <path of
@@ -260,10 +280,10 @@ void LyX::init(bool gui)
        if (!system_lyxdir.empty())
                searchpath = MakeAbsPath(system_lyxdir) + ';';
 
-       string const lyxdir = GetEnvPath("LYX_DIR_13x");
+       string const lyxdir = GetEnvPath("LYX_DIR_14x");
 
        if (!lyxdir.empty()) {
-               lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
+               lyxerr[Debug::INIT] << "LYX_DIR_14x: " << lyxdir << endl;
                searchpath += lyxdir + ';';
        }
 
@@ -338,7 +358,7 @@ void LyX::init(bool gui)
        // Warn if environment variable is set, but unusable
        if (!lyxdir.empty()) {
                if (system_lyxdir != NormalizePath(lyxdir)) {
-                       lyxerr <<_("LYX_DIR_13x environment variable no good.")
+                       lyxerr <<_("LYX_DIR_14x environment variable no good.")
                               << '\n'
                               << _("System directory set to: ")
                               << system_lyxdir << endl;
@@ -350,7 +370,7 @@ void LyX::init(bool gui)
        if (system_lyxdir == "./") {
                lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
                       <<_("Try the '-sysdir' command line parameter or ")
-                      <<_("set the environment variable LYX_DIR_13x to the "
+                      <<_("set the environment variable LYX_DIR_14x to the "
                           "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown) {
@@ -361,7 +381,7 @@ void LyX::init(bool gui)
                                exit(1);
                        }
                        lyxerr << bformat(_("Using built-in default %1$s but expect problems."),
-                               static_cast<char *>(LYX_DIR)) << endl;
+                               LYX_DIR) << endl;
                } else {
                        lyxerr << _("Expect problems.") << endl;
                }
@@ -379,15 +399,15 @@ void LyX::init(bool gui)
 
        // Directories are searched in this order:
        // 1) -userdir command line parameter
-       // 2) LYX_USERDIR_13x environment variable
+       // 2) LYX_USERDIR_14x environment variable
        // 3) $HOME/.<name of binary>
 
        // If we had a command line switch, user_lyxdir is already set
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 
-               // LYX_USERDIR_13x environment variable
-               user_lyxdir = GetEnvPath("LYX_USERDIR_13x");
+               // LYX_USERDIR_14x environment variable
+               user_lyxdir = GetEnvPath("LYX_USERDIR_14x");
 
                // default behaviour
                if (user_lyxdir.empty())
@@ -436,7 +456,7 @@ void LyX::init(bool gui)
        system_lcolor = lcolor;
 
        string prefsfile = "preferences";
-       // back compatibility to lyxs < 1.1.6 
+       // back compatibility to lyxs < 1.1.6
        if (LibFileSearch(string(), prefsfile).empty())
                prefsfile = "lyxrc";
        if (!LibFileSearch(string(), prefsfile).empty())
@@ -635,6 +655,7 @@ void LyX::readUIFile(string const & name)
        enum Uitags {
                ui_menuset = 1,
                ui_toolbar,
+               ui_toolbars,
                ui_include,
                ui_last
        };
@@ -642,7 +663,8 @@ void LyX::readUIFile(string const & name)
        struct keyword_item uitags[ui_last - 1] = {
                { "include", ui_include },
                { "menuset", ui_menuset },
-               { "toolbar", ui_toolbar }
+               { "toolbar", ui_toolbar },
+               { "toolbars", ui_toolbars }
        };
 
        // Ensure that a file is read only once (prevents include loops)
@@ -697,6 +719,10 @@ void LyX::readUIFile(string const & name)
                        toolbarbackend.read(lex);
                        break;
 
+               case ui_toolbars:
+                       toolbarbackend.readToolbars(lex);
+                       break;
+
                default:
                        if (!rtrim(lex.getString()).empty())
                                lex.printError("LyX::ReadUIFile: "