X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=fe6516fa4be836f54552ca53e9110a4d4d340f9b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=e735c5ba8eaaf4c1742e1c9af13177820bb04560;hpb=01bd3eacb02976ceb3abeea1af9ec37ff8b977db;p=lyx.git

diff --git a/src/bufferlist.C b/src/bufferlist.C
index e735c5ba8e..fe6516fa4b 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -5,50 +5,61 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "bufferlist.h"
-#include "lyx_main.h"
-#include "lastfiles.h"
+
+#include "author.h"
+#include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "lyx_cb.h"
-#include "bufferview_funcs.h"
-#include "BufferView.h"
 #include "gettext.h"
-#include "frontends/LyXView.h"
-#include "vc-backend.h"
-#include "TextCache.h"
-#include "lyxlex.h"
+#include "session.h"
+#include "lyx_cb.h"
+#include "lyx_main.h"
+#include "output_latex.h"
+#include "paragraph.h"
+#include "ParagraphList.h"
 
 #include "frontends/Alert.h"
 
-#include "support/FileInfo.h"
 #include "support/filetools.h"
-#include "support/lyxmanip.h"
-#include "support/lyxfunctional.h"
-#include "support/LAssert.h"
+#include "support/package.h"
 
 #include <boost/bind.hpp>
-#include "support/BoostFormat.h"
 
-#include <cassert>
 #include <algorithm>
 #include <functional>
 
 
-using std::vector;
-using std::find;
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::removeAutosaveFile;
+using support::package;
+using support::prefixIs;
+
+using boost::bind;
+
+using std::auto_ptr;
 using std::endl;
+using std::equal_to;
+using std::find;
 using std::find_if;
 using std::for_each;
-using std::mem_fun;
+using std::string;
+using std::vector;
+using std::back_inserter;
+using std::transform;
 
-extern BufferView * current_view;
+namespace Alert = lyx::frontend::Alert;
 
 
 BufferList::BufferList()
@@ -63,22 +74,20 @@ bool BufferList::empty() const
 
 bool BufferList::quitWriteBuffer(Buffer * buf)
 {
-	string file;
+	BOOST_ASSERT(buf);
+
+	docstring file;
 	if (buf->isUnnamed())
-		file = OnlyFilename(buf->fileName());
+		file = from_utf8(onlyFilename(buf->fileName()));
 	else
-		file = MakeDisplayPath(buf->fileName(), 30);
-
-#if USE_BOOST_FORMAT
-	boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
-	fmt % file;
-	string text = fmt.str();
-#else
-	string text = _("The document ");
-	text += file + _(" has unsaved changes.\n\nWhat do you want to do with it?");
-#endif
+		file = makeDisplayPath(buf->fileName(), 30);
+
+	docstring const text =
+		bformat(_("The document %1$s has unsaved changes.\n\n"
+				       "Do you want to save the document or discard the changes?"),
+					   file);
 	int const ret = Alert::prompt(_("Save changed document?"),
-		text, 0, _("&Save"), _("&Discard"), _("&Cancel"));
+		text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
 
 	if (ret == 0) {
 		// FIXME: WriteAs can be asynch !
@@ -87,9 +96,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf)
 		bool succeeded;
 
 		if (buf->isUnnamed())
-			succeeded = WriteAs(current_view, buf);
+			succeeded = writeAs(buf);
 		else
-			succeeded = MenuWrite(current_view, buf);
+			succeeded = menuWrite(buf);
 
 		if (!succeeded)
 			return false;
@@ -119,6 +128,15 @@ bool BufferList::quitWriteAll()
 		if (!quitWriteBuffer(*it))
 			return false;
 	}
+	// now, all buffers have been written sucessfully
+	// save file names to .lyx/session
+	it = bstore.begin();
+	for (; it != end; ++it) {
+		// if master/slave are both open, do not save slave since it
+		// will be automatically loaded when the master is loaded
+		if ((*it)->getMasterBuffer() == (*it))
+			LyX::ref().session().lastOpened().add((*it)->fileName());
+	}
 
 	return true;
 }
@@ -126,82 +144,70 @@ bool BufferList::quitWriteAll()
 
 void BufferList::release(Buffer * buf)
 {
-	lyx::Assert(buf);
-	BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf);
+	BOOST_ASSERT(buf);
+	BufferStorage::iterator const it =
+		find(bstore.begin(), bstore.end(), buf);
 	if (it != bstore.end()) {
-		// Make sure that we don't store a LyXText in
-		// the textcache that points to the buffer
-		// we just deleted.
 		Buffer * tmp = (*it);
+		BOOST_ASSERT(tmp);
 		bstore.erase(it);
-		textcache.removeAllWithBuffer(tmp);
 		delete tmp;
 	}
 }
 
 
