X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=7f39bd6be354456b9ef49ef4788302181becce84;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=f09d2f6b73b87de539420c485d2052b792ddac90;hpb=da640391fc82fab25708a074d54ee4dce1fe26e7;p=lyx.git

diff --git a/src/Session.cpp b/src/Session.cpp
index f09d2f6b73..7f39bd6be3 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,6 +33,7 @@ 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
 
@@ -56,11 +57,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);
@@ -110,14 +111,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 +143,15 @@ 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);
+	lastopened.push_back(lof);
 }
 
 
@@ -164,9 +183,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 +260,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);
@@ -285,14 +304,80 @@ 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];
 }
 
 
-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
@@ -323,6 +408,9 @@ void Session::readFile()
 			lastFilePos().read(is);
 		else if (tmp == sec_bookmarks)
 			bookmarks().read(is);
+		else if (tmp == sec_lastcommands)
+			lastCommands().read(is);
+
 		else
 			LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
 	}
@@ -339,6 +427,7 @@ void Session::writeFile() const
 		lastFiles().write(os);
 		lastOpened().write(os);
 		lastFilePos().write(os);
+		lastCommands().write(os);
 		bookmarks().write(os);
 	} else
 		LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "