X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=d849b4b380746a9700d1b02e786501807e1e63bf;hb=c7e365365e74237149c960b9ecaa77bc7c93e608;hp=3caa2689a60badcf2e2101ce78765044ba0a3a3c;hpb=0408f69287e363d0724bcef3a0c21dd122d79538;p=lyx.git diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 3caa2689a6..d849b4b380 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -1,161 +1,169 @@ -/* This file is part of - * ====================================================== +/** + * \file lyx_cb.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Lars Gullik Bjønnes + * \author Angus Leeming + * \author John Levon + * \author André Pönitz + * \author Jürgen Vigna * - * Copyright 1995 Matthias Ettrich, - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS. + */ #include #include "lyx_cb.h" -#include "lyx_main.h" + #include "buffer.h" #include "bufferlist.h" -#include "bufferview_funcs.h" +#include "BufferView.h" +#include "buffer_funcs.h" +#include "cursor.h" #include "debug.h" -#include "lastfiles.h" +#include "gettext.h" +#include "session.h" +#include "LaTeXFeatures.h" +#include "lyx_main.h" +#include "lyxlayout.h" #include "lyxrc.h" #include "lyxtext.h" -#include "gettext.h" -#include "BufferView.h" +#include "paragraph.h" -#include "insets/insetlabel.h" - -#include "frontends/lyx_gui.h" -#include "frontends/LyXView.h" #include "frontends/Alert.h" +#include "frontends/Application.h" #include "frontends/FileDialog.h" -#include "support/FileInfo.h" +#include "support/filefilterlist.h" #include "support/filetools.h" +#include "support/fontutils.h" #include "support/forkedcall.h" +#include "support/fs_extras.h" +#include "support/lyxlib.h" +#include "support/package.h" #include "support/path.h" #include "support/systemcall.h" -#include "support/lstrings.h" -#include "support/BoostFormat.h" +#if !defined (HAVE_FORK) +# define fork() -1 +#endif + +#include +#include -#include -#include -#include #include +#include -using std::vector; -using std::ifstream; +using lyx::docstring; +using lyx::support::addName; +using lyx::support::bformat; +using lyx::support::destroyDir; +using lyx::support::FileFilterList; +using lyx::support::ForkedProcess; +using lyx::support::isLyXFilename; +using lyx::support::libFileSearch; +using lyx::support::makeAbsPath; +using lyx::support::makeDisplayPath; +using lyx::support::onlyFilename; +using lyx::support::onlyPath; +using lyx::support::package; +using lyx::support::removeAutosaveFile; +using lyx::support::rename; +using lyx::support::split; +using lyx::support::Systemcall; +using lyx::support::tempName; +using lyx::support::unlink; + +using boost::shared_ptr; + +namespace Alert = lyx::frontend::Alert; +namespace fs = boost::filesystem; + +using std::back_inserter; using std::copy; using std::endl; +using std::make_pair; +using std::string; +using std::ifstream; using std::ios; -using std::back_inserter; using std::istream_iterator; -using std::pair; -using std::make_pair; -extern BufferList bufferlist; + // this should be static, but I need it in buffer.C bool quitting; // flag, that we are quitting the program - -void ShowMessage(Buffer const * buf, - string const & msg1, - string const & msg2, - string const & msg3) -{ - if (lyx_gui::use_gui - && buf && buf->getUser() && buf->getUser()->owner()) { - string const str = msg1 + ' ' + msg2 + ' ' + msg3; - buf->getUser()->owner()->message(str); - } else - lyxerr << msg1 << msg2 << msg3 << endl; -} - - // // Menu callbacks // -bool MenuWrite(BufferView * bv, Buffer * buffer) +bool menuWrite(Buffer * buffer) { if (buffer->save()) { - lastfiles->newFile(buffer->fileName()); + LyX::ref().session().addLastFile(buffer->fileName()); return true; } // FIXME: we don't tell the user *WHY* the save failed !! - string const file = MakeDisplayPath(buffer->fileName(), 30); + docstring const file = makeDisplayPath(buffer->fileName(), 30); -#if USE_BOOST_FORMAT - boost::format fmt(_("The document %1$s could not be saved.\n\nDo you want to rename the document and try again?")); - fmt % file; - string text = fmt.str(); -#else - string text = _("The document "); - text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?"); -#endif + docstring text = bformat(_("The document %1$s could not be saved.\n\n" + "Do you want to rename the document and try again?"), file); int const ret = Alert::prompt(_("Rename and save?"), - text, 0, _("&Rename"), _("&Cancel")); + text, 0, 1, _("&Rename"), _("&Cancel")); if (ret == 0) - return WriteAs(bv, buffer); + return writeAs(buffer); return false; } -bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) +bool writeAs(Buffer * buffer, string const & filename) { string fname = buffer->fileName(); string const oldname = fname; if (filename.empty()) { + // FIXME UNICODE FileDialog fileDlg(_("Choose a filename to save document as"), - LFUN_WRITEAS, - make_pair(string(_("Documents|#o#O")), - string(lyxrc.document_path)), - make_pair(string(_("Templates|#T#t")), - string(lyxrc.template_path))); + LFUN_BUFFER_WRITE_AS, + make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)), + make_pair(_("Templates|#T#t"), lyx::from_utf8(lyxrc.template_path))); - if (!IsLyXFilename(fname)) + if (!isLyXFilename(fname)) fname += ".lyx"; + FileFilterList const filter (_("LyX Documents (*.lyx)")); + FileDialog::Result result = - fileDlg.save(OnlyPath(fname), - _("*.lyx| LyX Documents (*.lyx)"), - OnlyFilename(fname)); + fileDlg.save(lyx::from_utf8(onlyPath(fname)), + filter, + lyx::from_utf8(onlyFilename(fname))); if (result.first == FileDialog::Later) return false; - fname = result.second; + fname = lyx::to_utf8(result.second); if (fname.empty()) return false; // Make sure the absolute filename ends with appropriate suffix - fname = MakeAbsPath(fname); - if (!IsLyXFilename(fname)) + fname = makeAbsPath(fname); + if (!isLyXFilename(fname)) fname += ".lyx"; } else fname = filename; - FileInfo const myfile(fname); - if (myfile.isOK()) { - string const file = MakeDisplayPath(fname, 30); - -#if USE_BOOST_FORMAT - boost::format fmt(_("The document %1$s already exists.\n\nDo you want to over-write that document?")); - fmt % file; - string text = fmt.str(); -#else - string text = _("The document "); - text += file + _(" already exists.\n\nDo you want to over-write that document?"); -#endif + if (fs::exists(fname)) { + docstring const file = makeDisplayPath(fname, 30); + docstring text = bformat(_("The document %1$s already exists.\n\n" + "Do you want to over-write that document?"), file); int const ret = Alert::prompt(_("Over-write document?"), - text, 1, _("&Over-write"), _("&Cancel")); + text, 0, 1, _("&Over-write"), _("&Cancel")); if (ret == 1) return false; @@ -167,7 +175,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) bool unnamed = buffer->isUnnamed(); buffer->setUnnamed(false); - if (!MenuWrite(bv, buffer)) { + if (!menuWrite(buffer)) { buffer->setFileName(oldname); buffer->setUnnamed(unnamed); return false; @@ -178,15 +186,15 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename) } -void QuitLyX() +void quitLyX(bool noask) { lyxerr[Debug::INFO] << "Running QuitLyX." << endl; - if (lyx_gui::use_gui) { - if (!bufferlist.quitWriteAll()) + if (lyx::use_gui) { + if (!noask && !theBufferList().quitWriteAll()) return; - lastfiles->writeFile(lyxrc.lastfiles); + LyX::cref().session().writeFile(); } // Set a flag that we do quitting from the program, @@ -194,23 +202,24 @@ void QuitLyX() quitting = true; // close buffers first - bufferlist.closeAll(); + theBufferList().closeAll(); // do any other cleanup procedures now - lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl; + lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl; - if (destroyDir(system_tempdir) != 0) { -#if USE_BOOST_FORMAT - boost::format fmt = _("Could not remove the temporary directory %1$s"); - fmt % system_tempdir; - string msg = fmt.str(); -#else - string msg = _("Could not remove the temporary directory ") + system_tempdir; -#endif - Alert::warning(_("Could not remove temporary directory"), msg); + if (!destroyDir(package().temp_dir())) { + docstring const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + lyx::from_utf8(package().temp_dir())); + Alert::warning(_("Unable to remove temporary directory"), msg); } - lyx_gui::exit(); + if (lyx::use_gui) { + theApp->exit(0); + + // Restore original font resources after Application is destroyed. + lyx::support::restoreFontResources(); + } } @@ -222,8 +231,9 @@ public: AutoSaveBuffer(BufferView & bv, string const & fname) : bv_(bv), fname_(fname) {} /// - virtual ForkedProcess * clone() const { - return new AutoSaveBuffer(*this); + virtual shared_ptr clone() const + { + return shared_ptr(new AutoSaveBuffer(*this)); } /// int start(); @@ -238,12 +248,8 @@ private: int AutoSaveBuffer::start() { -#if USE_BOOST_FORMAT - command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_); -#else - command_ = _("Auto-saving ") + fname_; -#endif - return runNonBlocking(); + command_ = lyx::to_utf8(bformat(_("Auto-saving %1$s"), lyx::from_utf8(fname_))); + return run(DontWait); } @@ -260,16 +266,16 @@ int AutoSaveBuffer::generateChild() // anyway. bool failed = false; - string const tmp_ret = lyx::tempName(string(), "lyxauto"); + string const tmp_ret = tempName(string(), "lyxauto"); if (!tmp_ret.empty()) { bv_.buffer()->writeFile(tmp_ret); // assume successful write of tmp_ret - if (!lyx::rename(tmp_ret, fname_)) { + if (!rename(tmp_ret, fname_)) { failed = true; // most likely couldn't move between filesystems // unless write of tmp_ret failed // so remove tmp file (if it exists) - lyx::unlink(tmp_ret); + unlink(tmp_ret); } } else { failed = true; @@ -281,7 +287,8 @@ int AutoSaveBuffer::generateChild() // It is dangerous to do this in the child, // but safe in the parent, so... if (pid == -1) - bv_.owner()->message(_("Autosave failed!")); + // emit message signal. + bv_.buffer()->message(_("Autosave failed!")); } } if (pid == 0) { // we are the child so... @@ -294,32 +301,33 @@ int AutoSaveBuffer::generateChild() } // namespace anon -void AutoSave(BufferView * bv) +void autoSave(BufferView * bv) // should probably be moved into BufferList (Lgb) // Perfect target for a thread... { - if (!bv->available()) + if (!bv->buffer()) return; if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) { // We don't save now, but we'll try again later - bv->owner()->resetAutosaveTimer(); + bv->buffer()->resetAutosaveTimers(); return; } - bv->owner()->message(_("Autosaving current document...")); + // emit message signal. + bv->buffer()->message(_("Autosaving current document...")); // create autosave filename string fname = bv->buffer()->filePath(); fname += '#'; - fname += OnlyFilename(bv->buffer()->fileName()); + fname += onlyFilename(bv->buffer()->fileName()); fname += '#'; AutoSaveBuffer autosave(*bv, fname); autosave.start(); bv->buffer()->markBakClean(); - bv->owner()->resetAutosaveTimer(); + bv->buffer()->resetAutosaveTimers(); } @@ -330,55 +338,41 @@ void AutoSave(BufferView * bv) // create new file with template // SERVERCMD ! // -Buffer * NewFile(string const & filename) +void newFile(BufferView * bv, string const & filename) { // Split argument by : string name; string tmpname = split(filename, name, ':'); -#ifdef __EMX__ // Fix me! lyx_cb.C may not be low level enough to allow this. - if (name.length() == 1 - && isalpha(static_cast(name[0])) - && (prefixIs(tmpname, "/") || prefixIs(tmpname, "\\"))) { - name += ':'; - name += token(tmpname, ':', 0); - tmpname = split(tmpname, ':'); - } -#endif lyxerr[Debug::INFO] << "Arg is " << filename << "\nName is " << name << "\nTemplate is " << tmpname << endl; - // find a free buffer - Buffer * tmpbuf = bufferlist.newFile(name, tmpname); - if (tmpbuf) - lastfiles->newFile(tmpbuf->fileName()); - return tmpbuf; + Buffer * const b = newFile(name, tmpname); + if (b) + bv->setBuffer(b); } // Insert ascii file (if filename is empty, prompt for one) -void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) +void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph) { - if (!bv->available()) + if (!bv->buffer()) return; - string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph); + // FIXME: We don't know the encoding of the file + docstring const tmpstr = lyx::from_utf8(getContentsOfAsciiFile(bv, f, asParagraph)); if (tmpstr.empty()) return; - // insert the string - bv->hideCursor(); - // clear the selection - bool flag = (bv->text == bv->getLyXText()); - if (flag) - bv->beforeChange(bv->text); - if (!asParagraph) - bv->getLyXText()->insertStringAsLines(tmpstr); + LyXText const & text = bv->buffer()->text(); + if (&text == bv->getLyXText()) + bv->cursor().clearSelection(); + if (asParagraph) + bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr); else - bv->getLyXText()->insertStringAsParagraphs(tmpstr); - if (flag) - bv->update(BufferView::SELECT); + bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr); + bv->update(); } @@ -391,50 +385,34 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap FileDialog fileDlg(_("Select file to insert"), (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII); - FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath()); + FileDialog::Result result = + fileDlg.open(lyx::from_utf8(bv->buffer()->filePath()), + FileFilterList(), docstring()); if (result.first == FileDialog::Later) return string(); - fname = result.second; + fname = lyx::to_utf8(result.second); if (fname.empty()) return string(); } - FileInfo fi(fname); - - if (!fi.readable()) { - string const error = strerror(errno); - string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not read the specified document\n%1$s\ndue to the error: %2$s")); - fmt % file; - fmt % error; - string text = fmt.str(); -#else - string text = _("Could not read the specified document\n"); - text += file + _(" due to the error: "); - text += error; -#endif + if (!fs::is_readable(fname)) { + docstring const error = lyx::from_ascii(strerror(errno)); + docstring const file = makeDisplayPath(fname, 50); + docstring const text = bformat(_("Could not read the specified document\n" + "%1$s\ndue to the error: %2$s"), file, error); Alert::error(_("Could not read file"), text); return string(); } ifstream ifs(fname.c_str()); if (!ifs) { - string const error = strerror(errno); - string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s")); - fmt % file; - fmt % error; - string text = fmt.str(); -#else - string text = _("Could not open the specified document\n"); - text += file + _(" due to the error: "); - text += error; -#endif + docstring const error = lyx::from_ascii(strerror(errno)); + docstring const file = makeDisplayPath(fname, 50); + docstring const text = bformat(_("Could not open the specified document\n" + "%1$s\ndue to the error: %2$s"), file, error); Alert::error(_("Could not open file"), text); return string(); } @@ -444,7 +422,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap istream_iterator end; #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD) // We use this until the compilers get better... - vector tmp; + std::vector tmp; copy(ii, end, back_inserter(tmp)); string const tmpstr(tmp.begin(), tmp.end()); #else @@ -460,63 +438,27 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap } -string const getPossibleLabel(BufferView const & bv) -{ - Paragraph * par = &*bv.getLyXText()->cursor.par(); - LyXLayout_ptr layout = par->layout(); - if (layout->latextype == LATEX_PARAGRAPH && par->previous()) { - Paragraph * par2 = par->previous(); - - LyXLayout_ptr const & layout2 = par2->layout(); - - if (layout2->latextype != LATEX_PARAGRAPH) { - par = par2; - layout = layout2; - } - } - - string text = layout->latexname().substr(0, 3); - if (layout->latexname() == "theorem") - text = "thm"; // Create a correct prefix for prettyref - - text += ':'; - if (layout->latextype == LATEX_PARAGRAPH || - lyxrc.label_init_length < 0) - text.erase(); - - string par_text = par->asString(bv.buffer(), false); - for (int i = 0; i < lyxrc.label_init_length; ++i) { - if (par_text.empty()) - break; - string head; - par_text = split(par_text, head, ' '); - if (i > 0) - text += '-'; // Is it legal to use spaces in - // labels ? - text += head; - } - - return text; -} - - // This function runs "configure" and then rereads lyx.defaults to // reconfigure the automatic settings. -void Reconfigure(BufferView * bv) +void reconfigure(BufferView * bv) { - bv->owner()->message(_("Running configure...")); + // emit message signal. + bv->buffer()->message(_("Running configure...")); // Run configure in user lyx directory - Path p(user_lyxdir); + lyx::support::Path p(package().user_support()); + string const configure_command = package().configure_command(); Systemcall one; - one.startscript(Systemcall::Wait, - AddName(system_lyxdir, "configure")); + one.startscript(Systemcall::Wait, configure_command); p.pop(); - bv->owner()->message(_("Reloading configuration...")); - lyxrc.read(LibFileSearch(string(), "lyxrc.defaults")); + // emit message signal. + bv->buffer()->message(_("Reloading configuration...")); + lyxrc.read(libFileSearch(string(), "lyxrc.defaults")); + // Re-read packages.lst + LaTeXFeatures::getAvailable(); Alert::information(_("System reconfigured"), - _("The system has been reconfigured.\n" - "You need to restart LyX to make use of any \n" - "updated document class specifications.")); + _("The system has been reconfigured.\n" + "You need to restart LyX to make use of any\n" + "updated document class specifications.")); }