Account for old versions of Pygments

[lyx.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 591418e14963fdf540dea226739619e29cfc8543..310aa74c9b90760af8af76071c2cf5d471801c75 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -34,13 +34,13 @@ string const sec_bookmarks = "[bookmarks]";
 string const sec_session = "[session info]";
 string const sec_toolbars = "[toolbars]";
 string const sec_lastcommands = "[last commands]";
+string const sec_authfiles = "[auth files]";
 
 } // anon namespace
 
 
 namespace lyx {
 
-
 LastFilesSection::LastFilesSection(unsigned int num) :
        default_num_last_files(4),
        absolute_max_last_files(100)
@@ -85,7 +85,7 @@ void LastFilesSection::add(FileName const & file)
        LastFiles::iterator it = find(lastfiles.begin(), lastfiles.end(), file);
        if (it != lastfiles.end())
                lastfiles.erase(it);
-       lastfiles.push_front(file);
+       lastfiles.insert(lastfiles.begin(), file);
        if (lastfiles.size() > num_lastfiles)
                lastfiles.pop_back();
 }
@@ -111,14 +111,31 @@ void LastOpenedSection::read(istream & is)
                if (c == '[')
                        break;
                getline(is, tmp);
-               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
+               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ')
                        continue;
 
-               FileName const file(tmp);
-               if (file.exists() && !file.isDirectory())
-                       lastopened.push_back(file);
-               else
-                       LYXERR(Debug::INIT, "LyX: Warning: Ignore last opened file: " << tmp);
+               try {
+                       LastOpenedFile lof;
+                       istringstream itmp(tmp);
+                       itmp >> lof.active;
+                       itmp.ignore(2);  // ignore ", "
+                       string fname;
+                       getline(itmp, fname);
+                       if (!FileName::isAbsolute(fname))
+                               continue;
+
+                       FileName const file(fname);
+                       if (file.exists() && !file.isDirectory()) {
+                               lof.file_name = file;
+                               lastopened.push_back(lof);
+                       } else {
+                               LYXERR(Debug::INIT, 
+                                       "LyX: Warning: Ignore last opened file: " << tmp);
+                       }
+               } catch (...) {
+                       LYXERR(Debug::INIT,
+                               "LyX: Warning: unknown state of last opened file: " << tmp);
+               }
        } while (is.good());
 }
 
@@ -126,14 +143,25 @@ void LastOpenedSection::read(istream & is)
 void LastOpenedSection::write(ostream & os) const
 {
        os << '\n' << sec_lastopened << '\n';
-       copy(lastopened.begin(), lastopened.end(),
-            ostream_iterator<FileName>(os, "\n"));
+       for (size_t i = 0; i < lastopened.size(); ++i)
+               os << lastopened[i].active << ", " << lastopened[i].file_name << '\n';
 }
 
 
-void LastOpenedSection::add(FileName const & file)
+void LastOpenedSection::add(FileName const & file, bool active)
 {
-       lastopened.push_back(file);
+       LastOpenedFile lof(file, active);
+       // check if file is already recorded (this can happen
+       // with multiple buffer views). We do only record each
+       // file once, since we cannot restore multiple views
+       // currently, we even crash in some cases (see #9483).
+       // FIXME: Add session support for multiple views of
+       //        the same buffer (split-view etc.).
+       for (size_t i = 0; i < lastopened.size(); ++i) {
+               if (lastopened[i].file_name == file)
+                       return;
+       }
+       lastopened.push_back(lof);
 }
 
 
@@ -260,7 +288,7 @@ void BookmarksSection::read(istream & is)
 void BookmarksSection::write(ostream & os) const
 {
        os << '\n' << sec_bookmarks << '\n';
-       for (size_t i = 1; i <= max_bookmarks; ++i) {
+       for (size_t i = 0; i <= max_bookmarks; ++i) {
                if (isValid(i))
                        os << i << ", "
                           << bookmarks[i].bottom_pit << ", "
@@ -363,7 +391,7 @@ Session::Session(unsigned int num_last_files, unsigned int num_last_commands) :
 {
        // locate the session file
        // note that the session file name 'session' is hard-coded
-       session_file = FileName(addName(package().user_support().absFilename(), "session"));
+       session_file = FileName(addName(package().user_support().absFileName(), "session"));
        //
        readFile();
 }
@@ -392,6 +420,8 @@ void Session::readFile()
                        bookmarks().read(is);
                else if (tmp == sec_lastcommands)
                        lastCommands().read(is);
+               else if (tmp == sec_authfiles)
+                       authFiles().read(is);
 
                else
                        LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
@@ -411,9 +441,43 @@ void Session::writeFile() const
                lastFilePos().write(os);
                lastCommands().write(os);
                bookmarks().write(os);
+               authFiles().write(os);
        } else
                LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "
                       << session_file);
 }
 
+
+AuthFilesSection::AuthFilesSection() {  }
+
+
+void AuthFilesSection::read(istream & is)
+{
+       string tmp;
+       do {
+               char c = is.peek();
+               if (c == '[')
+                       break;
+               getline(is, tmp);
+               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
+                       continue;
+
+               // read lastfiles
+               FileName const file(tmp);
+               if (file.exists() && !file.isDirectory())
+                       auth_files_.insert(tmp);
+               else
+                       LYXERR(Debug::INIT, "LyX: Warning: Ignore auth file: " << tmp);
+       } while (is.good());
+}
+
+
+void AuthFilesSection::write(ostream & os) const
+{
+       os << '\n' << sec_authfiles << '\n';
+       copy(auth_files_.begin(), auth_files_.end(),
+            ostream_iterator<std::string>(os, "\n"));
+}
+
+
 }