move some selection related stuff over to textcursor.C

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index ad0165acc21ae120ce346a91c1b57d400185b112..44cd30ab063718c557bd2149a5fcb953f30f5a0d 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -41,9 +41,12 @@
 #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 std::vector;
 using std::endl;
@@ -140,20 +143,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.newBuffer(*it, false);
-                       loadLyXFile(last_loaded, *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
-               string const tmpfile = "tmpfile";
-               if (!last_loaded)
-                       last_loaded = newFile(tmpfile, string());
-
                bool success = false;
 
                // try to dispatch to last loaded buffer first
@@ -215,6 +222,14 @@ static void error_handler(int err_sig)
 }
 
 
+void LyX::printError(ErrorItem const & ei)
+{
+       std::cerr << _("LyX: ") << ei.error 
+                 << ':' << ei.description << std::endl;
+
+}
+
+
 void LyX::init(bool gui)
 {
        signal(SIGHUP, error_handler);
@@ -246,7 +261,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
@@ -263,10 +278,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 + ';';
        }
 
@@ -341,7 +356,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;
@@ -353,7 +368,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) {
@@ -382,15 +397,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())