-// -*- C++ -*-
/* This file is part of
* ======================================================
*
*
* ====================================================== */
-#include <config.h>
-
#include <fstream>
#include <algorithm>
+#include <config.h>
+
#include "BufferView.h"
#include "buffer.h"
#include "lyxcursor.h"
#include "support/lyxfunctional.h" //equal_1st_in_pair
#include "language.h"
#include "gettext.h"
+#include "undo_funcs.h"
extern BufferList bufferlist;
bool res = true;
if (c == '#') {
- lyxerr.debug() << "Will insert file with header" << endl;
+ lyxerr[Debug::INFO] << "Will insert file with header" << endl;
res = buffer()->readFile(lex, text->cursor.par());
} else {
- lyxerr.debug() << "Will insert file without header" << endl;
+ lyxerr[Debug::INFO] << "Will insert file without header"
+ << endl;
res = buffer()->readLyXformat2(lex, text->cursor.par());
}
bool BufferView::removeAutoInsets()
{
- LyXParagraph * par = buffer()->paragraph;
+ Paragraph * par = buffer()->paragraph;
LyXCursor tmpcursor = text->cursor;
LyXCursor cursor;
while (par) {
// this has to be done before the delete
- text->SetCursor(this, cursor, par, 0);
- if (par->AutoDeleteInsets()){
+ text->setCursor(this, cursor, par, 0);
+ if (par->autoDeleteInsets()){
a = true;
- text->RedoParagraphs(this, cursor,
+ text->redoParagraphs(this, cursor,
cursor.par()->next());
- text->FullRebreak(this);
+ text->fullRebreak(this);
}
par = par->next();
}
if (tmpcursor.pos() > tmpcursor.par()->size())
tmpcursor.pos(tmpcursor.par()->size());
- text->SetCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
+ text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
return a;
}
for (TeXErrors::Errors::const_iterator cit = terr.begin();
cit != terr.end();
++cit) {
- string const desctext((*cit).error_desc);
- string const errortext((*cit).error_text);
+ string const desctext(cit->error_desc);
+ string const errortext(cit->error_text);
string const msgtxt = desctext + '\n' + errortext;
- int const errorrow = (*cit).error_in_line;
+ int const errorrow = cit->error_in_line;
// Insert error string for row number
int tmpid = -1;
buffer()->texrow.increasePos(tmpid, tmppos);
}
- LyXParagraph * texrowpar = 0;
+ Paragraph * texrowpar = 0;
if (tmpid == -1) {
- texrowpar = text->FirstParagraph();
+ texrowpar = text->firstParagraph();
tmppos = 0;
} else {
- texrowpar = text->GetParFromID(tmpid);
+ texrowpar = buffer()->getParFromID(tmpid);
}
if (texrowpar == 0)
continue;
InsetError * new_inset = new InsetError(msgtxt);
- text->SetCursorIntern(this, texrowpar, tmppos);
- text->InsertInset(this, new_inset);
- text->FullRebreak(this);
+ text->setCursorIntern(this, texrowpar, tmppos);
+ text->insertInset(this, new_inset);
+ text->fullRebreak(this);
}
// Restore the cursor position
- text->SetCursorIntern(this, cursor.par(), cursor.pos());
+ text->setCursorIntern(this, cursor.par(), cursor.pos());
}
buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
- LyXParagraph * texrowpar;
+ Paragraph * texrowpar;
if (tmpid == -1) {
- texrowpar = text->FirstParagraph();
+ texrowpar = text->firstParagraph();
tmppos = 0;
} else {
- texrowpar = text->GetParFromID(tmpid);
+ texrowpar = buffer()->getParFromID(tmpid);
}
- text->SetCursor(this, texrowpar, tmppos);
+ text->setCursor(this, texrowpar, tmppos);
}
if (find(labels.begin(),labels.end(),label)
!= labels.end()) {
beforeChange(text);
- text->SetCursor(this, it.getPar(), it.getPos());
+ text->setCursor(this, it.getPar(), it.getPos());
text->selection.cursor = text->cursor;
update(text, BufferView::SELECT|BufferView::FITCUR);
return true;
hideCursor();
beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
- if (!text->TextUndo(this))
+ if (!textUndo(this))
owner()->message(_("No forther undo information"));
else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
hideCursor();
beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR);
- if (!text->TextRedo(this))
+ if (!textRedo(this))
owner()->message(_("No further redo information"));
else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
text->copyEnvironmentType();
// clear the selection, even if mark_set
toggleSelection();
- text->ClearSelection(this);
+ text->clearSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR);
owner()->message(_("Paragraph environment type copied"));
}
void BufferView::copy()
{
if (available()) {
- text->CopySelection(this);
+ text->copySelection(this);
// clear the selection, even if mark_set
toggleSelection();
- text->ClearSelection(this);
+ text->clearSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR);
owner()->message(_("Copy"));
}
if (available()) {
hideCursor();
update(text, BufferView::SELECT|BufferView::FITCUR);
- text->CutSelection(this);
+ text->cutSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
owner()->message(_("Cut"));
}
hideCursor();
// clear the selection
toggleSelection();
- text->ClearSelection(this);
+ text->clearSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR);
// paste
- text->PasteSelection(this);
+ text->pasteSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
// clear the selection
toggleSelection();
- text->ClearSelection(this);
+ text->clearSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR);
}
-
-
-void BufferView::insertCorrectQuote()
-{
- char c;
-
- if (text->cursor.pos())
- c = text->cursor.par()->GetChar(text->cursor.pos() - 1);
- else
- c = ' ';
-
- insertInset(new InsetQuotes(c, buffer()->params));
-}
-
-
/* these functions are for the spellchecker */
string const BufferView::nextWord(float & value)
{
return string();
}
- return text->SelectNextWord(this, value);
+ return text->selectNextWord(this, value);
}
hideCursor();
beforeChange(text);
- text->SelectSelectedWord(this);
+ text->selectSelectedWord(this);
toggleSelection(false);
update(text, BufferView::SELECT|BufferView::FITCUR);
}
hideCursor();
beforeChange(text);
- text->SelectSelectedWord(this);
- text->ClearSelection(this);
+ text->selectSelectedWord(this);
+ text->clearSelection(this);
update(text, BufferView::SELECT|BufferView::FITCUR);
}
{
if (!available()) return;
+ LyXText * tt = getLyXText();
hideCursor();
- update(text, BufferView::SELECT|BufferView::FITCUR);
+ update(tt, BufferView::SELECT|BufferView::FITCUR);
/* clear the selection (if there is any) */
toggleSelection(false);
- update(text, BufferView::SELECT|BufferView::FITCUR);
+ update(tt, BufferView::SELECT|BufferView::FITCUR);
/* clear the selection (if there is any) */
toggleSelection(false);
- text->ReplaceSelectionWithString(this, replacestring);
+ tt->replaceSelectionWithString(this, replacestring);
- text->SetSelectionOverString(this, replacestring);
+ tt->setSelectionOverString(this, replacestring);
// Go back so that replacement string is also spellchecked
for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
- text->CursorLeft(this);
+ tt->cursorLeft(this);
}
- update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
// End of spellchecker stuff
theLockingInset(inset);
return true;
} else if (inset) {
- return theLockingInset()->LockInsetInInset(this, inset);
+ return theLockingInset()->lockInsetInInset(this, inset);
}
return false;
}
if (theLockingInset() && available()) {
LyXCursor cursor = text->cursor;
if ((cursor.pos() - 1 >= 0) &&
- (cursor.par()->GetChar(cursor.pos() - 1) ==
- LyXParagraph::META_INSET) &&
- (cursor.par()->GetInset(cursor.pos() - 1) ==
- theLockingInset()->GetLockingInset()))
- text->SetCursor(this, cursor,
+ (cursor.par()->getChar(cursor.pos() - 1) ==
+ Paragraph::META_INSET) &&
+ (cursor.par()->getInset(cursor.pos() - 1) ==
+ theLockingInset()->getLockingInset()))
+ text->setCursor(this, cursor,
cursor.par(), cursor.pos() - 1);
LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
LyXText * txt = getLyXText();
- if (theLockingInset()->GetLockingInset()->LyxCode() ==
+ if (theLockingInset()->getLockingInset()->lyxCode() ==
Inset::TEXT_CODE &&
(txt->real_current_font.language() !=
buffer()->params.language
shape = (txt->real_current_font.isVisibleRightToLeft())
? LyXScreen::REVERSED_L_SHAPE
: LyXScreen::L_SHAPE;
- y += cursor.y() + theLockingInset()->InsetInInsetY();
- pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
+ y += cursor.y() + theLockingInset()->insetInInsetY();
+ pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
shape);
}
}
void BufferView::hideLockedInsetCursor()
{
if (theLockingInset() && available()) {
- pimpl_->screen_->HideCursor();
+ pimpl_->screen_->hideCursor();
}
}
void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
{
if (theLockingInset() && available()) {
- y += text->cursor.y() + theLockingInset()->InsetInInsetY();
- if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
+ y += text->cursor.y() + theLockingInset()->insetInInsetY();
+ if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
updateScrollbar();
}
}
int BufferView::unlockInset(UpdatableInset * inset)
{
if (inset && theLockingInset() == inset) {
- inset->InsetUnlock(this);
+ inset->insetUnlock(this);
theLockingInset(0);
- text->FinishUndo();
+ finishUndo();
return 0;
} else if (inset && theLockingInset() &&
- theLockingInset()->UnlockInsetInInset(this, inset)) {
- text->FinishUndo();
+ theLockingInset()->unlockInsetInInset(this, inset)) {
+ finishUndo();
return 0;
}
return bufferlist.unlockInset(inset);
return; // shouldn't happen
if (kind == Undo::EDIT) // in this case insets would not be stored!
kind = Undo::FINISH;
- text->SetUndo(buffer(), kind,
- text->cursor.par()->previous(),
- text->cursor.par()->next());
+ setUndo(this, kind,
+ text->cursor.par(),
+ text->cursor.par()->next());
}
string const & from, string const & to)
{
bool flag = false;
- LyXParagraph * par = buffer()->paragraph;
+ Paragraph * par = buffer()->paragraph;
LyXCursor cursor = text->cursor;
LyXCursor tmpcursor = cursor;
cursor.par(tmpcursor.par());
while (par) {
bool flag2 = false;
- for (LyXParagraph::inset_iterator it = par->inset_iterator_begin();
+ for (Paragraph::inset_iterator it = par->inset_iterator_begin();
it != par->inset_iterator_end(); ++it) {
- if ((*it)->LyxCode() == code) {
+ if ((*it)->lyxCode() == code) {
InsetCommand * inset = static_cast<InsetCommand *>(*it);
if (inset->getContents() == from) {
inset->setContents(to);
flag = true;
// this is possible now, since SetCursor takes
// care about footnotes
- text->SetCursorIntern(this, par, 0);
- text->RedoParagraphs(this, text->cursor,
+ text->setCursorIntern(this, par, 0);
+ text->redoParagraphs(this, text->cursor,
text->cursor.par()->next());
- text->FullRebreak(this);
+ text->fullRebreak(this);
}
par = par->next();
}
- text->SetCursorIntern(this, cursor.par(), cursor.pos());
+ text->setCursorIntern(this, cursor.par(), cursor.pos());
return flag;
}
Language const * BufferView::getParentLanguage(Inset * inset) const
{
LyXText * text = getParentText(inset);
- return text->cursor.par()->GetFontSettings(buffer()->params,
+ return text->cursor.par()->getFontSettings(buffer()->params,
text->cursor.pos()).language();
}
projects / lyx.git / blobdiff