-Buffer * BufferList::newBuffer(string const & s, bool ronly)
+Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
-	Buffer * tmpbuf = new Buffer(s, ronly);
-	tmpbuf->params.useClassDefaults();
+	auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
+	tmpbuf->params().useClassDefaults();
 	lyxerr[Debug::INFO] << "Assigning to buffer "
 			    << bstore.size() << endl;
-	bstore.push_back(tmpbuf);
-	return tmpbuf;
+	bstore.push_back(tmpbuf.get());
+	return tmpbuf.release();
 }
 
 
 void BufferList::closeAll()
 {
-	// Since we are closing we can just as well delete all
-	// in the textcache this will also speed the closing/quiting up a bit.
-	textcache.clear();
-
 	while (!bstore.empty()) {
 		close(bstore.front(), false);
 	}
 }
 
 
-bool BufferList::close(Buffer * buf, bool ask)
+bool BufferList::close(Buffer * buf, bool const ask)
 {
-	lyx::Assert(buf);
+	BOOST_ASSERT(buf);
 
-	// FIXME: is the quitting check still necessary ?
-	if (!ask || buf->isClean() || quitting || buf->paragraphs.empty()) {
+	if (!ask || buf->isClean() || buf->paragraphs().empty()) {
 		release(buf);
 		return true;
 	}
 
-	string fname;
+	docstring fname;
 	if (buf->isUnnamed())
-		fname = OnlyFilename(buf->fileName());
+		fname = from_utf8(onlyFilename(buf->fileName()));
 	else
-		fname = MakeDisplayPath(buf->fileName(), 30);
-#if USE_BOOST_FORMAT
-	boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
-	fmt % fname;
-	string text = fmt.str();
-#else
-	string text = _("The document ");
-	text += fname + _(" has unsaved changes.\n\nWhat do you want to do with it?");
-#endif
+		fname = makeDisplayPath(buf->fileName(), 30);
+
+	docstring const text =
+		bformat(_("The document %1$s has unsaved changes.\n\n"
+				       "Do you want to save the document or discard the changes?"),
+					   fname);
 	int const ret = Alert::prompt(_("Save changed document?"),
-		text, 0, _("&Save"), _("&Discard"), _("&Cancel"));
+		text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
 
 	if (ret == 0) {
 		if (buf->isUnnamed()) {
-			if (!WriteAs(current_view, buf))
+			if (!writeAs(buf))
 				return false;
-		} else if (buf->save()) {
-			lastfiles->newFile(buf->fileName());
-		} else {
+		} else if (!menuWrite(buf))
 			return false;
-		}
-	} else if (ret == 2) {
+		else
+			return false;
+	} else if (ret == 2)
 		return false;
-	}
-	
+
 	if (buf->isUnnamed()) {
 		removeAutosaveFile(buf->fileName());
 	}
@@ -214,8 +220,9 @@ bool BufferList::close(Buffer * buf, bool ask)
 vector<string> const BufferList::getFileNames() const
 {
 	vector<string> nvec;
-	std::copy(bstore.begin(), bstore.end(),
-		  lyx::back_inserter_fun(nvec, &Buffer::fileName));
+	transform(bstore.begin(), bstore.end(),
+		  back_inserter(nvec),
+		  boost::bind(&Buffer::fileName, _1));
 	return nvec;
 }
 
@@ -228,7 +235,7 @@ Buffer * BufferList::first()
 }
 
 
