X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fbuffer_funcs.cpp;h=beab239fc31215dda29f21e2c7f4e9df803dd5e2;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=861413dcd96245679e8e807ffcec3050e6bad551;hpb=32a53f8d6a19cd6b3ec91ef6afc862137ed0ffd5;p=lyx.git diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp index 861413dcd9..beab239fc3 100644 --- a/src/buffer_funcs.cpp +++ b/src/buffer_funcs.cpp @@ -26,9 +26,9 @@ #include "LaTeX.h" #include "Layout.h" #include "LyX.h" +#include "LyXVC.h" #include "TextClass.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphList.h" #include "ParagraphParameters.h" #include "ParIterator.h" @@ -47,6 +47,7 @@ #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/mutex.h" #include "support/textutils.h" using namespace std; @@ -57,41 +58,64 @@ namespace lyx { namespace Alert = frontend::Alert; -Buffer * checkAndLoadLyXFile(FileName const & filename) +Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty) { // File already open? Buffer * checkBuffer = theBufferList().getBuffer(filename); if (checkBuffer) { - if (checkBuffer->isClean()) + // 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). + // 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 0; + return checkBuffer; + } + case 1: + // keep changes + return checkBuffer; + case 2: + // cancel + return 0; + } } - 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 0; + } + 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; } - 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; } @@ -100,10 +124,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename) 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); + return newFile(filename.absFileName(), string(), true); return 0; } @@ -111,7 +135,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename) // 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); @@ -127,8 +151,8 @@ 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); @@ -138,10 +162,12 @@ Buffer * newFile(string const & filename, string const & templatename, } } - 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); @@ -150,71 +176,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; - - FileName filename(path, - "newfile" + convert(++newfile_number) + ".lyx"); - while (theBufferList().exists(filename) - || filename.isReadableFile()) { - ++newfile_number; - filename.set(path, - "newfile" + convert(newfile_number) + ".lyx"); - } - return newFile(filename.absFilename(), templatename, false); -} + static map file_number; + static Mutex mutex; + Mutex::Locker locker(&mutex); + FileName filename; -int countWords(DocIterator const & from, DocIterator const & to) -{ - int count = 0; - bool inword = false; - for (DocIterator dit = from ; dit != to ; dit.forwardPos()) { - // Copied and adapted from isLetter() in ControlSpellChecker - if (dit.inTexted() - && dit.pos() != dit.lastpos() - && dit.paragraph().isLetter(dit.pos()) - && !dit.paragraph().isDeleted(dit.pos())) { - if (!inword) { - ++count; - inword = true; - } - } else if (inword) - inword = false; + do { + filename.set(path, + prefix + convert(++file_number[prefix]) + ".lyx"); } - - return count; + while (theBufferList().exists(filename) || filename.isReadableFile()); + + 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 ; dit.forwardPos()) { - - if (!dit.inTexted()) 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->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 0; + + buffer = theBufferList().newBuffer(fname.absFileName()); + if (!buffer) + // Buffer creation is not possible. + return 0; + + if (buffer->loadLyXFile() != Buffer::ReadSuccess) { + //close the buffer we just opened + theBufferList().release(buffer); + return 0; } } - - return chars + blanks; + return buffer; } + } // namespace lyx