* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich,
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <utility>
#include <iostream>
-#include FORMS_H_LOCATION
-
#include "lyx_cb.h"
#include "lyx_gui_misc.h"
#include "lyx_main.h"
+#include "buffer.h"
#include "bufferlist.h"
#include "bufferview_funcs.h"
+#include "debug.h"
#include "lastfiles.h"
#include "LyXView.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "frontends/FileDialog.h"
+#include "frontends/GUIRunTime.h"
#include "insets/insetlabel.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
#include "support/path.h"
#include "support/syscall.h"
-#include "lyxfunc.h"
+#include "support/lstrings.h"
#include "gettext.h"
+#include "BufferView.h"
using std::vector;
using std::ifstream;
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
+ 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();
+ 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).
{
if (lyxrc.use_gui) {
string const str = msg1 + ' ' + msg2 + ' ' + msg3;
- buf->getUser()->owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
- str);
+ buf->getUser()->owner()->message(str);
} else
lyxerr << msg1 << msg2 << msg3 << endl;
}
bool MenuWrite(BufferView * bv, Buffer * buffer)
{
// FIXME: needed ?
- XFlush(fl_get_display());
+ XFlush(GUIRunTime::x11Display());
if (!buffer->save()) {
string const fname = buffer->fileName();
void QuitLyX()
{
- lyxerr.debug() << "Running QuitLyX." << endl;
+ lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
if (lyxrc.use_gui) {
- if (!bufferlist.QwriteAll())
+ if (!bufferlist.qwriteAll())
return;
lastfiles->writeFile(lyxrc.lastfiles);
bufferlist.closeAll();
// do any other cleanup procedures now
- lyxerr.debug() << "Deleting tmp dir " << system_tempdir << endl;
+ lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
DestroyLyXTmpDir(system_tempdir);
return;
}
- bv->owner()->getLyXFunc()
- ->Dispatch(LFUN_MESSAGE,
- _("Autosaving current document..."));
+ bv->owner()->message(_("Autosaving current document..."));
// create autosave filename
string fname = OnlyPath(bv->buffer()->fileName());
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1)
- bv->owner()->getLyXFunc()
- ->Dispatch(LFUN_MESSAGE,
- _("Autosave Failed!"));
+ bv->owner()->message(_("Autosave Failed!"));
}
}
if (pid == 0) { // we are the child so...
tmpname = split(tmpname, ':');
}
#endif
- lyxerr.debug() << "Arg is " << filename
- << "\nName is " << name
- << "\nTemplate is " << tmpname << endl;
+ lyxerr[Debug::INFO] << "Arg is " << filename
+ << "\nName is " << name
+ << "\nTemplate is " << tmpname << endl;
// find a free buffer
Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
// clear the selection
bv->beforeChange(bv->text);
if (!asParagraph)
- bv->text->InsertStringA(bv, tmpstr);
+ bv->text->insertStringAsLines(bv, tmpstr);
else
- bv->text->InsertStringB(bv, tmpstr);
+ bv->text->insertStringAsParagraphs(bv, tmpstr);
bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
void MenuInsertLabel(BufferView * bv, string const & arg)
{
string label(arg);
- ProhibitInput(bv);
+ bv->owner()->prohibitInput();
if (label.empty()) {
-#ifndef NEW_INSETS
- LyXParagraph * par =
- bv->text->cursor.par()->FirstPhysicalPar();
-#else
- LyXParagraph * par = bv->text->cursor.par();
-#endif
+ Paragraph * par = bv->text->cursor.par();
LyXLayout const * layout =
&textclasslist.Style(bv->buffer()->params.textclass,
- par->GetLayout());
+ par->getLayout());
-#ifndef NEW_INSETS
- if (layout->latextype == LATEX_PARAGRAPH && par->previous_) {
- LyXParagraph * par2 = par->previous_->FirstPhysicalPar();
-#else
if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
- LyXParagraph * par2 = par->previous();
-#endif
+ Paragraph * par2 = par->previous();
LyXLayout const * layout2 =
&textclasslist.Style(bv->buffer()->params.textclass,
- par2->GetLayout());
+ par2->getLayout());
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
-#ifndef NEW_INSETS
- if (par->footnoteflag==LyXParagraph::OPEN_FOOTNOTE)
- switch (par->footnotekind) {
- case LyXParagraph::FIG:
- case LyXParagraph::WIDE_FIG:
- text = "fig";
- break;
- case LyXParagraph::TAB:
- case LyXParagraph::WIDE_TAB:
- text = "tab";
- break;
- case LyXParagraph::ALGORITHM:
- text = "alg";
- break;
- case LyXParagraph::FOOTNOTE:
- case LyXParagraph::MARGIN:
- break;
- }
-#endif
+
text += ":";
if (layout->latextype == LATEX_PARAGRAPH ||
lyxrc.label_init_length < 0)
text.erase();
- string par_text = par->String(bv->buffer(), false);
+ string par_text = par->asString(bv->buffer(), false);
for (int i = 0; i < lyxrc.label_init_length; ++i) {
if (par_text.empty())
break;
InsetLabel * inset = new InsetLabel( p );
bv->insertInset( inset );
}
- AllowInput(bv);
+ bv->owner()->allowInput();
}
// reconfigure the automatic settings.
void Reconfigure(BufferView * bv)
{
- bv->owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
- _("Running configure..."));
+ bv->owner()->message(_("Running configure..."));
// Run configure in user lyx directory
Path p(user_lyxdir);
Systemcalls one(Systemcalls::System,
AddName(system_lyxdir, "configure"));
p.pop();
- bv->owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE,
- _("Reloading configuration..."));
+ bv->owner()->message(_("Reloading configuration..."));
lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
WriteAlert(_("The system has been reconfigured."),
_("You need to restart LyX to make use of any"),