X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=ad0165acc21ae120ce346a91c1b57d400185b112;hb=2d8eb4b9d466e8293534ef7410737aa9448361c6;hp=3c50f3e0ac99062d18b1d574526af8565b64c6d1;hpb=e4707d7f8854aad8176aa8463739e6cb26943e86;p=lyx.git diff --git a/src/lyx_main.C b/src/lyx_main.C index 3c50f3e0ac..ad0165acc2 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -9,10 +9,6 @@ #include #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "lyx_main.h" #include "support/filetools.h" @@ -28,15 +24,17 @@ #include "bufferlist.h" #include "buffer.h" +#include "buffer_funcs.h" #include "lyxserver.h" #include "kbmap.h" #include "lyxfunc.h" -#include "ToolbarDefaults.h" +#include "ToolbarBackend.h" #include "MenuBackend.h" #include "language.h" #include "lastfiles.h" #include "encoding.h" #include "converter.h" +#include "format.h" #include "lyxtextclasslist.h" #include "frontends/Alert.h" @@ -76,6 +74,17 @@ BufferList bufferlist; // convenient to have it here. boost::scoped_ptr toplevel_keymap; +namespace { + +void showFileError(string const & error) +{ + Alert::warning(_("Could not read configuration file"), + bformat(_("Error while reading the configuration file\n%1$s.\n" + "Please check your installation."), error)); + exit(EXIT_FAILURE); +} + +} LyX::LyX(int & argc, char * argv[]) { @@ -91,7 +100,7 @@ LyX::LyX(int & argc, char * argv[]) // if this should not be in this file, please also remove // #include "graphics/GraphicsTypes.h" at the top -- Rob Lahaye. grfx::setDisplayTranslator(); - + if (want_gui) { lyx_gui::parse_init(argc, argv); } @@ -100,9 +109,8 @@ LyX::LyX(int & argc, char * argv[]) // other than documents for (int argi = 1; argi < argc ; ++argi) { if (argv[argi][0] == '-') { - lyxerr << _("Wrong command line option `") - << argv[argi] - << _("'. Exiting.") << endl; + lyxerr << bformat(_("Wrong command line option `%1$s'. Exiting."), + argv[argi]) << endl; exit(1); } } @@ -122,28 +130,29 @@ LyX::LyX(int & argc, char * argv[]) files.push_back(argv[argi]); } - if (first_start) { + if (first_start) files.push_back(i18nLibFileSearch("examples", "splash.lyx")); - } // Execute batch commands if available if (!batch_command.empty()) { lyxerr[Debug::INIT] << "About to handle -x '" - << batch_command << "'" << endl; + << batch_command << '\'' << endl; Buffer * last_loaded = 0; vector::iterator it = files.begin(); vector::iterator end = files.end(); for (; it != end; ++it) { - last_loaded = bufferlist.loadLyXFile(*it); + last_loaded = bufferlist.newBuffer(*it, false); + loadLyXFile(last_loaded, *it); } files.clear(); // no buffer loaded, create one + string const tmpfile = "tmpfile"; if (!last_loaded) - last_loaded = bufferlist.newFile("tmpfile", string()); + last_loaded = newFile(tmpfile, string()); bool success = false; @@ -287,8 +296,8 @@ void LyX::init(bool gui) FileInfo file(fullbinpath, true); followlink = file.isLink(); if (followlink) { - lyxerr << " directory " << fullbinpath - << " is a link" << endl; + lyxerr[Debug::INIT] << " directory " << fullbinpath + << " is a link" << endl; string link; if (LyXReadLink(fullbinpath, link, true)) { fullbinpath = link; @@ -354,9 +363,8 @@ void LyX::init(bool gui) << "Giving up." << endl; exit(1); } - lyxerr << _("Using built-in default ") - << LYX_DIR << _(" but expect problems.") - << endl; + lyxerr << bformat(_("Using built-in default %1$s but expect problems."), + LYX_DIR) << endl; } else { lyxerr << _("Expect problems.") << endl; } @@ -402,23 +410,23 @@ void LyX::init(bool gui) first_start = false; } - // - // Shine up lyxrc defaults - // + // Disable gui when easyparse says so + lyx_gui::use_gui = gui; - // Default template path: system_dir/templates if (lyxrc.template_path.empty()) { lyxrc.template_path = AddPath(system_lyxdir, "templates"); } - // Default lastfiles file: $HOME/.lyx/lastfiles if (lyxrc.lastfiles.empty()) { lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles"); } - // Disable gui when either lyxrc or easyparse says so - if (!gui) - lyxrc.use_gui = false; + if (lyxrc.roman_font_name.empty()) + lyxrc.roman_font_name = lyx_gui::roman_font_name(); + if (lyxrc.sans_font_name.empty()) + lyxrc.sans_font_name = lyx_gui::sans_font_name(); + if (lyxrc.typewriter_font_name.empty()) + lyxrc.typewriter_font_name = lyx_gui::typewriter_font_name(); // // Read configuration files @@ -430,10 +438,12 @@ void LyX::init(bool gui) system_converters = converters; system_lcolor = lcolor; - // If there is a preferences file we read that instead - // of the old lyxrc file. - if (!readRcFile("preferences")) - readRcFile("lyxrc"); + string prefsfile = "preferences"; + // back compatibility to lyxs < 1.1.6 + if (LibFileSearch(string(), prefsfile).empty()) + prefsfile = "lyxrc"; + if (!LibFileSearch(string(), prefsfile).empty()) + readRcFile(prefsfile); readEncodingsFile("encodings"); readLanguagesFile("languages"); @@ -449,14 +459,8 @@ void LyX::init(bool gui) // Read menus readUIFile(lyxrc.ui_file); - // Bind the X dead keys to the corresponding LyX functions if - // necessary. - if (lyxrc.override_x_deadkeys) - deadKeyBindings(toplevel_keymap.get()); - - if (lyxerr.debugging(Debug::LYXRC)) { + if (lyxerr.debugging(Debug::LYXRC)) lyxrc.print(); - } os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path)); system_tempdir = os::getTmpDir(); @@ -479,8 +483,8 @@ void LyX::defaultKeyBindings(kb_keymap * kbmap) kbmap->bind("Up", LFUN_UP); kbmap->bind("Down", LFUN_DOWN); - kbmap->bind("Tab", LFUN_TAB); - kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02 + kbmap->bind("Tab", LFUN_CELL_FORWARD); + kbmap->bind("ISO_Left_Tab", LFUN_CELL_FORWARD); // jbl 2001-23-02 kbmap->bind("Home", LFUN_HOME); kbmap->bind("End", LFUN_END); @@ -524,9 +528,9 @@ void LyX::defaultKeyBindings(kb_keymap * kbmap) kbmap->bind("KP_Prior", LFUN_PRIOR); kbmap->bind("KP_Next", LFUN_NEXT); - kbmap->bind("C-Tab", LFUN_TABINSERT); // ale970515 - kbmap->bind("S-Tab", LFUN_SHIFT_TAB); // jug20000522 - kbmap->bind("S-ISO_Left_Tab", LFUN_SHIFT_TAB); // jbl 2001-23-02 + kbmap->bind("C-Tab", LFUN_CELL_SPLIT); // ale970515 + kbmap->bind("S-Tab", LFUN_CELL_BACKWARD); // jug20000522 + kbmap->bind("S-ISO_Left_Tab", LFUN_CELL_BACKWARD); // jbl 2001-23-02 } @@ -592,26 +596,14 @@ void LyX::queryUserLyXDir(bool explicit_userdir) first_start = !explicit_userdir; - // If the user specified explicitly a directory, ask whether - // to create it (otherwise, always create it) - if (explicit_userdir && - !Alert::askQuestion(_("You have specified an invalid LyX directory."), - _("It is needed to keep your own configuration."), - _("Should I try to set it up for you (recommended)?"))) { - lyxerr << _("Running without personal LyX directory.") << endl; - // No, let's use $HOME instead. - user_lyxdir = GetEnvPath("HOME"); - return; - } - - lyxerr << _("LyX: Creating directory ") << user_lyxdir - << _(" and running configure...") << endl; + lyxerr << bformat(_("LyX: Creating directory %1$s" + " and running configure..."), user_lyxdir) << endl; if (!createDirectory(user_lyxdir, 0755)) { // Failed, let's use $HOME instead. user_lyxdir = GetEnvPath("HOME"); - lyxerr << _("Failed. Will use ") << user_lyxdir - << _(" instead.") << endl; + lyxerr << bformat(_("Failed. Will use %1$s instead."), + user_lyxdir) << endl; return; } @@ -622,26 +614,21 @@ void LyX::queryUserLyXDir(bool explicit_userdir) } -bool LyX::readRcFile(string const & name) +void LyX::readRcFile(string const & name) { lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; string const lyxrc_path = LibFileSearch(string(), name); if (!lyxrc_path.empty()) { + lyxerr[Debug::INIT] << "Found " << name << " in " << lyxrc_path << endl; - if (lyxrc.read(lyxrc_path) < 0) { - Alert::alert(_("LyX Warning!"), - _("Error while reading ") + lyxrc_path + ".", - _("Using built-in defaults.")); - return false; - } - return true; - } else { - lyxerr[Debug::INIT] << "Could not find " << name << endl; + + if (lyxrc.read(lyxrc_path) >= 0) + return; } - return false; + showFileError(name); } @@ -651,23 +638,41 @@ void LyX::readUIFile(string const & name) enum Uitags { ui_menuset = 1, ui_toolbar, + ui_toolbars, + ui_include, ui_last }; 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) + static std::list uifiles; + std::list::const_iterator it = uifiles.begin(); + std::list::const_iterator end = uifiles.end(); + it = std::find(it, end, name); + if (it != end) { + lyxerr[Debug::INIT] << "UI file '" << name + << "' has been read already. " + << "Is this an include loop?" + << endl; + return; + } + lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; string const ui_path = LibFileSearch("ui", name, "ui"); if (ui_path.empty()) { lyxerr[Debug::INIT] << "Could not find " << name << endl; - menubackend.defaults(); + showFileError(name); return; } + uifiles.push_back(name); lyxerr[Debug::INIT] << "Found " << name << " in " << ui_path << endl; @@ -683,12 +688,22 @@ void LyX::readUIFile(string const & name) while (lex.isOK()) { switch (lex.lex()) { + case ui_include: { + lex.next(true); + string const file = lex.getString(); + readUIFile(file); + break; + } case ui_menuset: menubackend.read(lex); break; case ui_toolbar: - toolbardefaults.read(lex); + toolbarbackend.read(lex); + break; + + case ui_toolbars: + toolbarbackend.readToolbars(lex); break; default: @@ -708,8 +723,7 @@ void LyX::readLanguagesFile(string const & name) string const lang_path = LibFileSearch(string(), name); if (lang_path.empty()) { - lyxerr[Debug::INIT] << "Could not find " << name << endl; - languages.setDefaults(); + showFileError(name); return; } languages.read(lang_path); @@ -723,7 +737,7 @@ void LyX::readEncodingsFile(string const & name) string const enc_path = LibFileSearch(string(), name); if (enc_path.empty()) { - lyxerr[Debug::INIT] << "Could not find " << name << endl; + showFileError(name); return; } encodings.read(enc_path); @@ -736,7 +750,7 @@ bool is_gui = true; string batch; /// return the the number of arguments consumed -typedef boost::function cmd_helper; +typedef boost::function cmd_helper; int parse_dbg(string const & arg, string const &) { @@ -745,12 +759,14 @@ int parse_dbg(string const & arg, string const &) Debug::showTags(lyxerr); exit(0); } - lyxerr << _("Setting debug level to ") << arg << endl; + lyxerr << bformat(_("Setting debug level to %1$s"), arg) << endl; + lyxerr.level(Debug::value(arg)); Debug::showLevel(lyxerr, lyxerr.level()); return 1; } + int parse_help(string const &, string const &) { lyxerr << @@ -844,7 +860,7 @@ int parse_import(string const & type, string const & file) exit(1); } - batch = "buffer-import " + type + " " + file; + batch = "buffer-import " + type + ' ' + file; return 2; }