-Buffer * BufferList::getBuffer(unsigned int choice)
+Buffer * BufferList::getBuffer(unsigned int const choice)
 {
 	if (choice >= bstore.size())
 		return 0;
@@ -236,7 +243,41 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 }
 
 
-void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
+Buffer * BufferList::next(Buffer const * buf) const
+{
+	BOOST_ASSERT(buf);
+
+	if (bstore.empty())
+		return 0;
+	BufferStorage::const_iterator it = find(bstore.begin(),
+						bstore.end(), buf);
+	BOOST_ASSERT(it != bstore.end());
+	++it;
+	if (it == bstore.end())
+		return bstore.front();
+	else
+		return *it;
+}
+
+
+Buffer * BufferList::previous(Buffer const * buf) const
+{
+	BOOST_ASSERT(buf);
+
+	if (bstore.empty())
+		return 0;
+	BufferStorage::const_iterator it = find(bstore.begin(),
+						bstore.end(), buf);
+	BOOST_ASSERT(it != bstore.end());
+	if (it == bstore.begin())
+		return bstore.back();
+	else
+		return *(it - 1);
+}
+
+
+void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
+					OutputParams const & runparams)
 {
 	BufferStorage::iterator it = bstore.begin();
 	BufferStorage::iterator end = bstore.end();
@@ -246,7 +287,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 			writefile += '/';
 			writefile += (*it)->getLatexName();
 			(*it)->makeLaTeXFile(writefile, mastertmpdir,
-					     false, true);
+					     runparams, false);
 			(*it)->markDepClean(mastertmpdir);
 		}
 	}
@@ -256,33 +297,28 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 void BufferList::emergencyWriteAll()
 {
 	for_each(bstore.begin(), bstore.end(),
-		 boost::bind(&BufferList::emergencyWrite, this, _1));
+		 bind(&BufferList::emergencyWrite, this, _1));
 }
 
 
 void BufferList::emergencyWrite(Buffer * buf)
 {
-	// assert(buf) // this is not good since C assert takes an int
-		       // and a pointer is a long (JMarc)
-	assert(buf != 0); // use c assert to avoid a loop
-
+	// Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert
+	// compare with 0 to avoid pointer/interger comparison
+	assert(buf != 0);
 
 	// No need to save if the buffer has not changed.
 	if (buf->isClean())
 		return;
 
 	string const doc = buf->isUnnamed()
-		? OnlyFilename(buf->fileName()) : buf->fileName();
-
-#if USE_BOOST_FORMAT
-	lyxerr << boost::format(_("LyX: Attempting to save document %1$s"))
-		% doc
-	       << endl;
-#else
-	lyxerr << _("LyX: Attempting to save document ") << doc << endl;
-#endif
-	// We try to save three places:
+		? onlyFilename(buf->fileName()) : buf->fileName();
+
+	lyxerr << to_utf8(
+		bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc)))
+		<< endl;
 
+	// We try to save three places:
 	// 1) Same place as document. Unless it is an unnamed doc.
 	if (!buf->isUnnamed()) {
 		string s = buf->fileName();
@@ -290,156 +326,53 @@ void BufferList::emergencyWrite(Buffer * buf)
 		lyxerr << "  " << s << endl;
 		if (buf->writeFile(s)) {
 			buf->markClean();
-			lyxerr << _("  Save seems successful. Phew.") << endl;
+			lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 			return;
 		} else {
-			lyxerr << _("  Save failed! Trying...") << endl;
+			lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 		}
 	}
 
 	// 2) In HOME directory.
-	string s = AddName(GetEnvPath("HOME"), buf->fileName());
+	string s = addName(package().home_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(s)) {
 		buf->markClean();
-		lyxerr << _("  Save seems successful. Phew.") << endl;
+		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 		return;
 	}
 
-	lyxerr << _("  Save failed! Trying...") << endl;
+	lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 
 	// 3) In "/tmp" directory.
 	// MakeAbsPath to prepend the current
 	// drive letter on OS/2
-	s = AddName(MakeAbsPath("/tmp/"), buf->fileName());
+	s = addName(package().temp_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(s)) {
 		buf->markClean();
-		lyxerr << _("  Save seems successful. Phew.") << endl;
+		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 		return;
 	}
