#include "insets/insetcaption.h"
#include "insets/insetfloatlist.h"
#include "insets/insetspecialchar.h"
-#include "mathed/formulamacro.h"
-#include "mathed/formula.h"
#include "gettext.h"
#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+#include "mathed/formulabase.h"
extern LyXTextClass::size_type current_layout;
extern int greek_kb_flag;
extern char ascii_type;
extern bool math_insert_greek(BufferView *, char);
-extern void sigchldhandler(pid_t pid, int * status);
+extern void sigchldchecker(pid_t pid, int * status);
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
+
namespace {
const unsigned int saved_positions_num = 20;
updateScreen();
updateScrollbar();
}
- bv_->text->first = screen_->TopCursorVisible(bv_->text);
+ bv_->text->first = screen_->topCursorVisible(bv_->text);
owner_->updateMenubar();
owner_->updateToolbar();
// Similarly, buffer-dependent dialogs should be updated or
bv_->owner()->getDialogs()->updateParagraph();
- bool const ret = screen_->FitCursor(text, bv_);
+ bool const ret = screen_->fitCursor(text, bv_);
if (ret)
updateScrollbar();
return ret;
the_locking_inset = bv_->theLockingInset();
delete bv_->text;
bv_->text = new LyXText(bv_);
+ bv_->text->init(bv_);
} else {
// See if we have a text in TextCache that fits
// the new buffer_ with the correct width.
textcache.show(lyxerr, "resizeCurrentBuffer");
} else {
bv_->text = new LyXText(bv_);
+ bv_->text->init(bv_);
}
}
updateScreen();
// remake the inset locking
bv_->theLockingInset(the_locking_inset);
}
- bv_->text->first = screen_->TopCursorVisible(bv_->text);
+ bv_->text->first = screen_->topCursorVisible(bv_->text);
buffer_->resizeInsets(bv_);
// this will scroll the screen such that the cursor becomes visible
updateScrollbar();
return;
}
- unsigned long const text_height = bv_->text->height;
+ long const text_height = bv_->text->height;
double const lineh = bv_->text->defaultHeight();
double const slider_size = 1.0 / double(text_height);
if (!screen_.get())
return;
- screen_->Draw(bv_->text, bv_, current_scrollbar_value);
+ screen_->draw(bv_->text, bv_, current_scrollbar_value);
if (!lyxrc.cursor_follows_scrollbar) {
waitForX();
if (!selection_possible)
return;
- screen_->HideCursor();
+ screen_->hideCursor();
bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first);
update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
bv_->text->setSelection(bv_);
- screen_->ToggleToggle(bv_->text, bv_);
+ screen_->toggleToggle(bv_->text, bv_);
fitCursor(bv_->text);
- screen_->ShowCursor(bv_->text, bv_);
+ screen_->showCursor(bv_->text, bv_);
}
if (!inset_hit)
selection_possible = true;
- screen_->HideCursor();
+ screen_->hideCursor();
int const screen_first = bv_->text->first;
bool paste_internally = false;
if (button == 2
&& bv_->text->selection.set()) {
- owner_->getLyXFunc()->Dispatch(LFUN_COPY);
+ owner_->getLyXFunc()->dispatch(LFUN_COPY);
paste_internally = true;
}
// Clear the selection
- screen_->ToggleSelection(bv_->text, bv_);
+ screen_->toggleSelection(bv_->text, bv_);
bv_->text->clearSelection(bv_);
bv_->text->fullRebreak(bv_);
- screen_->Update(bv_->text, bv_);
+ screen_->update(bv_->text, bv_);
updateScrollbar();
// Single left click in math inset?
if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
bv_->text->setCursorFromCoordinates(bv_, xpos, ypos + screen_first);
- bv_->text->finishUndo();
+ finishUndo();
bv_->text->selection.cursor = bv_->text->cursor;
bv_->text->cursor.x_fix(bv_->text->cursor.x());
// insert this
if (button == 2) {
if (paste_internally)
- owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
+ owner_->getLyXFunc()->dispatch(LFUN_PASTE);
else
- owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
+ owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
"paragraph");
selection_possible = false;
return;
if (screen_.get() && button == 1) {
if (text->bv_owner) {
- screen_->HideCursor();
- screen_->ToggleSelection(text, bv_);
+ screen_->hideCursor();
+ screen_->toggleSelection(text, bv_);
text->selectWord(bv_);
- screen_->ToggleSelection(text, bv_, false);
+ screen_->toggleSelection(text, bv_, false);
} else {
text->selectWord(bv_);
}
return;
if (screen_.get() && (button == 1)) {
- screen_->HideCursor();
- screen_->ToggleSelection(text, bv_);
+ screen_->hideCursor();
+ screen_->toggleSelection(text, bv_);
text->cursorHome(bv_);
text->selection.cursor = text->cursor;
text->cursorEnd(bv_);
text->setSelection(bv_);
- screen_->ToggleSelection(text, bv_, false);
+ screen_->toggleSelection(text, bv_, false);
/* This will fit the cursor on the screen
* if necessary */
update(text, BufferView::SELECT|BufferView::FITCUR);
// ...or maybe the SetCursorParUndo()
// below isn't necessary at all anylonger?
if (inset_hit->lyxCode() == Inset::REF_CODE) {
- bv_->text->setCursorParUndo(buffer_);
+ setCursorParUndo(bv_);
}
owner_->message(inset_hit->editMessage());
// The main window size has changed, repaint most stuff
redraw();
} else if (screen_.get())
- screen_->Redraw(bv_->text, bv_);
+ screen_->redraw(bv_->text, bv_);
} else {
// Grey box when we don't have a buffer
workarea_.greyOut();
if (screen_.get() &&
(!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
{
- screen_->Update(bv_->text, bv_);
+ screen_->update(bv_->text, bv_);
}
}
if (pid == -1) // error find out what is wrong
; // ignore it for now.
else if (pid > 0)
- sigchldhandler(pid, &status);
+ sigchldchecker(pid, &status);
updatelist.update(bv_);
}
if (!bv_->theLockingInset()) {
- screen_->CursorToggle(bv_->text, bv_);
+ screen_->cursorToggle(bv_->text, bv_);
} else {
bv_->theLockingInset()->toggleInsetCursor(bv_);
}
y += bv_->text->first;
Row * cursorrow = text->cursor.row();
text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
- bv_->text->finishUndo();
+ finishUndo();
// This is to allow jumping over large insets
if ((cursorrow == text->cursor.row()))
text->cursorUp(bv_);
if (text->inset_owner ||
text->cursor.row()->height() < workarea_.height())
- screen_->Draw(bv_->text, bv_,
+ screen_->draw(bv_->text, bv_,
text->cursor.y()
- text->cursor.row()->baseline()
+ text->cursor.row()->height()
Row * cursorrow = text->cursor.row();
text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
- bv_->text->finishUndo();
+ finishUndo();
// This is to allow jumping over large insets
if ((cursorrow == bv_->text->cursor.row()))
text->cursorDown(bv_);
if (text->inset_owner ||
text->cursor.row()->height() < workarea_.height())
- screen_->Draw(bv_->text, bv_, text->cursor.y() -
+ screen_->draw(bv_->text, bv_, text->cursor.y() -
text->cursor.row()->baseline());
updateScrollbar();
}
if (b != 0 ) buffer(b);
}
- Paragraph * par = bv_->text->getParFromID(saved_positions[i].par_id);
+ Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
if (!par)
return;
if (!inset_slept)
bv_->theLockingInset()->insetUnlock(bv_);
bv_->theLockingInset(0);
- bv_->text->finishUndo();
+ finishUndo();
inset_slept = false;
}
}
void BufferView::Pimpl::showCursor()
{
if (screen_.get())
- screen_->ShowCursor(bv_->text, bv_);
+ screen_->showCursor(bv_->text, bv_);
}
void BufferView::Pimpl::hideCursor()
{
if (screen_.get())
- screen_->HideCursor();
+ screen_->hideCursor();
}
void BufferView::Pimpl::toggleSelection(bool b)
{
if (screen_.get())
- screen_->ToggleSelection(bv_->text, bv_, b);
+ screen_->toggleSelection(bv_->text, bv_, b);
}
void BufferView::Pimpl::toggleToggle()
{
if (screen_.get())
- screen_->ToggleToggle(bv_->text, bv_);
+ screen_->toggleToggle(bv_->text, bv_);
}
{
beforeChange(bv_->text);
if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
- screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
+ screen_->draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
} else {
- screen_->Draw(bv_->text, bv_, 0);
+ screen_->draw(bv_->text, bv_, 0);
}
update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
redraw();
{
if (!buffer_) return;
- screen_->HideCursor();
+ screen_->hideCursor();
beforeChange(bv_->text);
string const clip(workarea_.getClipboard());
}
if (!is_rtl)
lt->cursorRight(bv_, false);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
if (is_rtl)
lt->cursorRight(bv_, false);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorUp(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorDown(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorUpParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorDownParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
cursorPrevious(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
cursorNext(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorHome(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorEnd(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorTab(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
lt->cursorLeftOneWord(bv_);
else
lt->cursorRightOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
lt->cursorRightOneWord(bv_);
else
lt->cursorLeftOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorTop(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorBottom(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
lt->cursorLeft(bv_);
else
lt->cursorRight(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
lt->cursorRight(bv_);
else
lt->cursorLeft(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorUp(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorDown(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorUpParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorDownParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
cursorPrevious(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
cursorNext(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorHome(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorEnd(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
lt->cursorLeftOneWord(bv_);
else
lt->cursorRightOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
lt->cursorRightOneWord(bv_);
else
lt->cursorLeftOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
break;
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorTop(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorBottom(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
}
break;
+ case LFUN_OPENSTUFF:
+ {
+ LyXText * lt = bv_->getLyXText();
+ hideCursor();
+ beforeChange(lt);
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ lt->openStuff(bv_);
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ setState();
+ }
+ break;
+
case LFUN_QUOTE:
bv_->insertCorrectQuote();
break;
}
break;
- // --- insert characters ----------------------------------------
-
+ case LFUN_MATH_MACRO:
+ mathDispatchMathMacro(bv_, argument);
+ break;
+
case LFUN_MATH_DELIM:
+ mathDispatchMathDelim(bv_, argument);
+ break;
+
case LFUN_INSERT_MATRIX:
- {
- if (available()) {
- if (open_new_inset(new InsetFormula, false)) {
- bv_->theLockingInset()
- ->localDispatch(bv_, action, argument);
- }
- }
- }
- break;
-
+ mathDispatchInsertMatrix(bv_, argument);
+ break;
+
case LFUN_INSERT_MATH:
- {
- if (!available())
- break;
-
- InsetFormula * f = new InsetFormula(LM_OT_EQUATION);
- open_new_inset(f);
- f->localDispatch(bv_, LFUN_INSERT_MATH, argument);
- }
- break;
-
- case LFUN_MATH_DISPLAY:
- {
- if (available())
- open_new_inset(new InsetFormula(LM_OT_EQUATION), false);
+ mathDispatchInsertMath(bv_, argument);
break;
- }
-
- case LFUN_MATH_MACRO:
- {
- if (available()) {
- string s(argument);
- if (s.empty())
- owner_->getLyXFunc()->setErrorMessage(N_("Missing argument"));
- else {
- string const s1 = token(s, ' ', 1);
- int const na = s1.empty() ? 0 : lyx::atoi(s1);
- open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na), false);
- }
- }
- }
- break;
- case LFUN_MATH_MODE: // Open or create a math inset
- {
- if (available())
- open_new_inset(new InsetFormula, false);
- owner_->getLyXFunc()->setMessage(N_("Math editor mode"));
- }
- break;
-
+ case LFUN_MATH_IMPORT_SELECTION: // Imports LaTeX from the X selection
+ mathDispatchMathImportSelection(bv_, argument);
+ break;
+
+ case LFUN_MATH_DISPLAY: // Open or create a displayed math inset
+ mathDispatchMathDisplay(bv_, argument);
+ break;
+
+ case LFUN_MATH_MODE: // Open or create an inlined math inset
+ mathDispatchMathMode(bv_, argument);
+ break;
+
case LFUN_CITATION_INSERT:
{
InsetCommandParams p;
LyXText * lt = bv_->getLyXText();
beforeChange(lt);
- lt->finishUndo();
+ finishUndo();
if (!insertInset(new_inset)) {
delete new_inset;
return false;
}
// not quite sure if we want this...
- bv_->text->setCursorParUndo(buffer_);
- bv_->text->freezeUndo();
+ setCursorParUndo(bv_);
+ freezeUndo();
beforeChange(bv_->text);
if (!lout.empty()) {
bv_->text->insertInset(bv_, inset);
update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- bv_->text->unFreezeUndo();
+ unFreezeUndo();
return true;
}