X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.C;h=fd2f26a7fc2a8044c49e28374b09a16ed1a6a3a3;hb=b9aa557b359463dfb0a2132b665570c8d1e5d605;hp=58cd9d84a3b4f0726f80c4291d9404a0292a125f;hpb=8c93f63b48a1b15d4f3e163b7305213f2f73879e;p=lyx.git

diff --git a/src/session.C b/src/session.C
index 58cd9d84a3..fd2f26a7fc 100644
--- a/src/session.C
+++ b/src/session.C
@@ -23,7 +23,9 @@
 #include <algorithm>
 #include <iterator>
 
+using lyx::support::absolutePath;
 using lyx::support::addName;
+using lyx::support::FileName;
 using lyx::support::package;
 
 namespace fs = boost::filesystem;
@@ -33,14 +35,14 @@ 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;
 
-namespace lyx{
-
 namespace {
 
 string const sec_lastfiles = "[recent files]";
@@ -48,35 +50,70 @@ string const sec_lastfilepos = "[cursor positions]";
 string const sec_lastopened = "[last opened files]";
 string const sec_bookmarks = "[bookmarks]";
 string const sec_session = "[session info]";
-int const id_lastfiles = 0;
-int const id_lastfilepos = 1;
-int const id_lastopened = 2;
-int const id_bookmarks = 3;
-int const id_session = 4;
+string const sec_toolbars = "[toolbars]";
 
 } // anon namespace
 
 
-Session::Session(unsigned int num) :
+namespace lyx {
+
+LastFilesSection::LastFilesSection(unsigned int num) :
 	default_num_last_files(4),
-	absolute_max_last_files(100),
-	num_lastfilepos(100)
+	absolute_max_last_files(100)
 {
 	setNumberOfLastFiles(num);
-	// locate the session file
-	// note that the session file name 'session' is hard-coded
-	session_file = addName(package().user_support(), "session");
-	//
-	readFile();
 }
 
 
-void Session::setNumberOfLastFiles(unsigned int no)
+void LastFilesSection::read(istream & is)
+{
+	string tmp;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+		if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp))
+			continue;
+		
+		// read lastfiles
+		FileName const file(tmp);
+		if (fs::exists(file.toFilesystemEncoding()) &&
+		    !fs::is_directory(file.toFilesystemEncoding()) &&
+		    lastfiles.size() < num_lastfiles)
+			lastfiles.push_back(file);
+		else 
+			lyxerr[Debug::INIT] << "LyX: Warning: Ignore last file: " << tmp << endl;
+	} while (is.good());
+}
+
+
+void LastFilesSection::write(ostream & os) const
+{
+	os << '\n' << sec_lastfiles << '\n';
+	copy(lastfiles.begin(), lastfiles.end(),
+	     ostream_iterator<FileName>(os, "\n"));
+}
+
+
+void LastFilesSection::add(FileName const & file)
+{
+	// If file already exist, delete it and reinsert at front.
+	LastFiles::iterator it = find(lastfiles.begin(), lastfiles.end(), file);
+	if (it != lastfiles.end())
+		lastfiles.erase(it);
+	lastfiles.push_front(file);
+	if (lastfiles.size() > num_lastfiles)
+		lastfiles.pop_back();
+}
+
+
+void LastFilesSection::setNumberOfLastFiles(unsigned int no)
 {
 	if (0 < no && no <= absolute_max_last_files)
 		num_lastfiles = no;
 	else {
-		lyxerr << "LyX: session: too many last files\n"
+		lyxerr[Debug::INIT] << "LyX: session: too many last files\n"
 		       << "\tdefault (=" << default_num_last_files
 		       << ") used." << endl;
 		num_lastfiles = default_num_last_files;
@@ -84,188 +121,295 @@ void Session::setNumberOfLastFiles(unsigned int no)
 }
 
 
-void Session::readFile()
+void LastOpenedSection::read(istream & is)
 {
-	// we will not complain if we can't find session_file nor will
-	// we issue a warning. (Lgb)
-	ifstream ifs(session_file.c_str());
 	string tmp;
-	int section = -1;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+		if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp))
+			continue;
 