-	lyxerr << _("  Save failed! Bummer. Document is lost.") << endl;
-}
-
-
-
-Buffer * BufferList::readFile(string const & s, bool ronly)
-{
-	string ts(s);
-	string e = OnlyPath(s);
-	string a = e;
-	// File information about normal file
-	FileInfo fileInfo2(s);
-
-	if (!fileInfo2.exist()) {
-		string const file = MakeDisplayPath(s, 50);
-#if USE_BOOST_FORMAT
-		boost::format fmt(_("The specified document\n%1$s\ncould not be read."));
-		fmt % file;
-		string text = fmt.str();
-#else
-		string text = _("The specified document\n");
-		text += file + _(" could not be read.");
-#endif
-		Alert::error(_("Could not read document"), text);
-		return 0;
-	}
-
-	Buffer * b = newBuffer(s, ronly);
-
-	// Check if emergency save file exists and is newer.
-	e += OnlyFilename(s) + ".emergency";
-	FileInfo fileInfoE(e);
-
-	bool use_emergency = false;
-
-	if (fileInfoE.exist() && fileInfo2.exist()) {
-		if (fileInfoE.getModificationTime()
-		    > fileInfo2.getModificationTime()) {
-			string const file = MakeDisplayPath(s, 20);
-#if USE_BOOST_FORMAT
-			boost::format fmt(_("An emergency save of the document %1$s exists.\n\nRecover emergency save?"));
-			fmt % file;
-			string text = fmt.str();
-#else
-			string text = _("An emergency save of the document ");
-			text += file + _(" exists.\n\nRecover emergency save?");
-#endif
-			int const ret = Alert::prompt(_("Load emergency save?"),
-				text, 0, _("&Recover"), _("&Load Original"));
-
-			if (ret == 0) {
-				ts = e;
-				// the file is not saved if we load the
-				// emergency file.
-				b->markDirty();
-				use_emergency = true;
-			} else {
-				// Here, we should delete the emergency save
-				lyx::unlink(e);
-			}
-		}
-	}
-
-	if (!use_emergency) {
-		// Now check if autosave file is newer.
-		a += '#';
-		a += OnlyFilename(s);
-		a += '#';
-		FileInfo fileInfoA(a);
-		if (fileInfoA.exist() && fileInfo2.exist()) {
-			if (fileInfoA.getModificationTime()
-			    > fileInfo2.getModificationTime()) {
-				string const file = MakeDisplayPath(s, 20);
-#if USE_BOOST_FORMAT
-				boost::format fmt(_("The backup of the document %1$s is newer.\n\nLoad the backup instead?"));
-				fmt % file;
-				string text = fmt.str();
-#else
-				string text = _("The backup of the document ");
-				text += file + _(" is newer.\n\nLoad the backup instead?");
-#endif
-				int const ret = Alert::prompt(_("Load backup?"),
-					text, 0, _("&Load backup"), _("Load &original"));
-
-				if (ret == 0) {
-					ts = a;
-					// the file is not saved if we load the
-					// autosave file.
-					b->markDirty();
-				} else {
-					// Here, we should delete the autosave
-					lyx::unlink(a);
-				}
-			}
-		}
-	}
-	// not sure if this is the correct place to begin LyXLex
-	LyXLex lex(0, 0);
-	lex.setFile(ts);
-	if (b->readFile(lex, ts))
-		return b;
-	else {
-		release(b);
-		return 0;
-	}
+	lyxerr << to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
 }
 
 
 bool BufferList::exists(string const & s) const
 {
 	return find_if(bstore.begin(), bstore.end(),
-		       lyx::compare_memfun(&Buffer::fileName, s))
+		       bind(equal_to<string>(),
+			    bind(&Buffer::fileName, _1),
+			    s))
 		!= bstore.end();
 }
 
 
 bool BufferList::isLoaded(Buffer const * b) const
 {
-	lyx::Assert(b);
-
+	BOOST_ASSERT(b);
 	BufferStorage::const_iterator cit =
 		find(bstore.begin(), bstore.end(), b);
 	return cit != bstore.end();
@@ -450,154 +383,22 @@ Buffer * BufferList::getBuffer(string const & s)
 {
 	BufferStorage::iterator it =
 		find_if(bstore.begin(), bstore.end(),
-			lyx::compare_memfun(&Buffer::fileName, s));
-	return it != bstore.end() ? (*it) : 0;
-}
-
+			bind(equal_to<string>(),
+			     bind(&Buffer::fileName, _1),
+			     s));
 
-Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
-{
-	// get a free buffer
-	Buffer * b = newBuffer(name);
-
-	// use defaults.lyx as a default template if it exists.
-	if (tname.empty()) {
-		tname = LibFileSearch("templates", "defaults.lyx");
-	}
-	if (!tname.empty()) {
-		bool templateok = false;
-		LyXLex lex(0, 0);
-		lex.setFile(tname);
-		if (lex.isOK()) {
-			if (b->readFile(lex, tname)) {
-				templateok = true;
-			}
-		}
-		if (!templateok) {
-			string const file = MakeDisplayPath(tname, 50);
-#if USE_BOOST_FORMAT
-			boost::format fmt(_("The specified document template\n%1$s\ncould not be read."));
-			fmt % file;
-			string text = fmt.str();
-#else
-			string text = _("The specified document template\n");
-			text += file + _(" could not be read.");
-#endif
-			Alert::error(_("Could not read template"), text);
-			// no template, start with empty buffer
-			b->paragraphs.set(new Paragraph);
-			b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
-		}
-	} else {  // start with empty buffer
-		b->paragraphs.set(new Paragraph);
-		b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
-	}
-
-	if (!isNamed) {
-		b->setUnnamed();
-		b->setFileName(name);
-	}
-
-	b->setReadonly(false);
-
-	return b;
+	return it != bstore.end() ? (*it) : 0;
 }
 
 
-Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
+Buffer * BufferList::getBufferFromTmp(string const & s)
 {
-	// get absolute path of file and add ".lyx" to the filename if
-	// necessary
-	string s = FileSearch(string(), filename, "lyx");
-	if (s.empty()) {
-		s = filename;
-	}
-
-	// file already open?
-	if (exists(s)) {
-		string const file = MakeDisplayPath(s, 20);
-#if USE_BOOST_FORMAT
-		boost::format fmt(_("The document %1$s is already loaded.\n\nDo you want to revert to the saved version?"));
-		fmt % file;
-		string text = fmt.str();
-#else
-		string text = _("The document ");
-		text += file + _(" is already loaded.\n\nDo you want to revert to the saved version?");
-#endif
-		int const ret = Alert::prompt(_("Revert to saved document?"),
-			text, 1, _("&Revert"), _("&Switch to document"));
-
-		if (ret == 0) {
-			// FIXME: should be LFUN_REVERT
-			if (!close(getBuffer(s), false)) {
-				return 0;
-			}
-			// Fall through to new load. (Asger)
-		} else {
-			// Here, we pretend that we just loaded the
-			// open document
-			return getBuffer(s);
-		}
-	}
-
-	Buffer * b = 0;
-	bool ro = false;
-	switch (IsFileWriteable(s)) {
-	case 0:
-		ro = true;
-		// Fall through
-	case 1:
-		b = readFile(s, ro);
-		if (b) {
-			b->lyxvc.file_found_hook(s);
-		}
-		break; //fine- it's r/w
-	case -1: {
-		string const file = MakeDisplayPath(s, 20);
-		// Here we probably should run
-		if (LyXVC::file_not_found_hook(s)) {
-#if USE_BOOST_FORMAT
-			boost::format fmt(_("Do you want to retrieve the document %1$s from version control?"));
-			fmt % file;
-			string text = fmt.str();
-#else
-			string text = _("Do you want to retrieve the document ");
-			text += file + _(" from version control?");
-#endif
-			int const ret = Alert::prompt(_("Retrieve from version control?"),
-				text, 0, _("&Retrieve"), _("&Cancel"));
-
-			if (ret == 0) {
-				// How can we know _how_ to do the checkout?
-				// With the current VC support it has to be,
-				// a RCS file since CVS do not have special ,v files.
-				RCS::retrieve(s);
-				return loadLyXFile(filename, tolastfiles);
-			}
-		}
-
-#if USE_BOOST_FORMAT
-		boost::format fmt(_("The document %1$s does not yet exist.\n\nDo you want to create a new document?"));
-		fmt % file;
-		string text = fmt.str();
-#else
-		string text = _("The document ");
-		text += file + _(" does not yet exist.\n\nDo you want to create a new document?");
-#endif
-		int const ret = Alert::prompt(_("Create new document?"),
-			text, 0, _("&Create"), _("Cancel"));
-
-		if (ret == 0)
-			b = newFile(s, string(), true);
-
-		break;
-		}
-	}
-
-	if (b && tolastfiles)
-		lastfiles->newFile(b->fileName());
-
-	return b;
+	BufferStorage::iterator it = bstore.begin();
+	BufferStorage::iterator end = bstore.end();
+	for (; it < end; ++it)
+		if (prefixIs(s, (*it)->temppath()))
+			return *it;
+	return 0;
 }
 
 
@@ -606,6 +407,9 @@ void BufferList::setCurrentAuthor(string const & name, string const & email)
 	BufferStorage::iterator it = bstore.begin();
 	BufferStorage::iterator end = bstore.end();
 	for (; it != end; ++it) {
-		(*it)->authors().record(0, Author(name, email));
+		(*it)->params().authors().record(0, Author(name, email));
 	}
 }
+
+
+} // namespace lyx