X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=82dd64cbf9db6d70c1117adda9ca69a613d5f5c1;hb=916ae4222d5218ad7d5c2d5b989ed95437eb3491;hp=2eca5c1a3954fc6e4e5810a2fa301e291fac094b;hpb=586beb3a79cdb649218aa94c2b09fafab6e19789;p=lyx.git diff --git a/src/lyx_main.C b/src/lyx_main.C index 2eca5c1a39..82dd64cbf9 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -13,6 +13,10 @@ #include #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "version.h" #include "lyx_main.h" #include "lyx_gui.h" @@ -31,10 +35,16 @@ #include "layout.h" #include "gettext.h" #include "kbmap.h" +#include "MenuBackend.h" +#include "ToolbarDefaults.h" +#include "lyxlex.h" +#include "encoding.h" +#include "converter.h" using std::endl; extern void LoadLyXFile(string const &); +extern void QuitLyX(); string system_lyxdir; string build_lyxdir; @@ -54,7 +64,7 @@ LyXServer * lyxserver = 0; bool finished = false; // flag, that we are quitting the program // convenient to have it here. -kb_keymap * toplevel_keymap; +boost::scoped_ptr toplevel_keymap; LyX::LyX(int * argc, char * argv[]) @@ -68,8 +78,8 @@ LyX::LyX(int * argc, char * argv[]) bool gui = easyParse(argc, argv); // Global bindings (this must be done as early as possible.) (Lgb) - toplevel_keymap = new kb_keymap; - defaultKeyBindings(toplevel_keymap); + toplevel_keymap.reset(new kb_keymap); + defaultKeyBindings(toplevel_keymap.get()); // Make the GUI object, and let it take care of the // command line arguments that concerns it. @@ -77,6 +87,18 @@ LyX::LyX(int * argc, char * argv[]) lyxGUI = new LyXGUI(this, argc, argv, gui); lyxerr[Debug::INIT] << "Initializing LyXGUI...done" << endl; + // Now the GUI and LyX have taken care of their arguments, so + // the only thing left on the command line should be + // filenames. Let's check anyway. + for (int argi = 1; argi < *argc ; ++argi) { + if (argv[argi][0] == '-') { + lyxerr << _("Wrong command line option `") + << argv[argi] + << _("'. Exiting.") << endl; + exit(0); + } + } + // Initialization of LyX (reads lyxrc and more) lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl; init(argc, argv, gui); @@ -85,9 +107,6 @@ LyX::LyX(int * argc, char * argv[]) lyxGUI->init(); // Load the files specified in the command line. - // Now the GUI and LyX have taken care of their arguments, so - // the only thing left on the command line should be - // filenames. if ((*argc) == 2) lyxerr[Debug::INFO] << "Opening document..." << endl; else if ((*argc) > 2) @@ -104,7 +123,7 @@ LyX::LyX(int * argc, char * argv[]) if (first_start) { string splash = i18nLibFileSearch("examples", "splash.lyx"); - lyxerr.debug() << "Opening splash document " + lyxerr[Debug::INIT] << "Opening splash document " << splash << "..." << endl; Buffer * loadb = bufferlist.loadLyXFile(splash); if (loadb != 0) { @@ -113,14 +132,15 @@ LyX::LyX(int * argc, char * argv[]) } if (last_loaded != 0) { - lyxerr.debug() << "Yes we loaded some files." << endl; + lyxerr[Debug::INIT] << "Yes we loaded some files." << endl; if (lyxrc.use_gui) lyxGUI->regBuf(last_loaded); } // Execute batch commands if available if (!batch_command.empty()) { - lyxerr << "About to handle -x '" << batch_command << "'" << endl; + lyxerr << "About to handle -x '" + << batch_command << "'" << endl; // no buffer loaded, create one if (!last_loaded) @@ -133,6 +153,7 @@ LyX::LyX(int * argc, char * argv[]) // Maybe we could do something more clever than aborting... if (dispatched) { lyxerr << "We are done!" << endl; + QuitLyX(); return; } @@ -297,10 +318,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // Warn the user if we couldn't find "chkconfig.ltx" if (system_lyxdir == "./") { - lyxerr <<_("LyX Warning! Couldn't determine system directory.") - <<_("Try the '-sysdir' command line parameter or") + lyxerr <<_("LyX Warning! Couldn't determine system directory. ") + <<_("Try the '-sysdir' command line parameter or ") <<_("set the environment variable LYX_DIR_11x to the " - "LyX system directory") + "LyX system directory ") << _("containing the file `chkconfig.ltx'.") << endl; if (!path_shown) lyxerr << _("Using built-in default ") @@ -321,19 +342,34 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // Determine user lyx-dir // - user_lyxdir = AddPath(GetEnvPath("HOME"), string(".") + PACKAGE); + // Directories are searched in this order: + // 1) -userdir command line parameter + // 2) LYX_USERDIR_11x environment variable + // 3) $HOME/. + + // If we had a command line switch, user_lyxdir is already set + bool explicit_userdir = true; + if (user_lyxdir.empty()) { + + // LYX_USERDIR_11x environment variable + user_lyxdir = GetEnvPath("LYX_USERDIR_11x"); + + // default behaviour + if (user_lyxdir.empty()) + user_lyxdir = AddPath(GetEnvPath("HOME"), + string(".") + PACKAGE); + explicit_userdir = false; + } + lyxerr[Debug::INIT] << "User LyX directory: '" << user_lyxdir << '\'' << endl; - // Check that user LyX directory is ok. - queryUserLyXDir(); - - // - // Load the layouts first - // - - lyxerr[Debug::INIT] << "Reading layouts..." << endl; - LyXSetStyle(); + // Check that user LyX directory is ok. We don't do that if + // running in batch mode. + if (gui) + queryUserLyXDir(explicit_userdir); + else + first_start = false; // // Shine up lyxrc defaults @@ -356,7 +392,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // Calculate screen dpi as average of x-DPI and y-DPI: if (lyxrc.use_gui) { lyxrc.dpi = getScreenDPI(); - lyxerr[Debug::INFO] << "DPI setting detected to be " + lyxerr[Debug::INIT] << "DPI setting detected to be " << lyxrc.dpi + 0.5 << endl; } else { lyxrc.dpi = 1; // I hope this is safe @@ -367,18 +403,36 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // ReadRcFile("lyxrc.defaults"); - ReadRcFile("lyxrc"); + system_lyxrc = lyxrc; + system_formats = formats; + 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"); + + // Read encodings + ReadEncodingsFile("encodings"); + // Read languages + ReadLangugesFile("languages"); + + // Load the layouts + lyxerr[Debug::INIT] << "Reading layouts..." << endl; + LyXSetStyle(); // Ensure that we have really read a bind file, so that LyX is // usable. - if (!lyxrc.hasBindFile) - lyxrc.ReadBindFile(); + lyxrc.readBindFileIfNeeded(); + // 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); + deadKeyBindings(toplevel_keymap.get()); if (lyxerr.debugging(Debug::LYXRC)) { lyxrc.print(); @@ -403,6 +457,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui) // lyxserver = new LyXServer; } + // These are the default bindings known to LyX void LyX::defaultKeyBindings(kb_keymap * kbmap) { @@ -412,6 +467,7 @@ void LyX::defaultKeyBindings(kb_keymap * kbmap) kbmap->bind("Down", LFUN_DOWN); kbmap->bind("Tab", LFUN_TAB); + kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02 kbmap->bind("Home", LFUN_HOME); kbmap->bind("End", LFUN_END); @@ -449,8 +505,11 @@ void LyX::defaultKeyBindings(kb_keymap * kbmap) * handled seperatly (LFUN_SELFINSERT.) Lgb. */ 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 } + // LyX can optionally take over the handling of deadkeys void LyX::deadKeyBindings(kb_keymap * kbmap) { @@ -478,10 +537,9 @@ void LyX::deadKeyBindings(kb_keymap * kbmap) } - // This one is not allowed to use anything on the main form, since that // one does not exist yet. (Asger) -void LyX::queryUserLyXDir() +void LyX::queryUserLyXDir(bool explicit_userdir) { // Does user directory exist? FileInfo fileInfo(user_lyxdir); @@ -493,7 +551,11 @@ void LyX::queryUserLyXDir() } // Nope - if (!AskQuestion(_("You don't have a personal LyX directory."), + // Different wording if the user specifically requested a directory + if (!AskQuestion( explicit_userdir + ? _("You have specified an invalid LyX directory.") + : _("You don't have a personal 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; @@ -517,13 +579,13 @@ void LyX::queryUserLyXDir() // Run configure in user lyx directory Path p(user_lyxdir); - system(AddName(system_lyxdir, "configure").c_str()); + ::system(AddName(system_lyxdir, "configure").c_str()); lyxerr << "LyX: " << _("Done!") << endl; } // Read the rc file `name' -void LyX::ReadRcFile(string const & name) +bool LyX::ReadRcFile(string const & name) { lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; @@ -535,13 +597,101 @@ void LyX::ReadRcFile(string const & name) WriteAlert(_("LyX Warning!"), _("Error while reading ")+lyxrc_path+".", _("Using built-in defaults.")); + return false; } + return true; } else lyxerr[Debug::INIT] << "Could not find " << name << endl; + return false; +} + + +// Read the ui file `name' +void LyX::ReadUIFile(string const & name) +{ + enum Uitags { + ui_menuset = 1, + ui_toolbar, + ui_last + }; + + struct keyword_item uitags[ui_last-1] = { + { "menuset", ui_menuset }, + { "toolbar", ui_toolbar } + }; + + lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; + + string ui_path = LibFileSearch("ui", name, "ui"); + + if (ui_path.empty()) { + lyxerr[Debug::INIT] << "Could not find " << name << endl; + menubackend.defaults(); + return; + } + + lyxerr[Debug::INIT] << "Found " << name + << " in " << ui_path << endl; + LyXLex lex(uitags, ui_last - 1); + lex.setFile(ui_path); + if (!lex.IsOK()) { + lyxerr << "Unable to set LyXLeX for ui file: " << ui_path + << endl; + } + + if (lyxerr.debugging(Debug::PARSER)) + lex.printTable(lyxerr); + + while (lex.IsOK()) { + switch (lex.lex()) { + case ui_menuset: + menubackend.read(lex); + break; + + case ui_toolbar: + toolbardefaults.read(lex); + break; + + default: + lex.printError("LyX::ReadUFile: " + "Unknown menu tag: `$$Token'"); + break; + } + } +} + + +// Read the languages file `name' +void LyX::ReadLangugesFile(string const & name) +{ + lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; + + string lang_path = LibFileSearch(string(), name); + if (lang_path.empty()) { + lyxerr[Debug::INIT] << "Could not find " << name << endl; + languages.setDefaults(); + return; + } + languages.read(lang_path); +} + + +// Read the encodings file `name' +void LyX::ReadEncodingsFile(string const & name) +{ + lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; + + string enc_path = LibFileSearch(string(), name); + if (enc_path.empty()) { + lyxerr[Debug::INIT] << "Could not find " << name << endl; + return; + } + encodings.read(enc_path); } // Set debugging level and report result to user +static void setDebuggingLevel(string const & dbgLevel) { lyxerr << _("Setting debug level to ") << dbgLevel << endl; @@ -551,42 +701,43 @@ void setDebuggingLevel(string const & dbgLevel) // Give command line help +static void commandLineHelp() { lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl; lyxerr << _("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" "Command line switches (case sensitive):\n" - "\t-help summarize LyX usage\n" - "\t-sysdir x try to set system directory to x\n" - "\t-width x set the width of the main window\n" - "\t-height y set the height of the main window\n" - "\t-xpos x set the x position of the main window\n" - "\t-ypos y set the y position of the main window\n" + "\t-help summarize LyX usage\n" + "\t-userdir dir try to set user directory to dir\n" + "\t-sysdir dir try to set system directory to dir\n" + "\t-geometry WxH+X+Y set geometry of the main window\n" "\t-dbg feature[,feature]...\n" " select the features to debug.\n" " Type `lyx -dbg' to see the list of features\n" - "Check the LyX man page for more options.") << endl; + "\t-x [--execute] command\n" + " where command is a lyx command.\n" + "\t-e [--export] fmt\n" + " where fmt is the export format of choice.\n" + "\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" + "Check the LyX man page for more details.") << endl; } bool LyX::easyParse(int * argc, char * argv[]) { bool gui = true; - for(int i = 1; i < *argc; ++i) { + int removeargs = 0; // used when options are read + for (int i = 1; i < *argc; ++i) { string arg = argv[i]; // Check for -dbg int if (arg == "-dbg") { if (i + 1 < *argc) { setDebuggingLevel(argv[i + 1]); - - // Now, remove these two arguments by shifting - // the following two places down. - (*argc) -= 2; - for (int j = i; j < (*argc); ++j) - argv[j] = argv[j + 2]; - --i; // After shift, check this number again. + removeargs = 2; } else { lyxerr << _("List of supported debug flags:") << endl; @@ -598,18 +749,26 @@ bool LyX::easyParse(int * argc, char * argv[]) else if (arg == "-sysdir") { if (i + 1 < *argc) { system_lyxdir = argv[i + 1]; - - // Now, remove these two arguments by shifting - // the following two places down. - (*argc) -= 2; - for (int j= i; j < (*argc); ++j) - argv[j] = argv[j + 2]; - --i; // After shift, check this number again. - } else - lyxerr << _("Missing directory for -sysdir switch!") + removeargs = 2; + } else { + lyxerr << _("Missing directory for -sysdir switch!") + << endl; + exit(0); + } + } + // Check for "-userdir" + else if (arg == "-userdir") { + if (i + 1 < *argc) { + user_lyxdir = argv[i + 1]; + removeargs = 2; + } else { + lyxerr << _("Missing directory for -userdir switch!") << endl; + exit(0); + } + } // Check for --help or -help - } else if (arg == "--help" || arg == "-help") { + else if (arg == "--help" || arg == "-help") { commandLineHelp(); exit(0); } @@ -623,14 +782,7 @@ bool LyX::easyParse(int * argc, char * argv[]) else if (arg == "-x" || arg == "--execute") { if (i + 1 < *argc) { batch_command = string(argv[i + 1]); - - // Now, remove these two arguments by shifting - // the following two places down. - (*argc) -= 2; - for (int j = i; j < (*argc); ++j) - argv[j] = argv[j + 2]; - --i; // After shift, check this number again. - + removeargs = 2; } else lyxerr << _("Missing command string after -x switch!") << endl; @@ -642,41 +794,19 @@ bool LyX::easyParse(int * argc, char * argv[]) else if (arg == "-e" || arg == "--export") { if (i + 1 < *argc) { string type(argv[i+1]); - - (*argc) -= 2; - for (int j = i; j < (*argc); ++j) - argv[j] = argv[j + 2]; - --i; // After shift, check this number again. - - if (type == "tex") - type = "latex"; - else if (type == "ps") - type = "postscript"; - else if (type == "text" || type == "txt") - type = "ascii"; - - if (type == "latex" || type == "postscript" - || type == "ascii" || type == "html") - batch_command = "buffer-export " + type; - else - lyxerr << _("Unknown file type '") - << type << _("' after ") - << arg << _(" switch!") << endl; + removeargs = 2; + batch_command = "buffer-export " + type; + gui = false; } else lyxerr << _("Missing file type [eg latex, " "ps...] after ") << arg << _(" switch!") << endl; } - - else if (arg == "--import") { + else if (arg == "-i" || arg == "--import") { if (i + 1 < *argc) { string type(argv[i+1]); string file(argv[i+2]); - - (*argc) -= 3; - for (int j = i; j < (*argc); ++j) - argv[j] = argv[j + 3]; - --i; // After shift, check this number again. + removeargs = 3; batch_command = "buffer-import " + type + " " + file; lyxerr << "batch_command: " @@ -687,6 +817,17 @@ bool LyX::easyParse(int * argc, char * argv[]) "ps...] after ") << arg << _(" switch!") << endl; } + + if (removeargs > 0) { + // Now, remove used arguments by shifting + // the following ones removeargs places down. + (*argc) -= removeargs; + for (int j = i; j < (*argc); ++j) + argv[j] = argv[j + removeargs]; + --i; // After shift, check this number again. + removeargs = 0; + } + } return gui; @@ -729,7 +870,8 @@ void error_handler(int err_sig) bufferlist.emergencyWriteAll(); lyxerr << "Bye." << endl; - if(err_sig!= SIGHUP && (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV)) + if (err_sig!= SIGHUP && + (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV)) lyx::abort(); exit(0); }