#include <config.h>
#include "Session.h"
-#include "debug.h"
-#include "support/Package.h"
-#include "support/filetools.h"
-#include <boost/filesystem/operations.hpp>
+#include "support/debug.h"
+#include "support/filetools.h"
+#include "support/Package.h"
#include <fstream>
#include <sstream>
#include <algorithm>
#include <iterator>
-using lyx::support::absolutePath;
-using lyx::support::addName;
-using lyx::support::FileName;
-using lyx::support::package;
-
-namespace fs = boost::filesystem;
-
-using std::vector;
-using std::getline;
-using std::string;
-using std::ifstream;
-using std::ofstream;
-using std::istream;
-using std::ostream;
-using std::endl;
-using std::istringstream;
-using std::copy;
-using std::find;
-using std::ostream_iterator;
+using namespace std;
+using namespace lyx::support;
namespace {
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]";
-} // anon namespace
+} // namespace
namespace lyx {
if (c == '[')
break;
getline(is, tmp);
- if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp))
+ if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
continue;
// read lastfiles
FileName const file(tmp);
- if (file.exists() &&
- !fs::is_directory(file.toFilesystemEncoding()) &&
- lastfiles.size() < num_lastfiles)
+ if (file.exists() && !file.isDirectory()
+ && lastfiles.size() < num_lastfiles)
lastfiles.push_back(file);
else
- LYXERR(Debug::INIT) << "LyX: Warning: Ignore last file: " << tmp << endl;
+ LYXERR(Debug::INIT, "LyX: Warning: Ignore last file: " << tmp);
} while (is.good());
}
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 (0 < no && no <= absolute_max_last_files)
num_lastfiles = no;
else {
- LYXERR(Debug::INIT) << "LyX: session: too many last files\n"
- << "\tdefault (=" << default_num_last_files
- << ") used." << endl;
+ LYXERR(Debug::INIT, "LyX: session: too many last files\n"
+ << "\tdefault (=" << default_num_last_files << ") used.");
num_lastfiles = default_num_last_files;
}
}
if (c == '[')
break;
getline(is, tmp);
- if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp))
+ if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ')
continue;
- FileName const file(tmp);
- if (file.exists() &&
- !fs::is_directory(file.toFilesystemEncoding()))
- lastopened.push_back(file);
- else
- LYXERR(Debug::INIT) << "LyX: Warning: Ignore last opened file: " << tmp << endl;
+ 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 (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);
}
try {
// read lastfilepos
// pos, file\n
- pit_type pit;
- pos_type pos;
+ FilePos filepos;
string fname;
istringstream itmp(tmp);
- itmp >> pit;
+ itmp >> filepos.pit;
itmp.ignore(2); // ignore ", "
- itmp >> pos;
+ itmp >> filepos.pos;
itmp.ignore(2); // ignore ", "
getline(itmp, fname);
- if (!absolutePath(fname))
+ if (!FileName::isAbsolute(fname))
continue;
FileName const file(fname);
- if (file.exists() &&
- !fs::is_directory(file.toFilesystemEncoding()) &&
- lastfilepos.size() < num_lastfilepos)
- lastfilepos[file] = boost::tie(pit, pos);
+ if (file.exists() && !file.isDirectory()
+ && lastfilepos.size() < num_lastfilepos)
+ lastfilepos[file] = filepos;
else
- LYXERR(Debug::INIT) << "LyX: Warning: Ignore pos of last file: " << fname << endl;
+ LYXERR(Debug::INIT, "LyX: Warning: Ignore pos of last file: " << fname);
} catch (...) {
- LYXERR(Debug::INIT) << "LyX: Warning: unknown pos of last file: " << tmp << endl;
+ LYXERR(Debug::INIT, "LyX: Warning: unknown pos of last file: " << tmp);
}
} while (is.good());
}
os << '\n' << sec_lastfilepos << '\n';
for (FilePosMap::const_iterator file = lastfilepos.begin();
file != lastfilepos.end(); ++file) {
- os << file->second.get<0>() << ", "
- << file->second.get<1>() << ", "
- << file->first << '\n';
+ os << file->second.pit << ", " << file->second.pos << ", "
+ << file->first << '\n';
}
}
-void LastFilePosSection::save(FileName const & fname, FilePos pos)
+void LastFilePosSection::save(FileName const & fname, FilePos const & pos)
{
lastfilepos[fname] = pos;
}
if (entry != lastfilepos.end())
return entry->second;
// Not found, return the first paragraph
- else
- return 0;
+ return FilePos();
}
itmp >> pos;
itmp.ignore(2); // ignore ", "
getline(itmp, fname);
- if (!absolutePath(fname))
+ if (!FileName::isAbsolute(fname))
continue;
FileName const file(fname);
// only load valid bookmarks
- if (file.exists() &&
- !fs::is_directory(file.toFilesystemEncoding()) &&
- idx <= max_bookmarks)
+ if (file.exists() && !file.isDirectory() && idx <= max_bookmarks)
bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);
else
- LYXERR(Debug::INIT) << "LyX: Warning: Ignore bookmark of file: " << fname << endl;
+ LYXERR(Debug::INIT, "LyX: Warning: Ignore bookmark of file: " << fname);
} catch (...) {
- LYXERR(Debug::INIT) << "LyX: Warning: unknown Bookmark info: " << tmp << endl;
+ LYXERR(Debug::INIT, "LyX: Warning: unknown Bookmark info: " << tmp);
}
} while (is.good());
}
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 << ", "
}
-void BookmarksSection::save(FileName const & fname, pit_type bottom_pit, pos_type bottom_pos,
+void BookmarksSection::save(FileName const & fname,
+ pit_type bottom_pit, pos_type bottom_pos,
int top_id, pos_type top_pos, unsigned int idx)
{
// silently ignore bookmarks when idx is out of range
}
-BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) const
-{
- return bookmarks[i];
-}
-
-
-void ToolbarSection::read(istream & is)
-{
- string tmp;
- do {
- char c = is.peek();
- if (c == '[')
- break;
- getline(is, tmp);
- 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);
- int state;
- int location;
- int posx;
- int posy;
- istringstream value(tmp.substr(pos + 3));
- value >> state;
- value >> location;
- value >> posx;
- value >> posy;
- toolbars.push_back(boost::make_tuple(key, ToolbarInfo(state, location, posx, posy)));
- } else
- LYXERR(Debug::INIT) << "LyX: Warning: Ignore toolbar info: " << tmp << endl;
- } catch (...) {
- LYXERR(Debug::INIT) << "LyX: Warning: unknown Toolbar info: " << tmp << endl;
- }
- } while (is.good());
- // sort the toolbars by location, line and position
- std::sort(toolbars.begin(), toolbars.end());
-}
-
-
-void ToolbarSection::write(ostream & os) const
+bool BookmarksSection::hasValid() const
{
- os << '\n' << sec_toolbars << '\n';
- for (ToolbarList::const_iterator tb = toolbars.begin();
- tb != toolbars.end(); ++tb) {
- os << tb->get<0>() << " = "
- << static_cast<int>(tb->get<1>().state) << " "
- << static_cast<int>(tb->get<1>().location) << " "
- << tb->get<1>().posx << " "
- << tb->get<1>().posy << '\n';
+ for (size_t i = 1; i <= size(); ++i) {
+ if (isValid(i))
+ return true;
}
+ return false;
}
-ToolbarSection::ToolbarInfo & ToolbarSection::load(string const & name)
+BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) const
{
- for (ToolbarList::iterator tb = toolbars.begin();
- tb != toolbars.end(); ++tb)
- if (tb->get<0>() == name)
- return tb->get<1>();
- // add a new item
- toolbars.push_back(boost::make_tuple(name, ToolbarSection::ToolbarInfo()));
- return toolbars.back().get<1>();
+ return bookmarks[i];
}
-bool operator<(ToolbarSection::ToolbarItem const & a, ToolbarSection::ToolbarItem const & b)
+LastCommandsSection::LastCommandsSection(unsigned int num) :
+ default_num_last_commands(30),
+ absolute_max_last_commands(100)
{
- ToolbarSection::ToolbarInfo lhs = a.get<1>();
- ToolbarSection::ToolbarInfo rhs = b.get<1>();
- // on if before off
- if (lhs.state != rhs.state)
- return static_cast<int>(lhs.state) < static_cast<int>(rhs.state);
- // order of dock does not really matter
- if (lhs.location != rhs.location)
- return static_cast<int>(lhs.location) < static_cast<int>(rhs.location);
- // if the same dock, the order depends on position
- if (lhs.location == ToolbarSection::ToolbarInfo::TOP ||
- lhs.location == ToolbarSection::ToolbarInfo::BOTTOM)
- return lhs.posy < rhs.posy || (lhs.posy == rhs.posy && lhs.posx < rhs.posx);
- else if (lhs.location == ToolbarSection::ToolbarInfo::LEFT ||
- lhs.location == ToolbarSection::ToolbarInfo::RIGHT)
- return lhs.posx < rhs.posx || (lhs.posx == rhs.posx && lhs.posy < rhs.posy);
- else
- return true;
+ setNumberOfLastCommands(num);
}
-void SessionInfoSection::read(istream & is)
+void LastCommandsSection::read(istream & is)
{
string tmp;
do {
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 << endl;
- } catch (...) {
- LYXERR(Debug::INIT) << "LyX: Warning: unknown Session info: " << tmp << endl;
- }
+ lastcommands.push_back(tmp);
} while (is.good());
}
-void SessionInfoSection::write(ostream & os) const
+void LastCommandsSection::write(ostream & os) const
+{
+ os << '\n' << sec_lastcommands << '\n';
+ copy(lastcommands.begin(), lastcommands.end(),
+ ostream_iterator<std::string>(os, "\n"));
+}
+
+
+void LastCommandsSection::setNumberOfLastCommands(unsigned int no)
{
- os << '\n' << sec_session << '\n';
- for (MiscInfo::const_iterator val = sessioninfo.begin();
- val != sessioninfo.end(); ++val) {
- os << val->first << " = " << val->second << '\n';
+ 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();
}
lastFilePos().read(is);
else if (tmp == sec_bookmarks)
bookmarks().read(is);
- else if (tmp == sec_toolbars)
- toolbars().read(is);
- else if (tmp == sec_session)
- sessionInfo().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 << endl;
+ LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
}
}
lastFiles().write(os);
lastOpened().write(os);
lastFilePos().write(os);
+ lastCommands().write(os);
bookmarks().write(os);
- toolbars().write(os);
- sessionInfo().write(os);
+ authFiles().write(os);
+ shellescapeFiles().write(os);
} else
- LYXERR(Debug::INIT) << "LyX: Warning: unable to save Session: "
- << session_file << endl;
+ 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
+{
+ if (auth_files_.find(name) != auth_files_.end())
+ return true;
+
+ return false;
+}
+
+
+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
+{
+ if (shellescape_files_.find(name + ",1") != shellescape_files_.end())
+ return true;
+
+ return false;
+}
+
+
+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