X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=d437e107b35f9a3103be3a8561aa4969fa47314c;hb=b01a9dc187d9cd396a57463ad27511379dcdc9cd;hp=74ce3ad71341607c06704f9196754bf6da93e6fd;hpb=da65e2b7fbe29c5bca2812a56d5bbdb7efb702e5;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 74ce3ad713..d437e107b3 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -19,7 +19,9 @@
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView.h"
+#include "buffer_funcs.h"
 #include "cursor.h"
+#include "CutAndPaste.h"
 #include "debug.h"
 #include "gettext.h"
 #include "session.h"
@@ -29,10 +31,11 @@
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "paragraph.h"
+#include "undo.h"
 
 #include "frontends/Alert.h"
+#include "frontends/Application.h"
 #include "frontends/FileDialog.h"
-#include "frontends/lyx_gui.h"
 #include "frontends/LyXView.h"
 
 #include "support/filefilterlist.h"
@@ -54,29 +57,30 @@
 #include <cerrno>
 #include <fstream>
 
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::destroyDir;
-using lyx::support::FileFilterList;
-using lyx::support::ForkedProcess;
-using lyx::support::isLyXFilename;
-using lyx::support::libFileSearch;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::Path;
-using lyx::support::package;
-using lyx::support::quoteName;
-using lyx::support::removeAutosaveFile;
-using lyx::support::rename;
-using lyx::support::split;
-using lyx::support::Systemcall;
-using lyx::support::tempName;
-using lyx::support::unlink;
+
+namespace lyx {
+
+using support::bformat;
+using support::FileFilterList;
+using support::FileName;
+using support::ForkedProcess;
+using support::isLyXFilename;
+using support::libFileSearch;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::package;
+using support::removeAutosaveFile;
+using support::rename;
+using support::split;
+using support::Systemcall;
+using support::tempName;
+using support::unlink;
 
 using boost::shared_ptr;
 
+namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 
 using std::back_inserter;
@@ -89,11 +93,9 @@ using std::ios;
 using std::istream_iterator;
 
 
-extern BufferList bufferlist;
 // this should be static, but I need it in buffer.C
 bool quitting;	// flag, that we are quitting the program
 
-
 //
 // Menu callbacks
 //
@@ -101,16 +103,16 @@ bool quitting;	// flag, that we are quitting the program
 bool menuWrite(Buffer * buffer)
 {
 	if (buffer->save()) {
-		LyX::ref().session().addLastFile(buffer->fileName());
+		LyX::ref().session().lastFiles().add(FileName(buffer->fileName()));
 		return true;
 	}
 
 	// FIXME: we don't tell the user *WHY* the save failed !!
 
-	string const file = makeDisplayPath(buffer->fileName(), 30);
+	docstring const file = makeDisplayPath(buffer->fileName(), 30);
 
-	string text = bformat(_("The document %1$s could not be saved.\n\n"
-		"Do you want to rename the document and try again?"), file);
+	docstring text = bformat(_("The document %1$s could not be saved.\n\n"
+					     "Do you want to rename the document and try again?"), file);
 	int const ret = Alert::prompt(_("Rename and save?"),
 		text, 0, 1, _("&Rename"), _("&Cancel"));
 
@@ -121,19 +123,18 @@ bool menuWrite(Buffer * buffer)
 
 
 
-bool writeAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & newname)
 {
 	string fname = buffer->fileName();
 	string const oldname = fname;
 
-	if (filename.empty()) {
+	if (newname.empty()) {
 
+		// FIXME UNICODE
 		FileDialog fileDlg(_("Choose a filename to save document as"),
 			LFUN_BUFFER_WRITE_AS,
-			make_pair(string(_("Documents|#o#O")),
-				  string(lyxrc.document_path)),
-			make_pair(string(_("Templates|#T#t")),
-				  string(lyxrc.template_path)));
+			make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
+			make_pair(_("Templates|#T#t"), from_utf8(lyxrc.template_path)));
 
 		if (!isLyXFilename(fname))
 			fname += ".lyx";
@@ -141,29 +142,30 @@ bool writeAs(Buffer * buffer, string const & filename)
 		FileFilterList const filter (_("LyX Documents (*.lyx)"));
 
 		FileDialog::Result result =
-			fileDlg.save(onlyPath(fname),
+			fileDlg.save(from_utf8(onlyPath(fname)),
 				     filter,
-				     onlyFilename(fname));
+				     from_utf8(onlyFilename(fname)));
 
 		if (result.first == FileDialog::Later)
 			return false;
 
-		fname = result.second;
+		fname = to_utf8(result.second);
 
 		if (fname.empty())
 			return false;
 
 		// Make sure the absolute filename ends with appropriate suffix
-		fname = makeAbsPath(fname);
+		fname = makeAbsPath(fname).absFilename();
 		if (!isLyXFilename(fname))
 			fname += ".lyx";
 	} else
-		fname = filename;
+		fname = newname;
 
-	if (fs::exists(fname)) {
-		string const file = makeDisplayPath(fname, 30);
-		string text = bformat(_("The document %1$s already exists.\n\n"
-			"Do you want to over-write that document?"), file);
+	FileName const filename(fname);
+	if (fs::exists(filename.toFilesystemEncoding())) {
+		docstring const file = makeDisplayPath(fname, 30);
+		docstring text = bformat(_("The document %1$s already exists.\n\n"
+						     "Do you want to over-write that document?"), file);
 		int const ret = Alert::prompt(_("Over-write document?"),
 			text, 0, 1, _("&Over-write"), _("&Cancel"));
 
@@ -188,44 +190,12 @@ bool writeAs(Buffer * buffer, string const & filename)
 }
 
 
-void quitLyX(bool noask)
-{
-	lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
-
-	if (lyx_gui::use_gui) {
-		if (!noask && !bufferlist.quitWriteAll())
-			return;
-
-		LyX::cref().session().writeFile();
-	}
-
-	// Set a flag that we do quitting from the program,
-	// so no refreshes are necessary.
-	quitting = true;
-
-	// close buffers first
-	bufferlist.closeAll();
-
-	// do any other cleanup procedures now
-	lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
-
-	if (!destroyDir(package().temp_dir())) {
-		string const msg =
-			bformat(_("Unable to remove the temporary directory %1$s"),
-			package().temp_dir());
-		Alert::warning(_("Unable to remove temporary directory"), msg);
-	}
-
-	lyx_gui::exit();
-}
-
-
 namespace {
 
 class AutoSaveBuffer : public ForkedProcess {
 public:
 	///
-	AutoSaveBuffer(BufferView & bv, string const & fname)
+	AutoSaveBuffer(BufferView & bv, FileName const & fname)
 		: bv_(bv), fname_(fname) {}
 	///
 	virtual shared_ptr<ForkedProcess> clone() const
@@ -239,13 +209,13 @@ private:
 	virtual int generateChild();
 	///
 	BufferView & bv_;
-	string fname_;
+	FileName fname_;
 };
 
 
 int AutoSaveBuffer::start()
 {
-	command_ = bformat(_("Auto-saving %1$s"), fname_);
+	command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_.absFilename())));
 	return run(DontWait);
 }
 
@@ -263,7 +233,7 @@ int AutoSaveBuffer::generateChild()
 		// anyway.
 		bool failed = false;
 
-		string const tmp_ret = tempName(string(), "lyxauto");
+		FileName const tmp_ret(tempName(FileName(), "lyxauto"));
 		if (!tmp_ret.empty()) {
 			bv_.buffer()->writeFile(tmp_ret);
 			// assume successful write of tmp_ret
@@ -284,7 +254,8 @@ int AutoSaveBuffer::generateChild()
 				// It is dangerous to do this in the child,
 				// but safe in the parent, so...
 				if (pid == -1)
-					bv_.owner()->message(_("Autosave failed!"));
+					// emit message signal.
+					bv_.buffer()->message(_("Autosave failed!"));
 			}
 		}
 		if (pid == 0) { // we are the child so...
@@ -301,16 +272,17 @@ void autoSave(BufferView * bv)
 	// should probably be moved into BufferList (Lgb)
 	// Perfect target for a thread...
 {
-	if (!bv->available())
+	if (!bv->buffer())
 		return;
 
 	if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
 		// We don't save now, but we'll try again later
-		bv->owner()->resetAutosaveTimer();
+		bv->buffer()->resetAutosaveTimers();
 		return;
 	}
 
-	bv->owner()->message(_("Autosaving current document..."));
+	// emit message signal.
+	bv->buffer()->message(_("Autosaving current document..."));
 
 	// create autosave filename
 	string fname = bv->buffer()->filePath();
@@ -318,11 +290,11 @@ void autoSave(BufferView * bv)
 	fname += onlyFilename(bv->buffer()->fileName());
 	fname += '#';
 
-	AutoSaveBuffer autosave(*bv, fname);
+	AutoSaveBuffer autosave(*bv, FileName(fname));
 	autosave.start();
 
 	bv->buffer()->markBakClean();
-	bv->owner()->resetAutosaveTimer();
+	bv->buffer()->resetAutosaveTimers();
 }
 
 
