/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich,
* Copyright 1995-2001 The LyX Team.
*
#include "bufferview_funcs.h"
#include "debug.h"
#include "lastfiles.h"
-#include "LyXView.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "gettext.h"
#include "BufferView.h"
-#include "lyxtextclasslist.h"
#include "insets/insetlabel.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
#include "frontends/Alert.h"
#include "frontends/FileDialog.h"
-#include "frontends/GUIRunTime.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
+#include "support/forkedcall.h"
#include "support/path.h"
-#include "support/syscall.h"
+#include "support/systemcall.h"
#include "support/lstrings.h"
+#include "BoostFormat.h"
+
#include <fstream>
#include <algorithm>
-#include <utility>
-#include <iostream>
+#include <utility>
using std::vector;
using std::ifstream;
extern BufferList bufferlist;
// this should be static, but I need it in buffer.C
bool quitting; // flag, that we are quitting the program
-extern bool finished; // all cleanup done just let it run through now.
-
-/*
- This is the inset locking stuff needed for mathed --------------------
-
- an inset can simple call LockInset in it's edit call and *ONLY* in it's
- edit call.
- Inset::Edit() can only be called by the main lyx module.
-
- Then the inset may modify the menu's and/or iconbars.
-
- Unlocking is either done by LyX or the inset itself with a UnlockInset-call
-
- During the lock, all button and keyboard events will be modified
- and send to the inset through the following inset-features. Note that
- Inset::insetUnlock will be called from inside UnlockInset. It is meant
- to contain the code for restoring the menus and things like this.
-
-
- virtual void insetButtonPress(int x, int y, int button);
- virtual void insetButtonRelease(int x, int y, int button);
- virtual void insetKeyPress(XKeyEvent *ev);
- virtual void insetMotionNotify(int x, int y, int state);
- virtual void insetUnlock();
-
- If a inset wishes any redraw and/or update it just has to call
- UpdateInset(this).
- It's is completly irrelevant, where the inset is. UpdateInset will
- find it in any paragraph in any buffer.
- Of course the_locking_inset and the insets in the current paragraph/buffer
- are checked first, so no performance problem should occur.
-
- Hope that's ok for the beginning, Alejandro,
- sorry that I needed so much time,
-
- Matthias
- */
-
-//void UpdateInset(BufferView * bv, Inset * inset, bool mark_dirty = true);
-
-/* these functions return 1 if an error occured,
- otherwise 0 */
-// Now they work only for updatable insets. [Alejandro 080596]
-//int LockInset(UpdatableInset * inset);
-void ToggleLockedInsetCursor(int x, int y, int asc, int desc);
-//void FitLockedInsetCursor(long x, long y, int asc, int desc);
-//int UnlockInset(UpdatableInset * inset);
-//void LockedInsetStoreUndo(Undo::undo_kind kind);
-
-/* this is for asyncron updating. UpdateInsetUpdateList will be called
- automatically from LyX. Just insert the Inset into the Updatelist */
-//void UpdateInsetUpdateList();
-//void PutInsetIntoInsetUpdateList(Inset * inset);
-
-//InsetUpdateStruct * InsetUpdateList = 0;
-
-
-/*
- -----------------------------------------------------------------------
- */
void ShowMessage(Buffer const * buf,
// should be moved to lyxfunc.C
bool MenuWrite(BufferView * bv, Buffer * buffer)
{
- // FIXME: needed ?
- XFlush(GUIRunTime::x11Display());
-
if (!buffer->save()) {
if (Alert::askQuestion(_("Save failed. Rename and try again?"),
MakeDisplayPath(buffer->fileName(), 50),
if (filename.empty()) {
- FileDialog fileDlg(bv->owner(),
- _("Choose a filename to save document as"),
+ FileDialog fileDlg(_("Choose a filename to save document as"),
LFUN_WRITEAS,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
fname += ".lyx";
FileDialog::Result result =
- fileDlg.Select(OnlyPath(fname),
- _("*.lyx|LyX Documents (*.lyx)"),
+ fileDlg.save(OnlyPath(fname),
+ _("*.lyx| LyX Documents (*.lyx)"),
OnlyFilename(fname));
if (result.first == FileDialog::Later)
_("Save anyway?")))
return false;
// Falls through to name change and save
- }
+ }
// No, but do we have another file with this name open?
else if (!buffer->isUnnamed() && bufferlist.exists(fname)) {
if (Alert::askQuestion(_("Another document with same name open!"),
} // Check whether the file exists
else {
FileInfo const myfile(fname);
- if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"),
+ if (myfile.isOK() && !Alert::askQuestion(_("Document already exists:"),
MakeDisplayPath(fname, 50),
_("Replace file?")))
return false;
if (buffer->isSGML()) {
Alert::alert(_("Chktex does not work with SGML derived documents."));
return 0;
- } else
+ } else
ret = buffer->runChktex();
-
+
if (ret >= 0) {
string s;
string t;
DestroyLyXTmpDir(system_tempdir);
- finished = true;
+ lyx_gui::exit();
}
+namespace {
-void AutoSave(BufferView * bv)
- // should probably be moved into BufferList (Lgb)
- // Perfect target for a thread...
+class AutoSaveBuffer : public ForkedProcess {
+public:
+ ///
+ AutoSaveBuffer(BufferView & bv, string const & fname)
+ : bv_(bv), fname_(fname) {}
+ ///
+ virtual ForkedProcess * clone() const {
+ return new AutoSaveBuffer(*this);
+ }
+ ///
+ int start();
+private:
+ ///
+ virtual int generateChild();
+ ///
+ BufferView & bv_;
+ string fname_;
+};
+
+
+int AutoSaveBuffer::start()
{
- if (!bv->available())
- return;
+#if USE_BOOST_FORMAT
+ command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
+#else
+ command_ = _("Auto-saving ") + fname_;
+#endif
+ return runNonBlocking();
+}
- if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
- // We don't save now, but we'll try again later
- bv->owner()->resetAutosaveTimer();
- return;
- }
- bv->owner()->message(_("Autosaving current document..."));
-
- // create autosave filename
- string fname = bv->buffer()->filePath();
- fname += "#";
- fname += OnlyFilename(bv->buffer()->fileName());
- fname += "#";
-
+int AutoSaveBuffer::generateChild()
+{
// tmp_ret will be located (usually) in /tmp
// will that be a problem?
pid_t const pid = fork(); // If you want to debug the autosave
// to fork. But we will do the save
// anyway.
bool failed = false;
-
+
string const tmp_ret = lyx::tempName(string(), "lyxauto");
if (!tmp_ret.empty()) {
- bv->buffer()->writeFile(tmp_ret, 1);
+ bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
- if (!lyx::rename(tmp_ret, fname)) {
+ if (!lyx::rename(tmp_ret, fname_)) {
failed = true;
// most likely couldn't move between filesystems
// unless write of tmp_ret failed
} else {
failed = true;
}
-
+
if (failed) {
// failed to write/rename tmp_ret so try writing direct
- if (!bv->buffer()->writeFile(fname, 1)) {
+ if (!bv_.buffer()->writeFile(fname_)) {
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1)
- bv->owner()->message(_("Autosave failed!"));
+ bv_.owner()->message(_("Autosave failed!"));
}
}
if (pid == 0) { // we are the child so...
_exit(0);
}
}
-
+ return pid;
+}
+
+} // namespace anon
+
+
+void AutoSave(BufferView * bv)
+ // should probably be moved into BufferList (Lgb)
+ // Perfect target for a thread...
+{
+ if (!bv->available())
+ return;
+
+ if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
+ // We don't save now, but we'll try again later
+ bv->owner()->resetAutosaveTimer();
+ return;
+ }
+
+ bv->owner()->message(_("Autosaving current document..."));
+
+ // create autosave filename
+ string fname = bv->buffer()->filePath();
+ fname += '#';
+ fname += OnlyFilename(bv->buffer()->fileName());
+ fname += '#';
+
+ AutoSaveBuffer autosave(*bv, fname);
+ autosave.start();
+
bv->buffer()->markBakClean();
bv->owner()->resetAutosaveTimer();
}
// create new file with template
// SERVERCMD !
//
-Buffer * NewLyxFile(string const & filename)
+Buffer * NewFile(string const & filename)
{
// Split argument by :
string name;
<< "\nName is " << name
<< "\nTemplate is " << tmpname << endl;
- // find a free buffer
+ // find a free buffer
Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
if (tmpbuf)
lastfiles->newFile(tmpbuf->fileName());
// Insert ascii file (if filename is empty, prompt for one)
void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
{
- string fname = f;
+ if (!bv->available())
+ return;
- if (!bv->available())
+ string const tmpstr = getContentsOfAsciiFile(bv, f, 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(bv, tmpstr);
+ else
+ bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr);
+ if (flag)
+ bv->update(bv->text,
+ BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+}
+
+
+// Insert ascii file (if filename is empty, prompt for one)
+string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+{
+ string fname = f;
+
if (fname.empty()) {
- FileDialog fileDlg(bv->owner(), _("Select file to insert"),
+ FileDialog fileDlg(_("Select file to insert"),
(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
-
- FileDialog::Result result = fileDlg.Select(bv->owner()->buffer()->filePath());
+
+ FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath());
if (result.first == FileDialog::Later)
- return;
+ return string();
fname = result.second;
- if (fname.empty())
- return;
+ if (fname.empty())
+ return string();
}
FileInfo fi(fname);
if (!fi.readable()) {
Alert::err_alert(_("Error! Specified file is unreadable: "),
MakeDisplayPath(fname, 50));
- return;
+ return string();
}
ifstream ifs(fname.c_str());
if (!ifs) {
- Alert::err_alert(_("Error! Cannot open specified file: "),
+ Alert::err_alert(_("Error! Cannot open specified file:"),
MakeDisplayPath(fname, 50));
- return;
+ return string();
}
ifs.unsetf(ios::skipws);
string const tmpstr(tmp.begin(), tmp.end());
#else
// This is what we want to use and what we will use once the
- // compilers get good enough.
+ // compilers get good enough.
//string tmpstr(ii, end); // yet a reason for using std::string
// alternate approach to get the file into a string:
string tmpstr;
copy(ii, end, back_inserter(tmpstr));
#endif
- // insert the string
- bv->hideCursor();
-
- // clear the selection
- bv->beforeChange(bv->text);
- if (!asParagraph)
- bv->text->insertStringAsLines(bv, tmpstr);
- else
- bv->text->insertStringAsParagraphs(bv, tmpstr);
- bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ return tmpstr;
}
void MenuInsertLabel(BufferView * bv, string const & arg)
{
- string label(arg);
- bv->owner()->prohibitInput();
+ string label = arg;
if (label.empty()) {
Paragraph * par = bv->getLyXText()->cursor.par();
- LyXLayout const * layout =
- &textclasslist.Style(bv->buffer()->params.textclass,
- par->getLayout());
-
+ LyXLayout_ptr layout = par->layout();
if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
Paragraph * par2 = par->previous();
- LyXLayout const * layout2 =
- &textclasslist.Style(bv->buffer()->params.textclass,
- par2->getLayout());
+
+ LyXLayout_ptr const & layout2 = par2->layout();
+
if (layout2->latextype != LATEX_PARAGRAPH) {
par = par2;
layout = layout2;
if (layout->latexname() == "theorem")
text = "thm"; // Create a correct prefix for prettyref
- text += ":";
+ text += ':';
if (layout->latextype == LATEX_PARAGRAPH ||
lyxrc.label_init_length < 0)
text.erase();
par_text = split(par_text, head, ' ');
if (i > 0)
text += '-'; // Is it legal to use spaces in
- // labels ?
+ // labels ?
text += head;
}
pair<bool, string> result =
Alert::askForText(_("Enter new label to insert:"), text);
if (result.first) {
- label = frontStrip(strip(result.second));
+ label = trim(result.second);
}
}
if (!label.empty()) {
- InsetCommandParams p( "label", label );
- InsetLabel * inset = new InsetLabel( p );
- bv->insertInset( inset );
+ InsetCommandParams p("label", label);
+ InsetLabel * inset = new InsetLabel(p);
+ bv->insertInset(inset);
}
- bv->owner()->allowInput();
}
// Run configure in user lyx directory
Path p(user_lyxdir);
- Systemcalls one(Systemcalls::Wait,
+ Systemcall one;
+ one.startscript(Systemcall::Wait,
AddName(system_lyxdir, "configure"));
p.pop();
bv->owner()->message(_("Reloading configuration..."));
lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
- Alert::alert(_("The system has been reconfigured."),
+ Alert::alert(_("The system has been reconfigured."),
_("You need to restart LyX to make use of any"),
_("updated document class specifications."));
}
projects / lyx.git / blobdiff