/* This file is part of
- * ======================================================
+ * ======================================================
*
* LyX, The Document Processor
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2000 The LyX Team.
*
- * ======================================================*/
+ * ====================================================== */
#include <config.h>
#include "version.h"
#include "lyx_main.h"
#include "lyx_gui.h"
+#include "LyXView.h"
+#include "lyxfunc.h"
#include "lyx_gui_misc.h"
#include "lyxrc.h"
#include "support/path.h"
#include "lyxserver.h"
#include "layout.h"
#include "gettext.h"
+#include "kbmap.h"
+
+using std::endl;
extern void LoadLyXFile(string const &);
// Should this be kept global? Asger says Yes.
DebugStream lyxerr;
-LastFiles *lastfiles;
-LyXRC *lyxrc;
+LastFiles * lastfiles;
// This is the global bufferlist object
BufferList bufferlist;
-LyXServer *lyxserver = 0;
+LyXServer * lyxserver = 0;
// this should be static, but I need it in buffer.C
bool finished = false; // flag, that we are quitting the program
// convenient to have it here.
-kb_keymap *toplevel_keymap;
+kb_keymap * toplevel_keymap;
-// from spellchecker.C
-#if 0
-extern void sigchldhandler(int sig);
-#endif
-LyX::LyX(int *argc, char *argv[])
+LyX::LyX(int * argc, char * argv[])
{
// Prevent crash with --help
lyxGUI = 0;
// Global bindings (this must be done as early as possible.) (Lgb)
toplevel_keymap = new kb_keymap;
-
- lyxerr.debug() << "Initializing lyxrc" << endl;
- lyxrc = new LyXRC;
+ // Fill the toplevel_keymap with some defaults
+ for (LyXRC::Bindings::const_iterator cit = lyxrc.bindings.begin();
+ cit != lyxrc.bindings.end(); ++cit) {
+ toplevel_keymap->bind((*cit).first.c_str(), (*cit).second);
+ }
// Make the GUI object, and let it take care of the
// command line arguments that concerns it.
- lyxerr.debug() << "Initializing LyXGUI..." << endl;
+ lyxerr[Debug::INIT] << "Initializing LyXGUI..." << endl;
lyxGUI = new LyXGUI(this, argc, argv, gui);
- lyxerr.debug() << "Initializing LyXGUI...done" << endl;
+ lyxerr[Debug::INIT] << "Initializing LyXGUI...done" << endl;
// Initialization of LyX (reads lyxrc and more)
- lyxerr.debug() << "Initializing LyX::init..." << endl;
- init(argc, argv);
- lyxerr.debug() << "Initializing LyX::init...done" << endl;
+ lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
+ init(argc, argv, gui);
+ lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
lyxGUI->init();
// 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() << "Opening document..." << endl;
- else if ((*argc)>2)
- lyxerr.debug() << "Opening documents..." << endl;
+ if ((*argc) == 2)
+ lyxerr[Debug::INFO] << "Opening document..." << endl;
+ else if ((*argc) > 2)
+ lyxerr[Debug::INFO] << "Opening documents..." << endl;
- Buffer *last_loaded = 0;
+ Buffer * last_loaded = 0;
- for (int argi = (*argc) - 1; argi >= 1; argi--) {
+ for (int argi = (*argc) - 1; argi >= 1; --argi) {
Buffer * loadb = bufferlist.loadLyXFile(argv[argi]);
if (loadb != 0) {
last_loaded = loadb;
if (last_loaded != 0) {
lyxerr.debug() << "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;
+
+ // no buffer loaded, create one
+ if (!last_loaded)
+ last_loaded = bufferlist.newFile("tmpfile", string());
+
+ // try to dispatch to last loaded buffer first
+ bool dispatched = last_loaded->Dispatch(batch_command);
+
+ // if this was successful, return.
+ // Maybe we could do something more clever than aborting...
+ if (dispatched) {
+ lyxerr << "We are done!" << endl;
+ return;
+ }
+
+ // otherwise, let the GUI handle the batch command
lyxGUI->regBuf(last_loaded);
+ lyxGUI->getLyXView()->getLyXFunc()->Dispatch(batch_command);
+
+ // fall through...
}
// Let the ball begin...
// A destructor is always necessary (asierra-970604)
LyX::~LyX()
{
- if (lastfiles)
- delete lastfiles;
-
- if (lyxGUI)
- delete lyxGUI;
+ delete lastfiles;
+ delete lyxGUI;
}
extern "C" void error_handler(int err_sig);
-void LyX::init(int */*argc*/, char **argv)
+void LyX::init(int */*argc*/, char **argv, bool gui)
{
// Install the signal handlers
signal(SIGHUP, error_handler);
signal(SIGINT, error_handler);
signal(SIGTERM, error_handler);
-#if 0
- // Install the SIGCHLD handler
- act_.sa_handler = sigchldhandler;
- //act_.sa_mask = SIGCHLD;
- act_.sa_flags = 0;
- //act_.sa_flags = SA_RESTART; //perhaps
- sigaction(SIGCHLD, &act_, 0);
-#endif
//
// Determine path of binary
//
- string fullbinpath, binpath = argv[0];
- subst(binpath, '\\', '/');
+ string fullbinpath;
+ string binpath = subst(argv[0], '\\', '/');
string binname = OnlyFilename(argv[0]);
// Sorry for system specific code. (SMiyata)
- if (suffixIs(binname, ".exe")) binname.erase(binname.length()-4, string::npos);
+ if (suffixIs(binname, ".exe"))
+ binname.erase(binname.length()-4, string::npos);
binpath = ExpandPath(binpath); // This expands ./ and ~/
if (!AbsolutePath(binpath)) {
string binsearchpath = GetEnvPath("PATH");
- binsearchpath += ";."; // This will make "src/lyx" work always :-)
+ // This will make "src/lyx" work always :-)
+ binsearchpath += ";.";
binpath = FileOpenSearch(binsearchpath, argv[0]);
}
fullbinpath = binpath;
binpath = MakeAbsPath(OnlyPath(binpath));
+ // In case we are running in place and compiled with shared libraries
+ if (suffixIs(binpath, "/.libs/"))
+ binpath.erase(binpath.length()-6, string::npos);
+
if (binpath.empty()) {
lyxerr << _("Warning: could not determine path of binary.")
<< "\n"
<< _("If you have problems, try starting LyX with an absolute path.")
<< endl;
}
- lyxerr.debug() << "Path of binary: " << binpath << endl;
+ lyxerr[Debug::INIT] << "Path of binary: " << binpath << endl;
//
// Determine system directory.
// Directories are searched in this order:
// 1) -sysdir command line parameter
- // 2) LYX_DIR_10x environment variable
+ // 2) LYX_DIR_11x 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
// If we had a command line switch, system_lyxdir is already set
string searchpath;
if (!system_lyxdir.empty())
- searchpath=MakeAbsPath(system_lyxdir) + ';';
+ searchpath= MakeAbsPath(system_lyxdir) + ';';
- // LYX_DIR_10x environment variable
- string lyxdir = GetEnvPath("LYX_DIR_10x");
+ // LYX_DIR_11x environment variable
+ string lyxdir = GetEnvPath("LYX_DIR_11x");
if (!lyxdir.empty()) {
- lyxerr[Debug::INIT] << "LYX_DIR_10x: " << lyxdir << endl;
+ lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
searchpath += lyxdir + ';';
}
build_lyxdir.erase();
}
-
bool FollowLink;
do {
// Path of binary/../share/name of binary/
OnlyFilename(binname)) + ';';
// Follow Symlinks
- FileInfo file(fullbinpath,true);
+ FileInfo file(fullbinpath, true);
FollowLink = file.isLink();
if (FollowLink) {
string Link;
- if (LyXReadLink(fullbinpath,Link)) {
+ if (LyXReadLink(fullbinpath, Link)) {
fullbinpath = Link;
binpath = MakeAbsPath(OnlyPath(fullbinpath));
}
// Warn if environment variable is set, but unusable
if (!lyxdir.empty()) {
if (system_lyxdir != NormalizePath(lyxdir)) {
- lyxerr <<_("LYX_DIR_10x environment variable no good.")
+ lyxerr <<_("LYX_DIR_11x environment variable no good.")
<< '\n'
<< _("System directory set to: ")
<< system_lyxdir << endl;
}
// Warn the user if we couldn't find "chkconfig.ltx"
- if (system_lyxdir.empty()) {
+ if (system_lyxdir == "./") {
lyxerr <<_("LyX Warning! Couldn't determine system directory.")
<<_("Try the '-sysdir' command line parameter or")
- <<_("set the environment variable LYX_DIR_10x to the "
+ <<_("set the environment variable LYX_DIR_11x to the "
"LyX system directory")
<< _("containing the file `chkconfig.ltx'.") << endl;
if (!path_shown)
// Determine user lyx-dir
//
- user_lyxdir = AddPath(GetEnvPath("HOME"), string(".") + LYX_NAME);
+ user_lyxdir = AddPath(GetEnvPath("HOME"), string(".") + PACKAGE);
lyxerr[Debug::INIT] << "User LyX directory: '"
<< user_lyxdir << '\'' << endl;
//
// Default template path: system_dir/templates
- if (lyxrc->template_path.empty()){
- lyxrc->template_path = AddPath(system_lyxdir, "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");
+ if (lyxrc.lastfiles.empty()){
+ lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles");
}
- // Calculate screen dpi as average of x-DPI and y-DPI:
- Screen * scr=(DefaultScreenOfDisplay(fl_get_display()));
- lyxrc->dpi = ((HeightOfScreen(scr)* 25.4 / HeightMMOfScreen(scr)) +
- (WidthOfScreen(scr)* 25.4 / WidthMMOfScreen(scr))) / 2;
- lyxerr.debug() << "DPI setting detected to be "
- << lyxrc->dpi+0.5 << endl;
+ // Disable gui when either lyxrc or easyparse says so
+ if (!gui)
+ lyxrc.use_gui = false;
+
+ // 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 "
+ << lyxrc.dpi + 0.5 << endl;
+ } else {
+ lyxrc.dpi = 1; // I hope this is safe
+ }
//
// Read configuration files
// Ensure that we have really read a bind file, so that LyX is
// usable.
- if (!lyxrc->hasBindFile)
- lyxrc->ReadBindFile();
+ if (!lyxrc.hasBindFile)
+ lyxrc.ReadBindFile();
if (lyxerr.debugging(Debug::LYXRC)) {
- lyxrc->Print();
+ lyxrc.print();
}
// Create temp directory
- system_tempdir = CreateLyXTmpDir(lyxrc->tempdir_path);
+ system_tempdir = CreateLyXTmpDir(lyxrc.tempdir_path);
if (lyxerr.debugging(Debug::INIT)) {
lyxerr << "LyX tmp dir: `" << system_tempdir << '\'' << endl;
}
// load the lastfiles mini-database
lyxerr[Debug::INIT] << "Reading lastfiles `"
- << lyxrc->lastfiles << "'..." << endl;
- lastfiles = new LastFiles(lyxrc->lastfiles,
- lyxrc->check_lastfiles,
- lyxrc->num_lastfiles);
+ << lyxrc.lastfiles << "'..." << endl;
+ lastfiles = new LastFiles(lyxrc.lastfiles,
+ lyxrc.check_lastfiles,
+ lyxrc.num_lastfiles);
// start up the lyxserver. (is this a bit early?) (Lgb)
// 0.12 this will be way to early, we need the GUI to be initialized
// 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;
}
if (!lyxrc_path.empty()){
lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
- if (lyxrc->Read(lyxrc_path) < 0) {
+ if (lyxrc.read(lyxrc_path) < 0) {
WriteAlert(_("LyX Warning!"),
_("Error while reading ")+lyxrc_path+".",
_("Using built-in defaults."));
// Set debugging level and report result to user
-void setDebuggingLevel(int dbgLevel)
+void setDebuggingLevel(string const & dbgLevel)
{
lyxerr << _("Setting debug level to ") << dbgLevel << endl;
- lyxerr.level(Debug::type(dbgLevel));
- lyxerr[Debug::INFO] << "Debugging INFO #" << Debug::INFO << endl;
- lyxerr[Debug::INIT] << "Debugging INIT #" << Debug::INIT << endl;
- lyxerr[Debug::KEY] << "Debugging KEY #" << Debug::KEY << endl;
- lyxerr[Debug::TOOLBAR] << "Debugging TOOLBAR #" << Debug::TOOLBAR << endl;
- lyxerr[Debug::PARSER] << "Debugging LEX and PARSER #" << Debug::PARSER << endl;
- lyxerr[Debug::LYXRC] << "Debugging LYXRC #" << Debug::LYXRC << endl;
- lyxerr[Debug::KBMAP] << "Debugging KBMAP #" << Debug::KBMAP << endl;
- lyxerr[Debug::LATEX] << "Debugging LATEX #" << Debug::LATEX << endl;
- lyxerr[Debug::MATHED] << "Debugging MATHED #" << Debug::MATHED << endl;
- lyxerr[Debug::FONT] << "Debugging FONT #" << Debug::FONT << endl;
- lyxerr[Debug::TCLASS] << "Debugging TCLASS #" << Debug::TCLASS << endl;
- lyxerr[Debug::LYXVC] << "Debugging LYXVC #" << Debug::LYXVC << endl;
- lyxerr[Debug::LYXSERVER] << "Debugging LYXSERVER #" << Debug::LYXSERVER << endl;
+ lyxerr.level(Debug::value(dbgLevel));
+ Debug::showLevel(lyxerr, lyxerr.level());
}
"\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-dbg n where n is a sum of debugging options. Try -dbg 65535 -help\n"
- "\t-Reverse swaps foreground & background colors\n"
- "\t-Mono runs LyX in black and white mode\n"
- "\t-FastSelection use a fast routine for drawing selections\n\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;
}
-bool LyX::easyParse(int *argc, char *argv[])
+bool LyX::easyParse(int * argc, char * argv[])
{
bool gui = true;
- for(int i=1; i < *argc; i++) {
+ for(int i = 1; i < *argc; ++i) {
string arg = argv[i];
+
// Check for -dbg int
if (arg == "-dbg") {
- if (i+1 < *argc) {
- int erri = 0;
- sscanf(argv[i+1],"%d", &erri);
-
- setDebuggingLevel(erri);
+ 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.
- } else
- lyxerr << _("Missing number for -dbg switch!")
+ for (int j = i; j < (*argc); ++j)
+ argv[j] = argv[j + 2];
+ --i; // After shift, check this number again.
+ } else {
+ lyxerr << _("List of supported debug flags:")
<< endl;
+ Debug::showTags(lyxerr);
+ exit(0);
+ }
}
// Check for "-sysdir"
else if (arg == "-sysdir") {
- if (i+1 < *argc) {
- system_lyxdir = argv[i+1];
+ 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.
+ 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!")
<< endl;
commandLineHelp();
exit(0);
}
- // Check for "-nw": No window
- else if (arg == "-nw") {
- gui = false;
+ // Check for "-nw": No XWindows as for emacs this should
+ // give a LyX that could be used in a terminal window.
+ //else if (arg == "-nw") {
+ // gui = false;
+ //}
+
+ // Check for "-x": Execute commands
+ 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.
+
+ }
+ else
+ lyxerr << _("Missing command string after -x switch!") << endl;
+
+ // Argh. Setting gui to false segfaults..
+ //gui = false;
+ }
+
+ 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;
+ } else
+ lyxerr << _("Missing file type [eg latex, "
+ "ps...] after ")
+ << arg << _(" switch!") << endl;
+ }
+
+ else if (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.
+
+ batch_command = "buffer-import " + type + " " + file;
+ lyxerr << "batch_command: "
+ << batch_command << endl;
+
+ } else
+ lyxerr << _("Missing type [eg latex, "
+ "ps...] after ")
+ << arg << _(" switch!") << endl;
}
}
+
return gui;
}
+extern "C"
void error_handler(int err_sig)
{
switch (err_sig) {
bufferlist.emergencyWriteAll();
lyxerr << "Bye." << endl;
- if(err_sig!=SIGHUP && (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
- abort();
+ if(err_sig!= SIGHUP && (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
+ lyx::abort();
exit(0);
}
projects / features.git / blobdiff