-	// the following is currently not implemented very
-	// robustly. (Manually editing of the session file may crash lyx)
-	//
-	while (getline(ifs, tmp)) {
-		// Ignore comments, empty line or line stats with ' '
+		FileName const file(tmp);
+		if (fs::exists(file.toFilesystemEncoding()) &&
+		    !fs::is_directory(file.toFilesystemEncoding()))
+			lastopened.push_back(file);
+		else
+			lyxerr[Debug::INIT] << "LyX: Warning: Ignore last opened file: " << tmp << endl;
+	} while (is.good());
+}
+
+
+void LastOpenedSection::write(ostream & os) const
+{
+	os << '\n' << sec_lastopened << '\n';
+	copy(lastopened.begin(), lastopened.end(),
+	     ostream_iterator<FileName>(os, "\n"));
+}
+
+
+void LastOpenedSection::add(FileName const & file)
+{
+	lastopened.push_back(file);
+}
+
+
+void LastOpenedSection::clear()
+{
+	lastopened.clear();
+}
+
+
+void LastFilePosSection::read(istream & is)
+{
+	string tmp;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
 		if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
 			continue;
 
-		// Determine section id
-		if (tmp == sec_lastfiles) {
-			section = id_lastfiles;
-		} else if (tmp == sec_lastfilepos) {
-			section = id_lastfilepos;
-		} else if (tmp == sec_lastopened) {
-			section = id_lastopened;
-		} else if (tmp == sec_bookmarks) {
-			section = id_bookmarks;
-		} else if (tmp == sec_session) {
-			section = id_session;
-		} else if (section == id_lastfiles) {
-			// read lastfiles
-			if (!fs::exists(tmp) || lastfiles.size() >= num_lastfiles)
-				continue;
-			lastfiles.push_back(tmp);
-		} else if (section == id_lastfilepos) {
+		try {
 			// read lastfilepos
 			// pos, file\n
-			lyx::pit_type pit;
-			lyx::pos_type pos;
+			pit_type pit;
+			pos_type pos;
 			string fname;
 			istringstream itmp(tmp);
 			itmp >> pit;
 			itmp.ignore(2);  // ignore ", "
 			itmp >> pos;
 			itmp.ignore(2);  // ignore ", "
-			itmp >> fname;
-			if (!fs::exists(fname) || lastfilepos.size() >= num_lastfilepos)
-				continue;
-			lastfilepos[fname] = boost::tie(pit, pos);
-		} else if (section == id_lastopened) {
-			// read lastopened
-			// files
-			if (!fs::exists(tmp))
+			getline(itmp, fname);
+			if (!absolutePath(fname))
 				continue;
-			lastopened.push_back(tmp);
-		} else if (section == id_bookmarks) {
+			FileName const file(fname);
+			if (fs::exists(file.toFilesystemEncoding()) &&
+			    !fs::is_directory(file.toFilesystemEncoding()) &&
+			    lastfilepos.size() < num_lastfilepos)
+				lastfilepos[file] = boost::tie(pit, pos);
+			else
+				lyxerr[Debug::INIT] << "LyX: Warning: Ignore pos of last file: " << fname << endl;
+		} catch (...) {
+			lyxerr[Debug::INIT] << "LyX: Warning: unknown pos of last file: " << tmp << endl;
+		}
+	} while (is.good());
+}
+
+
+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.get<0>() << ", "
+		    << file->second.get<1>() << ", "
+		    << file->first << '\n';
+	}
+}
+
+
+void LastFilePosSection::save(FileName const & fname, FilePos pos)
+{
+	lastfilepos[fname] = 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;
+	// Not found, return the first paragraph
+	else
+		return 0;
+}
+
+
+void BookmarksSection::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 bookmarks
-			// bookmarkid, id, pos, file\n
-			unsigned int num;
-			unsigned int id;
-			lyx::pos_type pos;
+			// pit, pos, file\n
+			pit_type pit;
+			pos_type pos;
 			string fname;
 			istringstream itmp(tmp);
-			itmp >> num;
-			itmp.ignore(2);  // ignore ", "
-			itmp >> id;
+			itmp >> pit;
 			itmp.ignore(2);  // ignore ", "
 			itmp >> pos;
 			itmp.ignore(2);  // ignore ", "
