string const sec_lastfilepos = "[cursor positions]";
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]";
+string const sec_authfiles = "[auth files]";
+string const sec_shellescape = "[shell escape files]";
+// currently unused:
+//string const sec_session = "[session info]";
+//string const sec_toolbars = "[toolbars]";
-} // anon namespace
+} // namespace
namespace lyx {
-
LastFilesSection::LastFilesSection(unsigned int num) :
default_num_last_files(4),
absolute_max_last_files(100)
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);
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();
}
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());
}
void LastOpenedSection::write(ostream & os) const
{
os << '\n' << sec_lastopened << '\n';
- copy(lastopened.begin(), lastopened.end(),
- ostream_iterator<FileName>(os, "\n"));
+ for (auto const & last : lastopened)
+ os << last.active << ", " << last.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 (auto const & last : lastopened) {
+ if (last.file_name == file)
+ return;
+ }
+ lastopened.push_back(lof);
}
itmp >> filepos.pos;
itmp.ignore(2); // ignore ", "
getline(itmp, fname);
- FileName const file(fname);
- if (!file.isAbsolute())
+ if (!FileName::isAbsolute(fname))
continue;
- if (file.exists() && !file.isDirectory()
+ filepos.file = FileName(fname);
+ if (filepos.file.exists() && !filepos.file.isDirectory()
&& lastfilepos.size() < num_lastfilepos)
- lastfilepos[file] = filepos;
+ lastfilepos.push_back(filepos);
else
LYXERR(Debug::INIT, "LyX: Warning: Ignore pos of last file: " << fname);
} catch (...) {
void LastFilePosSection::write(ostream & os) const
{
os << '\n' << sec_lastfilepos << '\n';
- for (FilePosMap::const_iterator file = lastfilepos.begin();
- file != lastfilepos.end(); ++file) {
- os << file->second.pit << ", " << file->second.pos << ", "
- << file->first << '\n';
- }
+ for (auto const & file_p : lastfilepos)
+ os << file_p.pit << ", " << file_p.pos << ", " << file_p.file << '\n';
}
-void LastFilePosSection::save(FileName const & fname, FilePos const & pos)
+void LastFilePosSection::save(FilePos const & pos)
{
- lastfilepos[fname] = pos;
+ // Remove element if it was already present. Iterating should
+ // not be a problem since the list is small (<100 elements).
+ for (FilePosList::iterator it = lastfilepos.begin();
+ it != lastfilepos.end(); ++it)
+ if (it->file == pos.file) {
+ lastfilepos.erase(it);
+ break;
+ }
+
+ // insert new element at front.
+ lastfilepos.push_front(pos);
}
LastFilePosSection::FilePos LastFilePosSection::load(FileName const & fname) const
{
- FilePosMap::const_iterator entry = lastfilepos.find(fname);
- // Has position information, return it.
- if (entry != lastfilepos.end())
- return entry->second;
+ for (auto const & fp : lastfilepos)
+ if (fp.file == fname)
+ // Has position information, return it.
+ return fp;
+
// Not found, return the first paragraph
return FilePos();
}
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)
+ if (file.exists() && !file.isDirectory() && idx < bookmarks.size())
bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);
else
LYXERR(Debug::INIT, "LyX: Warning: Ignore bookmark of file: " << fname);
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 < bookmarks.size(); ++i) {
if (isValid(i))
os << i << ", "
<< bookmarks[i].bottom_pit << ", "
int top_id, pos_type top_pos, unsigned int idx)
{
// silently ignore bookmarks when idx is out of range
- if (idx <= max_bookmarks)
+ if (idx < bookmarks.size())
bookmarks[idx] = Bookmark(fname, bottom_pit, bottom_pos, top_id, top_pos);
}
bool BookmarksSection::isValid(unsigned int i) const
{
- return i <= max_bookmarks && !bookmarks[i].filename.empty();
+ return i < bookmarks.size() && !bookmarks[i].filename.empty();
}
bool BookmarksSection::hasValid() const
{
- for (size_t i = 1; i <= size(); ++i) {
+ for (size_t i = 1; i < bookmarks.size(); ++i) {
if (isValid(i))
return true;
}
}
+BookmarksSection::BookmarkPosList
+BookmarksSection::bookmarksInPar(FileName const & fn, int const par_id) const
+{
+ // FIXME: we do not consider the case of bottom_pit.
+ // This is probably not a problem.
+ BookmarksSection::BookmarkPosList bip;
+ for (size_t i = 1; i < bookmarks.size(); ++i)
+ if (bookmarks[i].filename == fn && bookmarks[i].top_id == par_id)
+ bip.push_back({i, bookmarks[i].top_pos});
+
+ return bip;
+}
+
+
+void BookmarksSection::adjustPosAfterPos(FileName const & fn,
+ int const par_id, pos_type pos, int offset)
+{
+ for (Bookmark & bkm : bookmarks)
+ if (bkm.filename == fn && bkm.top_id == par_id && bkm.top_pos > pos)
+ bkm.top_pos += offset;
+}
+
+
LastCommandsSection::LastCommandsSection(unsigned int num) :
default_num_last_commands(30),
absolute_max_last_commands(100)
setNumberOfLastCommands(num);
}
-
+
void LastCommandsSection::read(istream & is)
{
string tmp;
}
-void LastCommandsSection::add(std::string const & string)
+void LastCommandsSection::add(std::string const & command)
{
- lastcommands.push_back(string);
+ // remove traces of 'command' in history using the erase-remove idiom
+ // https://en.wikipedia.org/wiki/Erase%E2%80%93remove_idiom
+ lastcommands.erase(remove(lastcommands.begin(), lastcommands.end(), command),
+ lastcommands.end());
+ // add it at the end of the list.
+ lastcommands.push_back(command);
}
{
// 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();
}
bookmarks().read(is);
else if (tmp == sec_lastcommands)
lastCommands().read(is);
+ else if (tmp == sec_authfiles)
+ authFiles().read(is);
+ else if (tmp == sec_shellescape)
+ shellescapeFiles().read(is);
else
LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
lastFilePos().write(os);
lastCommands().write(os);
bookmarks().write(os);
+ authFiles().write(os);
+ shellescapeFiles().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"));
+}
+
+
+bool AuthFilesSection::find(string const & name) const
+{
+ return auth_files_.find(name) != auth_files_.end();
+}
+
+
+void AuthFilesSection::insert(string const & name)
+{
+ auth_files_.insert(name);
+}
+
+
+void ShellEscapeSection::read(istream & is)
+{
+ string s;
+ do {
+ char c = is.peek();
+ if (c == '[')
+ break;
+ getline(is, s);
+ if (s.empty() || s[0] == '#' || s[0] == ' ' || !FileName::isAbsolute(s))
+ continue;
+
+ // read shellescape files
+ FileName const file(s.substr(0, s.length() - 2));
+ if (file.exists() && !file.isDirectory())
+ shellescape_files_.insert(s);
+ else
+ LYXERR(Debug::INIT, "LyX: Warning: Ignore shellescape file: " << file);
+ } while (is.good());
}
+
+
+void ShellEscapeSection::write(ostream & os) const
+{
+ os << '\n' << sec_shellescape << '\n';
+ copy(shellescape_files_.begin(), shellescape_files_.end(),
+ ostream_iterator<std::string>(os, "\n"));
+}
+
+
+bool ShellEscapeSection::find(string const & name) const
+{
+ if (shellescape_files_.find(name + ",0") != shellescape_files_.end())
+ return true;
+
+ return findAuth(name);
+}
+
+
+bool ShellEscapeSection::findAuth(string const & name) const
+{
+ return shellescape_files_.find(name + ",1") != shellescape_files_.end();
+}
+
+
+void ShellEscapeSection::insert(string const & name, bool auth)
+{
+ set<string>::iterator it;
+ string const name0 = name + ",0";
+ string const name1 = name + ",1";
+
+ if (auth) {
+ it = shellescape_files_.find(name0);
+ if (it != shellescape_files_.end())
+ shellescape_files_.erase(it);
+ shellescape_files_.insert(name1);
+ } else {
+ it = shellescape_files_.find(name1);
+ if (it != shellescape_files_.end())
+ shellescape_files_.erase(it);
+ shellescape_files_.insert(name0);
+ }
+}
+
+
+void ShellEscapeSection::remove(string const & name)
+{
+ set<string>::iterator it = shellescape_files_.find(name + ",0");
+ if (it == shellescape_files_.end())
+ it = shellescape_files_.find(name + ",1");
+ if (it != shellescape_files_.end())
+ shellescape_files_.erase(it);
+}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff