A little more lv cleanup.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 184c4f9f455a6bd704ae12588154f17a323ab625..2fe6b90f8edca70d19ffbf2a6d4fee203f405939 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -273,7 +273,7 @@ int LyX::exec(int & argc, char * argv[])
        easyParse(argc, argv);
 
        try {
-               init_package(to_utf8(from_local8bit(argv[0])),
+               init_package(os::utf8_argv(0),
                              cl_system_support, cl_user_support,
                              top_build_dir_is_one_level_up);
        } catch (ExceptionMessage const & message) {
@@ -431,7 +431,7 @@ int LyX::init(int & argc, char * argv[])
                if (argv[argi][0] == '-') {
                        lyxerr << to_utf8(
                                bformat(_("Wrong command line option `%1$s'. Exiting."),
-                               from_utf8(argv[argi]))) << endl;
+                               from_utf8(os::utf8_argv(argi)))) << endl;
                        return EXIT_FAILURE;
                }
        }
@@ -445,7 +445,7 @@ int LyX::init(int & argc, char * argv[])
 
        // Remaining arguments are assumed to be files to load.
        for (int argi = argc - 1; argi >= 1; --argi)
-               pimpl_->files_to_load_.push_back(to_utf8(from_local8bit(argv[argi])));
+               pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
 
        if (first_start) {
                pimpl_->files_to_load_.push_back(
@@ -611,21 +611,23 @@ static void error_handler(int err_sig)
 
        // This shouldn't matter here, however, as we've already invoked
        // emergencyCleanup.
+       docstring msg;
        switch (err_sig) {
 #ifdef SIGHUP
        case SIGHUP:
-               lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
+               msg = _("SIGHUP signal caught!\nBye.");
                break;
 #endif
        case SIGFPE:
-               lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
+               msg = _("SIGFPE signal caught!\nBye.");
                break;
        case SIGSEGV:
-               lyxerr << "\nlyx: SIGSEGV signal caught\n"
-                         "Sorry, you have found a bug in LyX. "
+               msg = _("SIGSEGV signal caught!\n"
+                         "Sorry, you have found a bug in LyX, "
+                         "hope you have not lost any data.\n"
                          "Please read the bug-reporting instructions "
-                         "in Help->Introduction and send us a bug report, "
-                         "if necessary. Thanks !\nBye." << endl;
+                         "in 'Help->Introduction' and send us a bug report, "
+                         "if necessary. Thanks !\nBye.");
                break;
        case SIGINT:
        case SIGTERM:
@@ -633,6 +635,12 @@ static void error_handler(int err_sig)
                break;
        }
 
+       if (!msg.empty()) {
+               lyxerr << "\nlyx: " << msg << endl;
+               // try to make a GUI message
+               Alert::error(_("LyX crashed!"), msg);
+       }
+
        // Deinstall the signal handlers
 #ifdef SIGHUP
        signal(SIGHUP, SIG_DFL);
@@ -644,11 +652,18 @@ static void error_handler(int err_sig)
 
 #ifdef SIGHUP
        if (err_sig == SIGSEGV ||
-           (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty()))
+               (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {
+#else
+       if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {
+#endif 
+#ifdef _MSC_VER
+               // with abort() it crashes again.
+               exit(err_sig);
 #else
-       if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
-#endif
                abort();
+#endif
+       }
+
        exit(0);
 }
 
@@ -987,7 +1002,7 @@ int parse_help(string const &, string const &, string &)
                  "\t-i [--import] fmt file.xxx\n"
                  "                  where fmt is the import format of choice\n"
                  "                  and file.xxx is the file to be imported.\n"
-                 "\t--batch         execute commands and exit\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;
        exit(0);
@@ -1110,7 +1125,7 @@ void LyX::easyParse(int & argc, char * argv[])
        cmdmap["-i"] = parse_import;
        cmdmap["--import"] = parse_import;
        cmdmap["-geometry"] = parse_geometry;
-       cmdmap["--batch"] = parse_batch;
+       cmdmap["-batch"] = parse_batch;
 
        for (int i = 1; i < argc; ++i) {
                map<string, cmd_helper>::const_iterator it
@@ -1121,9 +1136,9 @@ void LyX::easyParse(int & argc, char * argv[])
                        continue;
 
                string const arg =
-                       (i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string();
+                       (i + 1 < argc) ? os::utf8_argv(i + 1) : string();
                string const arg2 =
-                       (i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string();
+                       (i + 2 < argc) ? os::utf8_argv(i + 2) : string();
 
                string batch;
                int const remove = 1 + it->second(arg, arg2, batch);
@@ -1133,6 +1148,7 @@ void LyX::easyParse(int & argc, char * argv[])
                // Now, remove used arguments by shifting
                // the following ones remove places down.
                if (remove > 0) {
+                       os::remove_internal_args(i, remove);
                        argc -= remove;
                        for (int j = i; j < argc; ++j)
                                argv[j] = argv[j + remove];
@@ -1237,14 +1253,14 @@ Movers & theSystemMovers()
 }
 
 
-Messages & getMessages(string const & language)
+Messages const & getMessages(string const & language)
 {
        LASSERT(singleton_, /**/);
        return singleton_->messages(language);
 }
 
 
-Messages & getGuiMessages()
+Messages const & getGuiMessages()
 {
        LASSERT(singleton_, /**/);
        return singleton_->pimpl_->messages_["GUI"];