-			itmp >> fname;
+			getline(itmp, fname);
+			if (!absolutePath(fname))
+				continue;
+			FileName const file(fname);
 			// only load valid bookmarks
-			if (fs::exists(fname))
-				bookmarks.push_back(boost::tie(num, fname, id, pos));
-		} else if (section == id_session) {
-			// Read session info, saved as key/value pairs
-			// would better yell if pos returns npos
-			string::size_type pos = tmp.find_first_of(" = ");
-			string key = tmp.substr(0, pos);
-			string value = tmp.substr(pos + 3);
-			sessioninfo[key] = value;
+			if (fs::exists(file.toFilesystemEncoding()) &&
+			    !fs::is_directory(file.toFilesystemEncoding()) &&
+			    bookmarks.size() < max_bookmarks)
+				bookmarks.push_back(Bookmark(file, pit, 0, pos));
+			else
+				lyxerr[Debug::INIT] << "LyX: Warning: Ignore bookmark of file: " << fname << endl;
+		} catch (...) {
+			lyxerr[Debug::INIT] << "LyX: Warning: unknown Bookmark info: " << tmp << endl;
 		}
+	} while (is.good());
+}
+
+
+void BookmarksSection::write(ostream & os) const
+{
+	os << '\n' << sec_bookmarks << '\n';
+	for (size_t i = 0; i < bookmarks.size(); ++i) {
+		os << bookmarks[i].par_pit << ", "
+		   << bookmarks[i].par_pos << ", "
+		   << bookmarks[i].filename << '\n';
 	}
 }
 
 
-void Session::writeFile() const
+void BookmarksSection::save(FileName const & fname, pit_type par_pit, int par_id, pos_type par_pos, bool persistent)
 {
-	ofstream ofs(session_file.c_str());
-	if (ofs) {
-		ofs << "## Automatically generated lyx session file \n"
-		    << "## Editing this file manually may cause lyx to crash.\n";
-		// first section
-		ofs << '\n' << sec_lastfiles << '\n';
-		copy(lastfiles.begin(), lastfiles.end(),
-		     ostream_iterator<string>(ofs, "\n"));
-		// second section
-		ofs << '\n' << sec_lastfilepos << '\n';
-		for (FilePosMap::const_iterator file = lastfilepos.begin();
-			file != lastfilepos.end(); ++file) {
-			ofs << file->second.get<0>() << ", "
-			    << file->second.get<1>() << ", "
-			    << file->first << '\n';
-		}
-		// third section
-		ofs << '\n' << sec_lastopened << '\n';
-		copy(lastopened.begin(), lastopened.end(),
-		     ostream_iterator<string>(ofs, "\n"));
-		// fourth section
-		ofs << '\n' << sec_bookmarks << '\n';
-		for (BookmarkList::const_iterator bm = bookmarks.begin();
-			bm != bookmarks.end(); ++bm) {
-			// save bookmark number, id, pos, fname
-			ofs << bm->get<0>() << ", "
-				<< bm->get<2>() << ", "
-				<< bm->get<3>() << ", "
-				<< bm->get<1>() << '\n';
-		}
-		// fifth section
-		ofs << '\n' << sec_session << '\n';
-		for (MiscInfo::const_iterator val = sessioninfo.begin();
-			val != sessioninfo.end(); ++val) {
-			ofs << val->first << " = " << val->second << '\n';
+	if (persistent) {
+		bookmarks.push_back(Bookmark(fname, par_pit, par_id, par_pos));
+		if (bookmarks.size() > max_bookmarks)
+			bookmarks.pop_back();
 		}
-	} else
-		lyxerr << "LyX: Warning: unable to save Session: "
-		       << session_file << endl;
+	else
+		temp_bookmark = Bookmark(fname, par_pit, par_id, par_pos);
 }
 
 
-void Session::addLastFile(string const & file)
+bool BookmarksSection::isValid(unsigned int i) const
 {
-	// If file already exist, delete it and reinsert at front.
-	LastFiles::iterator it = find(lastfiles.begin(), lastfiles.end(), file);
-	if (it != lastfiles.end())
-		lastfiles.erase(it);
-	lastfiles.push_front(file);
-	if (lastfiles.size() > num_lastfiles)
-		lastfiles.pop_back();
+	if (i == 0)
+		return !temp_bookmark.filename.empty();
+	else
+		return i <= bookmarks.size() && !bookmarks[i-1].filename.empty();
 }
 
 
-void Session::saveFilePosition(string const & fname, FilePos pos)
+BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) const
 {
-	lastfilepos[fname] = pos;
+	if (i == 0)
+		return temp_bookmark;
+	else
+		return bookmarks[i-1];
 }
 
 
