X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=ff6eeb49ac50f8c4bdfdf252ff3b0d18edee65dd;hb=2bb86211292f416cd584023feb23dc3b86bc1761;hp=2481bd6c895d55a492a724952fb6f637bef4a9ed;hpb=d6546c2bf40ff7e72c6ba13ebd08de67bba43952;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 2481bd6c89..ff6eeb49ac 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1,85 +1,107 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyx_cb.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- *	    Copyright 1995 Matthias Ettrich,
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "lyx_cb.h"
-#include "lyx_main.h"
+
 #include "buffer.h"
 #include "bufferlist.h"
-#include "bufferview_funcs.h"
+#include "BufferView.h"
+#include "cursor.h"
 #include "debug.h"
+#include "gettext.h"
 #include "lastfiles.h"
+#include "LaTeXFeatures.h"
+#include "lyx_main.h"
+#include "lyxlayout.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
-#include "gettext.h"
-#include "BufferView.h"
+#include "paragraph.h"
 
-#include "insets/insetlabel.h"
-
-#include "frontends/lyx_gui.h"
-#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 #include "frontends/FileDialog.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
 
-#include "support/FileInfo.h"
+#include "support/filefilterlist.h"
 #include "support/filetools.h"
 #include "support/forkedcall.h"
+#include "support/fs_extras.h"
+#include "support/lyxlib.h"
+#include "support/package.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/lstrings.h"
 
-#include "support/BoostFormat.h"
+#if !defined (HAVE_FORK)
+# define fork() -1
+#endif
+
+#include <boost/shared_ptr.hpp>
+#include <boost/filesystem/operations.hpp>
 
-#include <fstream>
-#include <algorithm>
-#include <utility>
 #include <cerrno>
+#include <fstream>
 
-using std::vector;
-using std::ifstream;
+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;
+
+using boost::shared_ptr;
+
+namespace fs = boost::filesystem;
+
+using std::back_inserter;
 using std::copy;
 using std::endl;
+using std::make_pair;
+using std::string;
+using std::ifstream;
 using std::ios;
-using std::back_inserter;
 using std::istream_iterator;
-using std::pair;
-using std::make_pair;
+
 
 extern BufferList bufferlist;
 // this should be static, but I need it in buffer.C
 bool quitting;	// flag, that we are quitting the program
 
 
-void ShowMessage(Buffer const * buf,
-		 string const & msg1,
-		 string const & msg2,
-		 string const & msg3)
-{
-	if (lyx_gui::use_gui
-	    && buf && buf->getUser() && buf->getUser()->owner()) {
-			string const str = msg1 + ' ' + msg2 + ' ' + msg3;
-			buf->getUser()->owner()->message(str);
-	} else
-		lyxerr << msg1 << msg2 << msg3 << endl;
-}
-
-
 //
 // Menu callbacks
 //
 
-bool MenuWrite(BufferView * bv, Buffer * buffer)
+bool MenuWrite(Buffer * buffer)
 {
 	if (buffer->save()) {
-		lastfiles->newFile(buffer->fileName());
+		LyX::ref().lastfiles().newFile(buffer->fileName());
 		return true;
 	}
 
@@ -87,25 +109,19 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
 
 	string const file = MakeDisplayPath(buffer->fileName(), 30);
 
-#if USE_BOOST_FORMAT
-	boost::format fmt(_("The document %1$s could not be saved.\n\nDo you want to rename the document and try again?"));
-	fmt % file;
-	string text = fmt.str();
-#else
-	string text = _("The document ");
-	text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?");
-#endif
+	string 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"));
 
 	if (ret == 0)
-		return WriteAs(bv, buffer);
+		return WriteAs(buffer);
 	return false;
 }
 
 
 
-bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
+bool WriteAs(Buffer * buffer, string const & filename)
 {
 	string fname = buffer->fileName();
 	string const oldname = fname;
@@ -122,10 +138,12 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 		if (!IsLyXFilename(fname))
 			fname += ".lyx";
 
+		FileFilterList const filter (_("LyX Documents (*.lyx)"));
+
 		FileDialog::Result result =
 			fileDlg.save(OnlyPath(fname),
-				       _("*.lyx| LyX Documents (*.lyx)"),
-				       OnlyFilename(fname));
+				     filter,
+				     OnlyFilename(fname));
 
 		if (result.first == FileDialog::Later)
 			return false;
@@ -142,18 +160,10 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 	} else
 		fname = filename;
 
