X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=6cdf1f724842558011503954a8b084eba43299f5;hb=0ce10160daadc904ab1221eaeef0d005694f0f0c;hp=8bd1bc92de9f4e043c8d4eeffd8068d398c0defd;hpb=7bb8a5f183808b2801df176b8626dccb282f97d4;p=lyx.git diff --git a/src/Session.cpp b/src/Session.cpp index 8bd1bc92de..6cdf1f7248 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Bo Peng * * Full author contact details are available in file CREDITS. @@ -33,13 +33,13 @@ string const sec_lastopened = "[last opened files]"; string const sec_bookmarks = "[bookmarks]"; string const sec_session = "[session info]"; string const sec_toolbars = "[toolbars]"; +string const sec_lastcommands = "[last commands]"; } // anon namespace namespace lyx { - LastFilesSection::LastFilesSection(unsigned int num) : default_num_last_files(4), absolute_max_last_files(100) @@ -56,11 +56,11 @@ void LastFilesSection::read(istream & is) if (c == '[') break; getline(is, tmp); - FileName const file(tmp); - if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute()) + if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp)) continue; // read lastfiles + FileName const file(tmp); if (file.exists() && !file.isDirectory() && lastfiles.size() < num_lastfiles) lastfiles.push_back(file); @@ -84,7 +84,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(); } @@ -110,14 +110,31 @@ void LastOpenedSection::read(istream & is) if (c == '[') break; getline(is, tmp); - FileName const file(tmp); - if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute()) + if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ') continue; - 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()); } @@ -125,14 +142,15 @@ void LastOpenedSection::read(istream & is) void LastOpenedSection::write(ostream & os) const { os << '\n' << sec_lastopened << '\n'; - copy(lastopened.begin(), lastopened.end(), - ostream_iterator(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); + lastopened.push_back(lof); } @@ -164,9 +182,9 @@ void LastFilePosSection::read(istream & is) itmp >> filepos.pos; itmp.ignore(2); // ignore ", " getline(itmp, fname); - FileName const file(fname); - if (!file.isAbsolute()) + if (!FileName::isAbsolute(fname)) continue; + FileName const file(fname); if (file.exists() && !file.isDirectory() && lastfilepos.size() < num_lastfilepos) lastfilepos[file] = filepos; @@ -241,9 +259,9 @@ void BookmarksSection::read(istream & is) itmp >> pos; itmp.ignore(2); // ignore ", " getline(itmp, fname); - FileName const file(fname); - if (!file.isAbsolute()) + if (!FileName::isAbsolute(fname)) continue; + FileName const file(fname); // only load valid bookmarks if (file.exists() && !file.isDirectory() && idx <= max_bookmarks) bookmarks[idx] = Bookmark(file, pit, pos, 0, 0); @@ -259,7 +277,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 << ", " @@ -285,13 +303,31 @@ bool BookmarksSection::isValid(unsigned int i) const } +bool BookmarksSection::hasValid() const +{ + for (size_t i = 1; i <= size(); ++i) { + if (isValid(i)) + return true; + } + return false; +} + + BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) const { return bookmarks[i]; } -void SessionInfoSection::read(istream & is) +LastCommandsSection::LastCommandsSection(unsigned int num) : + default_num_last_commands(30), + absolute_max_last_commands(100) +{ + setNumberOfLastCommands(num); +} + + +void LastCommandsSection::read(istream & is) { string tmp; do { @@ -302,58 +338,49 @@ void SessionInfoSection::read(istream & is) if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ') continue; - try { - // Read session info, saved as key/value pairs - // would better yell if pos returns npos - string::size_type pos = tmp.find_first_of(" = "); - // silently ignore lines without " = " - if (pos != string::npos) { - string key = tmp.substr(0, pos); - string value = tmp.substr(pos + 3); - sessioninfo[key] = value; - } else - LYXERR(Debug::INIT, "LyX: Warning: Ignore session info: " << tmp); - } catch (...) { - LYXERR(Debug::INIT, "LyX: Warning: unknown Session info: " << tmp); - } + lastcommands.push_back(tmp); } while (is.good()); } -void SessionInfoSection::write(ostream & os) const +void LastCommandsSection::write(ostream & os) const { - os << '\n' << sec_session << '\n'; - for (MiscInfo::const_iterator val = sessioninfo.begin(); - val != sessioninfo.end(); ++val) { - os << val->first << " = " << val->second << '\n'; + os << '\n' << sec_lastcommands << '\n'; + copy(lastcommands.begin(), lastcommands.end(), + ostream_iterator(os, "\n")); +} + + +void LastCommandsSection::setNumberOfLastCommands(unsigned int no) +{ + if (0 < no && no <= absolute_max_last_commands) + num_lastcommands = no; + else { + LYXERR(Debug::INIT, "LyX: session: too many last commands\n" + << "\tdefault (=" << default_num_last_commands << ") used."); + num_lastcommands = default_num_last_commands; } } -void SessionInfoSection::save(string const & key, string const & value) +void LastCommandsSection::add(std::string const & string) { - sessioninfo[key] = value; + lastcommands.push_back(string); } -string const SessionInfoSection::load(string const & key, bool release) +void LastCommandsSection::clear() { - MiscInfo::const_iterator pos = sessioninfo.find(key); - string value; - if (pos != sessioninfo.end()) - value = pos->second; - if (release) - sessioninfo.erase(key); - return value; + lastcommands.clear(); } -Session::Session(unsigned int num) : - last_files(num) +Session::Session(unsigned int num_last_files, unsigned int num_last_commands) : + last_files(num_last_files), last_commands(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(); } @@ -380,8 +407,9 @@ void Session::readFile() lastFilePos().read(is); else if (tmp == sec_bookmarks) bookmarks().read(is); - else if (tmp == sec_session) - sessionInfo().read(is); + else if (tmp == sec_lastcommands) + lastCommands().read(is); + else LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp); } @@ -398,8 +426,8 @@ void Session::writeFile() const lastFiles().write(os); lastOpened().write(os); lastFilePos().write(os); + lastCommands().write(os); bookmarks().write(os); - sessionInfo().write(os); } else LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: " << session_file);