-Session::FilePos Session::loadFilePosition(string const & fname) const
+void ToolbarSection::read(istream & is)
 {
-	FilePosMap::const_iterator entry = lastfilepos.find(fname);
-	// Has position information, return it.
-	if (entry != lastfilepos.end())
-		return entry->second;
-	// Not found, return the first paragraph
-	else
-		return 0;
+	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;
+				istringstream value(tmp.substr(pos + 3));
+				value >> state;
+				value.ignore(1); // ignore " "
+				value >> location;
+				toolbars[key] = ToolbarInfo(state, location);
+			} 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());
 }
 
 
-void Session::clearLastOpenedFiles()
+void ToolbarSection::write(ostream & os) const
 {
-	lastopened.clear();
+	os << '\n' << sec_toolbars << '\n';
+	for (ToolbarMap::const_iterator tb = toolbars.begin();
+		tb != toolbars.end(); ++tb) {
+		os << tb->first << " = "
+		  << static_cast<int>(tb->second.state) << " "
+		  << static_cast<int>(tb->second.location) << '\n';
+	}
 }
 
 
-void Session::setLastOpenedFiles(vector<string> const & files)
+ToolbarSection::ToolbarInfo & ToolbarSection::load(string const & name)
 {
-	lastopened = files;
+	return toolbars[name];
 }
 
 
-void Session::saveBookmark(Bookmark const & bookmark)
+void SessionInfoSection::read(istream & is)
 {
-	bookmarks.push_back(bookmark);
+	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);
+				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;
+		}
+	} while (is.good());
 }
 
 
-void Session::saveSessionInfo(string const & key, string const & value)
+void SessionInfoSection::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';
+	}
+}
+
+
+void SessionInfoSection::save(string const & key, string const & value)
 {
 	sessioninfo[key] = value;
 }
 
 
-string const Session::loadSessionInfo(string const & key, bool release)
+string const SessionInfoSection::load(string const & key, bool release)
 {
 	MiscInfo::const_iterator pos = sessioninfo.find(key);
 	string value;
@@ -276,4 +420,65 @@ string const Session::loadSessionInfo(string const & key, bool release)
 	return value;
 }
 
+
+Session::Session(unsigned int num) :
+	last_files(num)
+{
+	// locate the session file
+	// note that the session file name 'session' is hard-coded
+	session_file = FileName(addName(package().user_support(), "session"));
+	//
+	readFile();
+}
+
+
+void Session::readFile()
+{
+	// we will not complain if we can't find session_file nor will
+	// we issue a warning. (Lgb)
+	ifstream is(session_file.toFilesystemEncoding().c_str());
+	string tmp;
+
+	while (getline(is, tmp)) {
+		// Ignore comments, empty line or line stats with ' '
+		if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
+			continue;
+
+		// Determine section id
+		if (tmp == sec_lastfiles)
+			lastFiles().read(is);
+		else if (tmp == sec_lastopened)
+			lastOpened().read(is);
+		else if (tmp == sec_lastfilepos)
+			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
+			lyxerr[Debug::INIT] << "LyX: Warning: unknown Session section: " << tmp << endl;
+	}
+}
+
+
+void Session::writeFile() const
+{
+	ofstream os(session_file.toFilesystemEncoding().c_str());
+	if (os) {
+		os << "## Automatically generated lyx session file \n"
+		    << "## Editing this file manually may cause lyx to crash.\n";
+
+		lastFiles().write(os);
+		lastOpened().write(os);
+		lastFilePos().write(os);
+		bookmarks().write(os);
+		toolbars().write(os);
+		sessionInfo().write(os);
+	} else
+		lyxerr[Debug::INIT] << "LyX: Warning: unable to save Session: "
+		       << session_file << endl;
+}
+
 }