X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=03ecc90abeb9d9a8bea5c4ec654ac38fde923016;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=7e90af60d281474f0f5c17e5a03af8e98eeaf8cb;hpb=51fce57c7819dc5e8997922038fb69738b9858ac;p=lyx.git diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp index 7e90af60d2..03ecc90abe 100644 --- a/src/buffer_funcs.cpp +++ b/src/buffer_funcs.cpp @@ -26,6 +26,7 @@ #include "LaTeX.h" #include "Layout.h" #include "LyX.h" +#include "LyXVC.h" #include "TextClass.h" #include "Paragraph.h" #include "ParagraphList.h" @@ -46,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; @@ -68,33 +70,44 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty) // yet been saved to disk. if (checkBuffer->isClean() || acceptDirty || !filename.exists()) return checkBuffer; - docstring const file = makeDisplayPath(filename.absFilename(), 20); + 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"))) { - // reload the document - if (!checkBuffer->reload()) + 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; } - return checkBuffer; } - if (filename.exists()) { - if (!filename.isReadableFile()) { + bool const exists = filename.exists(); + bool const tryVC = exists ? false : LyXVC::fileInVC(filename); + if (exists || tryVC) { + if (exists && !filename.isReadableFile()) { docstring text = bformat(_("The file %1$s exists but is not " "readable by the current user."), - from_utf8(filename.absFilename())); + from_utf8(filename.absFileName())); Alert::error(_("File not readable!"), text); return 0; } - 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); @@ -105,10 +118,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty) 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; } @@ -116,7 +129,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty) // 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); @@ -132,8 +145,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); @@ -143,11 +156,12 @@ Buffer * newFile(string const & filename, string const & templatename, } } - if (!isNamed) { - b->setUnnamed(); - b->setFileName(filename); - } else + 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->setReadonly(false); b->setFullyLoaded(true); @@ -160,7 +174,9 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix, string const & templatename) { static map file_number; + static Mutex mutex; + Mutex::Locker locker(&mutex); FileName filename; do { @@ -169,88 +185,7 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix, } while (theBufferList().exists(filename) || filename.isReadableFile()); - return newFile(filename.absFilename(), templatename, false); -} - - -/* - * 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(); - } - - return count; -} - - -int countChars(DocIterator const & from, DocIterator const & to, - bool with_blanks) -{ - 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; - } - } - dit.forwardPos(); - } - - return chars + blanks; + return newFile(filename.absFileName(), templatename, false); } @@ -258,15 +193,15 @@ Buffer * loadIfNeeded(FileName const & fname) { Buffer * buffer = theBufferList().getBuffer(fname); if (!buffer) { - if (!fname.exists()) + if (!fname.exists() && !LyXVC::fileInVC(fname)) return 0; - buffer = theBufferList().newBuffer(fname.absFilename()); + buffer = theBufferList().newBuffer(fname.absFileName()); if (!buffer) // Buffer creation is not possible. return 0; - if (!buffer->loadLyXFile(fname)) { + if (buffer->loadLyXFile() != Buffer::ReadSuccess) { //close the buffer we just opened theBufferList().release(buffer); return 0;