X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=58aa12d99aa6b15e4351b9386339238f15acb2ce;hb=cafa1d4ae4fca5abc72dfbb6d49014a48d538dd8;hp=ee52fc68ec0f687c533e90209e988f3ec7568887;hpb=2b9e44cb0110201ca4d6320266e6550160ee99b3;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index ee52fc68ec..58aa12d99a 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -15,38 +15,18 @@
 #include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferList.h"
-#include "BufferParams.h"
-#include "DocIterator.h"
-#include "Counters.h"
-#include "ErrorList.h"
-#include "Floating.h"
-#include "FloatList.h"
-#include "InsetList.h"
-#include "Language.h"
-#include "LaTeX.h"
-#include "Layout.h"
-#include "LyX.h"
-#include "TextClass.h"
-#include "Paragraph.h"
-#include "ParagraphList.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
-#include "TexRow.h"
-#include "Text.h"
-#include "TocBackend.h"
+#include "LyXVC.h"
 
 #include "frontends/alert.h"
 
-#include "insets/InsetBibitem.h"
-#include "insets/InsetInclude.h"
-
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/textutils.h"
+#include "support/mutex.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -61,65 +41,85 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 	// File already open?
 	Buffer * checkBuffer = theBufferList().getBuffer(filename);
 	if (checkBuffer) {
-		// sometimes (when setting the master buffer from a child)
+		// Sometimes (when setting the master buffer from a child)
 		// we accept a dirty buffer right away (otherwise we'd get
-		// an infinite loop (bug 5514)
-		if (checkBuffer->isClean() || acceptDirty)
+		// an infinite loop (bug 5514).
+		// We also accept a dirty buffer when the document has not
+		// yet been saved to disk.
+		if (checkBuffer->isClean() || acceptDirty || !filename.exists())
 			return checkBuffer;
-		docstring const file = makeDisplayPath(filename.absFilename(), 20);
-		docstring text = bformat(_(
+		docstring const file = makeDisplayPath(filename.absFileName(), 20);
+		docstring const text = bformat(_(
 				"The document %1$s is already loaded and has unsaved changes.\n"
 				"Do you want to abandon your changes and reload the version on disk?"), file);
-		if (Alert::prompt(_("Reload saved document?"),
-				text, 0, 1,  _("&Reload"), _("&Keep Changes")))
-			return checkBuffer;
-
-		// FIXME: should be LFUN_REVERT
-		theBufferList().release(checkBuffer);
-		// Load it again.
-		return checkAndLoadLyXFile(filename);
+		int res = Alert::prompt(_("Reload saved document?"),
+					text, 2, 2,  _("Yes, &Reload"), _("No, &Keep Changes"), _("&Cancel"));
+		switch (res) {
+			case 0: {
+				// reload the document
+				if (checkBuffer->reload() != Buffer::ReadSuccess)
+					return nullptr;
+				return checkBuffer;
+			}
+			case 1:
+				// keep changes
+				return checkBuffer;
+			case 2:
+				// cancel
+				return nullptr;
+		}
 	}
 
-	if (filename.exists()) {
-		if (!filename.isReadableFile()) {
-			docstring text = bformat(_("The file %1$s exists but is not "
-				"readable by the current user."),
-				from_utf8(filename.absFilename()));
-			Alert::error(_("File not readable!"), text);
-			return 0;
+	bool const exists = filename.exists();
+	bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
+	if (exists || tryVC) {
+		if (exists) {
+			if (!filename.isReadableFile()) {
+				docstring text = bformat(_("The file %1$s exists but is not "
+					"readable by the current user."),
+					from_utf8(filename.absFileName()));
+				Alert::error(_("File not readable!"), text);
+				return nullptr;
+			}
+			if (filename.extension() == "lyx" && filename.isFileEmpty()) {
+				// Makes it possible to open an empty (0 bytes) .lyx file
+				return newFile(filename.absFileName(), "", true);
+			}
 		}
-		Buffer * b = theBufferList().newBuffer(filename.absFilename());
+		Buffer * b = theBufferList().newBuffer(filename.absFileName());
 		if (!b) {
 			// Buffer creation is not possible.
-			return 0;
+			return nullptr;
 		}
-		if (!b->loadLyXFile(filename)) {
+		if (b->loadLyXFile() != Buffer::ReadSuccess) {
+			// do not save an emergency file when releasing the buffer
+			b->markClean();
 			theBufferList().release(b);
-			return 0;
+			return nullptr;
 		}
 		return b;
 	}
 
 	docstring text = bformat(_("The document %1$s does not yet "
 		"exist.\n\nDo you want to create a new document?"),
-		from_utf8(filename.absFilename()));
+		from_utf8(filename.absFileName()));
 	if (!Alert::prompt(_("Create new document?"),
-			text, 0, 1, _("&Create"), _("Cancel")))
-		return newFile(filename.absFilename(), string(), true);
+			text, 0, 1, _("&Yes, Create New Document"), _("&No, Do Not Create")))
+		return newFile(filename.absFileName(), string(), true);
 
-	return 0;
+	return nullptr;
 }
 
 
 // FIXME newFile() should probably be a member method of Application...
 Buffer * newFile(string const & filename, string const & templatename,
-		 bool const isNamed)
+		 bool is_named)
 {
 	// get a free buffer
 	Buffer * b = theBufferList().newBuffer(filename);
 	if (!b)
 		// Buffer creation is not possible.
-		return 0;
+		return nullptr;
 
 	FileName tname;
 	// use defaults.lyx as a default template if it exists.
@@ -129,21 +129,23 @@ Buffer * newFile(string const & filename, string const & templatename,
 		tname = makeAbsPath(templatename);
 
 	if (!tname.empty()) {
-		if (!b->readFile(tname)) {
-			docstring const file = makeDisplayPath(tname.absFilename(), 50);
+		if (b->loadThisLyXFile(tname) != Buffer::ReadSuccess) {
+			docstring const file = makeDisplayPath(tname.absFileName(), 50);
 			docstring const text  = bformat(
 				_("The specified document template\n%1$s\ncould not be read."),
 				file);
 			Alert::error(_("Could not read template"), text);
 			theBufferList().release(b);
-			return 0;
+			return nullptr;
 		}
 	}
 
-	if (!isNamed) {
+	if (is_named)
+		// in this case, the user chose the filename, so we
+		// assume that she really does want this file.
+		b->markDirty();
+	else
 		b->setUnnamed();
-		b->setFileName(filename);
-	}
 
 	b->setReadonly(false);
 	b->setFullyLoaded(true);
@@ -152,99 +154,45 @@ Buffer * newFile(string const & filename, string const & templatename,
 }
 
 
-Buffer * newUnnamedFile(string const & templatename, FileName const & path)
+Buffer * newUnnamedFile(FileName const & path, string const & prefix,
+						string const & templatename)
 {
-	static int newfile_number;
+	static map<string, int> file_number;
+	static Mutex mutex;
 
-	FileName filename(path, 
-		"newfile" + convert<string>(++newfile_number) + ".lyx");
-	while (theBufferList().exists(filename)
-		|| filename.isReadableFile()) {
-		++newfile_number;
-		filename.set(path,
-			"newfile" +	convert<string>(newfile_number) + ".lyx");
-	}
-	return newFile(filename.absFilename(), templatename, false);
-}
+	Mutex::Locker locker(&mutex);
+	FileName filename;
 
-/* 
- * FIXME : merge with countChars. The structures of the two functions
- * are similar but, unfortunately, they seem to have a different
- * notion of what to count. Since nobody ever complained about that,
- * this proves (again) that any number beats no number ! (JMarc)
- */
-int countWords(DocIterator const & from, DocIterator const & to)
-{
-	int count = 0;
-	bool inword = false;
-	for (DocIterator dit = from ; dit != to ; ) {
-		if (!dit.inTexted()) {
-			dit.forwardPos();
-			continue;
-		}
-		
-		Paragraph const & par = dit.paragraph();
-		pos_type const pos = dit.pos();
-		
-		// Copied and adapted from isWordSeparator() in Paragraph
-		if (pos != dit.lastpos() && !par.isDeleted(pos)) {
-			Inset const * ins = par.getInset(pos);
-			if (ins && !ins->producesOutput()) {
-				//skip this inset
-				++dit.top().pos();
-				continue;
-			}
-			if (par.isWordSeparator(pos)) 
-				inword = false;
-			else if (!inword) {
-				++count;
-				inword = true;
-			}
-		}
-		dit.forwardPos();
+	do {
+		filename.set(path,
+			prefix + convert<string>(++file_number[prefix]) + ".lyx");
 	}
+	while (theBufferList().exists(filename) || filename.isReadableFile());
 
-	return count;
+	return newFile(filename.absFileName(), templatename, false);
 }
 
 
-int countChars(DocIterator const & from, DocIterator const & to, 
-	       bool with_blanks)
+Buffer * loadIfNeeded(FileName const & fname)
 {
-	int chars = 0;
-	int blanks = 0;
-	for (DocIterator dit = from ; dit != to ; ) {
-		if (!dit.inTexted()) {
-			dit.forwardPos();
-			continue;
-		}
-		
-		Paragraph const & par = dit.paragraph();
-		pos_type const pos = dit.pos();
-		
-		if (pos != dit.lastpos() && !par.isDeleted(pos)) {
-			if (Inset const * ins = par.getInset(pos)) {
-				if (!ins->producesOutput()) {
-					//skip this inset
-					++dit.top().pos();
-					continue;
-				}
-				if (ins->isLetter())
-					++chars;
-				else if (with_blanks && ins->isSpace())
-					++blanks;
-			} else {
-				char_type const c = par.getChar(pos);
-				if (isPrintableNonspace(c))
-					++chars;
-				else if (isSpace(c) && with_blanks)
-					++blanks;
-			}
+	Buffer * buffer = theBufferList().getBuffer(fname);
+	if (!buffer) {
+		if (!fname.exists() && !LyXVC::fileInVC(fname))
+			return nullptr;
+
+		buffer = theBufferList().newBuffer(fname.absFileName());
+		if (!buffer)
+			// Buffer creation is not possible.
+			return nullptr;
+
+		if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
+			//close the buffer we just opened
+			theBufferList().release(buffer);
+			return nullptr;
 		}
-		dit.forwardPos();
 	}
-
-	return chars + blanks;
+	return buffer;
 }
 
+
 } // namespace lyx