@@ -338,81 +310,74 @@ void newFile(BufferView * bv, string const & filename)
 	// Split argument by :
 	string name;
 	string tmpname = split(filename, name, ':');
-#ifdef __EMX__ // Fix me! lyx_cb.C may not be low level enough to allow this.
-	if (name.length() == 1
-	    && isalpha(static_cast<unsigned char>(name[0]))
-	    && (prefixIs(tmpname, "/") || prefixIs(tmpname, "\\"))) {
-		name += ':';
-		name += token(tmpname, ':', 0);
-		tmpname = split(tmpname, ':');
-	}
-#endif
 	lyxerr[Debug::INFO] << "Arg is " << filename
 			    << "\nName is " << name
 			    << "\nTemplate is " << tmpname << endl;
 
-	bv->newFile(name, tmpname);
+	Buffer * const b = newFile(name, tmpname);
+	if (b)
+		bv->setBuffer(b);
 }
 
 
-// Insert ascii file (if filename is empty, prompt for one)
-void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+// Insert plain text file (if filename is empty, prompt for one)
+void insertPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
 {
-	if (!bv->available())
+	if (!bv->buffer())
 		return;
 
-	string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph);
+	// FIXME: We don't know the encoding of the file
+	docstring const tmpstr = from_utf8(getContentsOfPlaintextFile(bv, f, asParagraph));
 	if (tmpstr.empty())
 		return;
 