-	FileInfo const myfile(fname);
-	if (myfile.isOK()) {
+	if (fs::exists(fname)) {
 		string const file = MakeDisplayPath(fname, 30);
-
-#if USE_BOOST_FORMAT
-		boost::format fmt(_("The document %1$s already exists.\n\nDo you want to over-write that document?"));
-		fmt % file;
-		string text = fmt.str();
-#else
-		string text = _("The document ");
-		text += file + _(" already exists.\n\nDo you want to over-write that document?");
-#endif
+		string 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"));
 
@@ -167,7 +177,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 	bool unnamed = buffer->isUnnamed();
 	buffer->setUnnamed(false);
 
-	if (!MenuWrite(bv, buffer)) {
+	if (!MenuWrite(buffer)) {
 		buffer->setFileName(oldname);
 		buffer->setUnnamed(unnamed);
 		return false;
@@ -178,15 +188,15 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 }
 
 
-void QuitLyX()
+void QuitLyX(bool noask)
 {
 	lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
 	if (lyx_gui::use_gui) {
-		if (!bufferlist.quitWriteAll())
+		if (!noask && !bufferlist.quitWriteAll())
 			return;
 
-		lastfiles->writeFile(lyxrc.lastfiles);
+		LyX::cref().lastfiles().writeFile(lyxrc.lastfiles);
 	}
 
 	// Set a flag that we do quitting from the program,
@@ -197,17 +207,13 @@ void QuitLyX()
 	bufferlist.closeAll();
 
 	// do any other cleanup procedures now
-	lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
+	lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
 
-	if (destroyDir(system_tempdir) != 0) {
-#if USE_BOOST_FORMAT
-		boost::format fmt = _("Could not remove the temporary directory %1$s");
-		fmt % system_tempdir;
-		string msg = fmt.str();
-#else
-		string msg = _("Could not remove the temporary directory ") + system_tempdir;
-#endif
-		Alert::warning(_("Could not remove temporary directory"), msg);
+	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();
@@ -222,8 +228,9 @@ public:
 	AutoSaveBuffer(BufferView & bv, string const & fname)
 		: bv_(bv), fname_(fname) {}
 	///
-	virtual ForkedProcess * clone() const {
-		return new AutoSaveBuffer(*this);
+	virtual shared_ptr<ForkedProcess> clone() const
+	{
+		return shared_ptr<ForkedProcess>(new AutoSaveBuffer(*this));
 	}
 	///
 	int start();
@@ -238,12 +245,8 @@ private:
 
 int AutoSaveBuffer::start()
 {
-#if USE_BOOST_FORMAT
-	command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
-#else
-	command_ = _("Auto-saving ") + fname_;
-#endif
-	return runNonBlocking();
+	command_ = bformat(_("Auto-saving %1$s"), fname_);
+	return run(DontWait);
 }
 
 
@@ -260,16 +263,16 @@ int AutoSaveBuffer::generateChild()
 		// anyway.
 		bool failed = false;
 
-		string const tmp_ret = lyx::tempName(string(), "lyxauto");
+		string const tmp_ret = tempName(string(), "lyxauto");
 		if (!tmp_ret.empty()) {
 			bv_.buffer()->writeFile(tmp_ret);
 			// assume successful write of tmp_ret
-			if (!lyx::rename(tmp_ret, fname_)) {
+			if (!rename(tmp_ret, fname_)) {
 				failed = true;
 				// most likely couldn't move between filesystems
 				// unless write of tmp_ret failed
 				// so remove tmp file (if it exists)
-				lyx::unlink(tmp_ret);
+				unlink(tmp_ret);
 			}
 		} else {
 			failed = true;
@@ -330,7 +333,7 @@ void AutoSave(BufferView * bv)
 // create new file with template
 // SERVERCMD !
 //
-Buffer * NewFile(string const & filename)
+void NewFile(BufferView * bv, string const & filename)
 {
 	// Split argument by :
 	string name;
@@ -348,11 +351,7 @@ Buffer * NewFile(string const & filename)
 			    << "\nName is " << name
 			    << "\nTemplate is " << tmpname << endl;
 
-	// find a free buffer
-	Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
-	if (tmpbuf)
-		lastfiles->newFile(tmpbuf->fileName());
-	return tmpbuf;
+	bv->newFile(name, tmpname);
 }
 
 
@@ -366,19 +365,14 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 	if (tmpstr.empty())
 		return;
 
-	// insert the string
-	bv->hideCursor();
-
 	// clear the selection
-	bool flag = (bv->text == bv->getLyXText());
-	if (flag)
-		bv->beforeChange(bv->text);
-	if (!asParagraph)
-		bv->getLyXText()->insertStringAsLines(tmpstr);
+	if (bv->text() == bv->getLyXText())
+		bv->cursor().clearSelection();
+	if (asParagraph)
+		bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
 	else
-		bv->getLyXText()->insertStringAsParagraphs(tmpstr);
-	if (flag)
-		bv->update(BufferView::SELECT);
+		bv->getLyXText()->insertStringAsLines(bv->cursor(), tmpstr);
+	bv->update();
 }
 
 
@@ -391,7 +385,9 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 		FileDialog fileDlg(_("Select file to insert"),
 			(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
 
-		FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath());
+		FileDialog::Result result =
+			fileDlg.open(bv->owner()->buffer()->filePath(),
+				     FileFilterList(), string());
 
 		if (result.first == FileDialog::Later)
 			return string();
@@ -402,21 +398,11 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 			return string();
 	}
 
-	FileInfo fi(fname);
-
-	if (!fi.readable()) {
+	if (!fs::is_readable(fname)) {
 		string const error = strerror(errno);
 		string const file = MakeDisplayPath(fname, 50);
-#if USE_BOOST_FORMAT
-		boost::format fmt(_("Could not read the specified document\n%1$s\ndue to the error: %2$s"));
-		fmt % file;
-		fmt % error;
-		string text = fmt.str();
-#else
-		string text = _("Could not read the specified document\n");
-		text += file + _(" due to the error: ");
-		text += error;
-#endif
+		string 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();
 	}
@@ -425,16 +411,8 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 	if (!ifs) {
 		string const error = strerror(errno);
 		string const file = MakeDisplayPath(fname, 50);
-#if USE_BOOST_FORMAT
-		boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s"));
-		fmt % file;
-		fmt % error;
-		string text = fmt.str();
-#else
-		string text = _("Could not open the specified document\n");
-		text += file + _(" due to the error: ");
-		text += error;
-#endif
+		string 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();
 	}
@@ -444,7 +422,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 	istream_iterator<char> end;
 #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
 	// We use this until the compilers get better...
-	vector<char> tmp;
+	std::vector<char> tmp;
 	copy(ii, end, back_inserter(tmp));
 	string const tmpstr(tmp.begin(), tmp.end());
 #else
@@ -460,46 +438,6 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 }
 
 
-string const getPossibleLabel(BufferView const & bv)
-{
-	Paragraph * par = &*bv.getLyXText()->cursor.par();
-	LyXLayout_ptr layout = par->layout();
-	if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
-		Paragraph * par2 = par->previous();
-
-		LyXLayout_ptr const & layout2 = par2->layout();
-
-		if (layout2->latextype != LATEX_PARAGRAPH) {
-			par = par2;
-			layout = layout2;
-		}
-	}
-
-	string text = layout->latexname().substr(0, 3);
-	if (layout->latexname() == "theorem")
-		text = "thm"; // Create a correct prefix for prettyref
-
-	text += ':';
-	if (layout->latextype == LATEX_PARAGRAPH ||
-	    lyxrc.label_init_length < 0)
-		text.erase();
-
-	string par_text = par->asString(bv.buffer(), false);
-	for (int i = 0; i < lyxrc.label_init_length; ++i) {
-		if (par_text.empty())
-			break;
-		string head;
-		par_text = split(par_text, head, ' ');
-		if (i > 0)
-			text += '-'; // Is it legal to use spaces in
-		// labels ?
-		text += head;
-	}
-
-	return text;
-}
-
-
 // This function runs "configure" and then rereads lyx.defaults to
 // reconfigure the automatic settings.
 void Reconfigure(BufferView * bv)
@@ -507,16 +445,20 @@ void Reconfigure(BufferView * bv)
 	bv->owner()->message(_("Running configure..."));
 
 	// Run configure in user lyx directory
-	Path p(user_lyxdir);
+	Path p(package().user_support());
+	string const configure_script =
+		AddName(package().system_support(), "configure");
+	string const configure_command = "sh " + QuoteName(configure_script);
 	Systemcall one;
-	one.startscript(Systemcall::Wait,
-			AddName(system_lyxdir, "configure"));
+	one.startscript(Systemcall::Wait, configure_command);
 	p.pop();
 	bv->owner()->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"
+		"You need to restart LyX to make use of any\n"
 		"updated document class specifications."));
 }