X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.C;h=4372d610e89401a6ca975bfd045235df8442e222;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=1d1b92e0dd3e55b2c978b8047fd0f334ef305224;hpb=34770cd68bdc30b0685cdf2cfbae9463ef1747c5;p=lyx.git

diff --git a/src/session.C b/src/session.C
index 1d1b92e0dd..4372d610e8 100644
--- a/src/session.C
+++ b/src/session.C
@@ -33,14 +33,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,30 +48,58 @@ 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);
+		// read lastfiles
+		if (!fs::exists(tmp) || lastfiles.size() >= num_lastfiles)
+			continue;
+		lastfiles.push_back(tmp);
+	} while (is.good());
+}
+
+
+void LastFilesSection::write(ostream & os) const
+{
+	os << '\n' << sec_lastfiles << '\n';
+	copy(lastfiles.begin(), lastfiles.end(),
+	     ostream_iterator<string>(os, "\n"));
+}
+
+
+void LastFilesSection::add(string 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;
@@ -84,152 +112,86 @@ 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;
-
-	// 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 ' '
-		if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+		if (!fs::exists(tmp))
 			continue;
+		lastopened.push_back(tmp);
+	} while (is.good());
+}
 
-		// 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) {
-			// read lastfilepos
-			// pos, file\n
-			lyx::pit_type pit;
-			lyx::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))
-				continue;
-			lastopened.push_back(tmp);
-		} else if (section == id_bookmarks) {
-			// read bookmarks
-			// bookmarkid, id, pos, file\n
-			unsigned int num;
-			unsigned int id;
-			lyx::pos_type pos;
-			string fname;
-			istringstream itmp(tmp);
-			itmp >> num;
-			itmp.ignore(2);  // ignore ", "
-			itmp >> id;
-			itmp.ignore(2);  // ignore ", "
-			itmp >> pos;
-			itmp.ignore(2);  // ignore ", "
-			itmp >> 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;
-		}
-	}
+
+void LastOpenedSection::write(ostream & os) const
+{
+	os << '\n' << sec_lastopened << '\n';
+	copy(lastopened.begin(), lastopened.end(),
+	     ostream_iterator<string>(os, "\n"));
 }
 
 
-void Session::writeFile() const
+void LastOpenedSection::add(string const & file)
 {
-	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';
-		}
-	} else
-		lyxerr << "LyX: Warning: unable to save Session: "
-		       << session_file << endl;
+	lastopened.push_back(file);
 }
 
 
-void Session::addLastFile(string const & file)
+void LastOpenedSection::clear()
 {
-	// 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();
+	lastopened.clear();
+}
+
+
+void LastFilePosSection::read(istream & is)
+{
+	string tmp;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+		// read lastfilepos
+		// pos, file\n
+		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);
+	} while (is.good());
 }
 
 
-void Session::saveFilePosition(string const & fname, FilePos pos)
+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(string const & fname, FilePos pos)
 {
 	lastfilepos[fname] = pos;
 }
 
 
-Session::FilePos Session::loadFilePosition(string const & fname) const
+LastFilePosSection::FilePos LastFilePosSection::load(string const & fname) const
 {
 	FilePosMap::const_iterator entry = lastfilepos.find(fname);
 	// Has position information, return it.
@@ -241,31 +203,155 @@ Session::FilePos Session::loadFilePosition(string const & fname) const
 }
 
 
-void Session::clearLastOpenedFiles()
+void BookmarksSection::read(istream & is)
 {
-	lastopened.clear();
+	string tmp;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+		// read bookmarks
+		// id, pos, file\n
+		unsigned int id;
+		pos_type pos;
+		string fname;
+		istringstream itmp(tmp);
+		itmp >> id;
+		itmp.ignore(2);  // ignore ", "
+		itmp >> pos;
+		itmp.ignore(2);  // ignore ", "
+		itmp >> fname;
+		// only load valid bookmarks
+		if (bookmarks.size() < max_bookmarks && fs::exists(fname))
+			bookmarks.push_back(Bookmark(fname, id, pos));
+	} while (is.good());
 }
 
 
-void Session::addLastOpenedFile(string const & file)
+void BookmarksSection::write(ostream & os) const
 {
-	lastopened.push_back(file);
+	os << '\n' << sec_bookmarks << '\n';
+	for (size_t i = 0; i < bookmarks.size(); ++i) {
+		os << bookmarks[i].par_id << ", "
+		   << bookmarks[i].par_pos << ", "
+		   << bookmarks[i].filename << '\n';
+	}
 }
 
 
-void Session::saveBookmark(Bookmark const & bookmark)
+void BookmarksSection::save(std::string const & fname, int par_id, pos_type par_pos, bool persistent)
 {
-	bookmarks.push_back(bookmark);
+	if (persistent) {
+		bookmarks.push_front(Bookmark(fname, par_id, par_pos));
+		if (bookmarks.size() > max_bookmarks)
+			bookmarks.pop_back();
+		}
+	else
+		temp_bookmark = Bookmark(fname, par_id, par_pos);
+}
+
+
+bool BookmarksSection::isValid(unsigned int i) const
+{
+	// i == 0, or in the queue
+	return i <= bookmarks.size();
+}
+
+
+BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) const
+{
+	if (i == 0)
+		return temp_bookmark;
+	else
+		return bookmarks[i-1];
+}
+
+
+void ToolbarSection::read(istream & is)
+{
+	string tmp;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+
+		// 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);
+		}
+	} while (is.good());
+}
+
+
+void ToolbarSection::write(ostream & os) const
+{
+	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';
+	}
+}
+
+
+ToolbarSection::ToolbarInfo & ToolbarSection::load(string const & name)
+{
+	return toolbars[name];
+}
+
+
+void SessionInfoSection::read(istream & is)
+{
+	string tmp;
+	do {
+		char c = is.peek();
+		if (c == '[')
+			break;
+		getline(is, tmp);
+
+		// 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;
+		}
+	} while (is.good());
+}
+
+
+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 Session::saveSessionInfo(string const & key, string const & value)
+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 +362,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 = 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.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 << "LyX: Warning: unknown Session section: " << tmp << endl;
+	}
+}
+
+
+void Session::writeFile() const
+{
+	ofstream os(session_file.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 << "LyX: Warning: unable to save Session: "
+		       << session_file << endl;
+}
+
 }