-	// clear the selection
-	if (bv->text() == bv->getLyXText())
-		bv->cursor().clearSelection();
+	LCursor & cur = bv->cursor();
+	cap::replaceSelection(cur);
+	recordUndo(cur);
 	if (asParagraph)
-		bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
+		cur.innerText()->insertStringAsParagraphs(cur, tmpstr);
 	else
-		bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr);
-	bv->update();
+		cur.innerText()->insertStringAsLines(cur, tmpstr);
 }
 
 
-// Insert ascii file (if filename is empty, prompt for one)
-string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+// Read plain text file (if filename is empty, prompt for one)
+string getContentsOfPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
 {
-	string fname = f;
+	FileName fname(f);
 
 	if (fname.empty()) {
 		FileDialog fileDlg(_("Select file to insert"),
-			(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
+			(asParagraph) ? LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT);
 
 		FileDialog::Result result =
-			fileDlg.open(bv->owner()->buffer()->filePath(),
-				     FileFilterList(), string());
+			fileDlg.open(from_utf8(bv->buffer()->filePath()),
+				     FileFilterList(), docstring());
 
 		if (result.first == FileDialog::Later)
 			return string();
 
-		fname = result.second;
+		fname = makeAbsPath(to_utf8(result.second));
 
 		if (fname.empty())
 			return string();
 	}
 
-	if (!fs::is_readable(fname)) {
-		string const error = strerror(errno);
-		string const file = makeDisplayPath(fname, 50);
-		string const text = bformat(_("Could not read the specified document\n"
-			"%1$s\ndue to the error: %2$s"), file, error);
+	if (!fs::is_readable(fname.toFilesystemEncoding())) {
+		docstring const error = from_ascii(strerror(errno));
+		docstring const file = makeDisplayPath(fname.absFilename(), 50);
+		docstring const text = bformat(_("Could not read the specified document\n"
+							   "%1$s\ndue to the error: %2$s"), file, error);
 		Alert::error(_("Could not read file"), text);
 		return string();
 	}
 
-	ifstream ifs(fname.c_str());
+	ifstream ifs(fname.toFilesystemEncoding().c_str());
 	if (!ifs) {
-		string const error = strerror(errno);
-		string const file = makeDisplayPath(fname, 50);
-		string const text = bformat(_("Could not open the specified document\n"
-			"%1$s\ndue to the error: %2$s"), file, error);
+		docstring const error = from_ascii(strerror(errno));
+		docstring const file = makeDisplayPath(fname.absFilename(), 50);
+		docstring const text = bformat(_("Could not open the specified document\n"
+							   "%1$s\ndue to the error: %2$s"), file, error);
 		Alert::error(_("Could not open file"), text);
 		return string();
 	}
@@ -440,23 +405,28 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 // This function runs "configure" and then rereads lyx.defaults to
 // reconfigure the automatic settings.
-void reconfigure(BufferView * bv)
+void reconfigure(LyXView & lv)
 {
-	bv->owner()->message(_("Running configure..."));
+	// emit message signal.
+	lv.message(_("Running configure..."));
 
 	// Run configure in user lyx directory
-	Path p(package().user_support());
+	support::Path p(package().user_support());
 	string const configure_command = package().configure_command();
 	Systemcall one;
 	one.startscript(Systemcall::Wait, configure_command);
 	p.pop();
-	bv->owner()->message(_("Reloading configuration..."));
+	// emit message signal.
+	lv.message(_("Reloading configuration..."));
 	lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
 	// Re-read packages.lst
 	LaTeXFeatures::getAvailable();
 
 	Alert::information(_("System reconfigured"),
-		_("The system has been reconfigured.\n"
-		"You need to restart LyX to make use of any\n"
-		"updated document class specifications."));
+			   _("The system has been reconfigured.\n"
+					  "You need to restart LyX to make use of any\n"
+					  "updated document class specifications."));
 }
+
+
+} // namespace lyx