X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=009bf39cf1ed2bdbae82bbc76903cfa3665a6335;hb=ffd175b99f4e7957c4be9eed04f5124a78f192d5;hp=1aaf9c4be99a5f41adf8ec1adce961f8888740e0;hpb=c51ae2651cc46d0133960b649092a1ea4ecbf72c;p=lyx.git

diff --git a/src/Session.cpp b/src/Session.cpp
index 1aaf9c4be9..009bf39cf1 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -33,13 +33,15 @@ 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]";
 
-} // anon namespace
+} // namespace
 
 
 namespace lyx {
 
-
 LastFilesSection::LastFilesSection(unsigned int num) :
 	default_num_last_files(4),
 	absolute_max_last_files(100)
@@ -56,11 +58,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 +86,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 +112,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 +144,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);
 }
 
 
@@ -164,9 +194,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 +271,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 +289,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 << ", "
@@ -301,12 +331,68 @@ BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) co
 }
 
 
-Session::Session(unsigned int num) :
-	last_files(num)
+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 {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+		if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
+			continue;
+
+		lastcommands.push_back(tmp);
+	} while (is.good());
+}
+
+
+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)
+{
+	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 LastCommandsSection::add(std::string const & string)
+{
+	lastcommands.push_back(string);
+}
+
+
+void LastCommandsSection::clear()
+{
+	lastcommands.clear();
+}
+
+
+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();
 }
@@ -333,6 +419,13 @@ void Session::readFile()
 			lastFilePos().read(is);
 		else if (tmp == sec_bookmarks)
 			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);
 	}
@@ -349,10 +442,139 @@ void Session::writeFile() const
 		lastFiles().write(os);
 		lastOpened().write(os);
 		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
+{
+	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);
+		c = s[0];
+		if (c == 0 || c == '#' || c == ' ' || !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