#include "language.h"
#include "support/tostr.h"
#include "support/lstrings.h"
+#include "support/LAssert.h"
#include "frontends/LyXView.h"
#include "frontends/screen.h"
#include "frontends/Dialogs.h"
// check if the given co-ordinates are inside an inset at the
// given cursor, if one exists. If so, the inset is returned,
// and the co-ordinates are made relative. Otherwise, 0 is returned.
- Inset * checkInset(BufferView * bv, LyXText & text,
+ InsetOld * checkInset(BufferView * bv, LyXText & text,
LyXCursor const & cur, int & x, int & y)
{
lyx::pos_type const pos = cur.pos();
if (pos >= par->size() || !par->isInset(pos))
return 0;
- Inset /*const*/ * inset = par->getInset(pos);
+ InsetOld /*const*/ * inset = par->getInset(pos);
if (!isEditableInset(inset))
return 0;
// get inset dimensions
Assert(par->getInset(pos));
- LyXFont const & font = text.getFont(bv->buffer(), par, pos);
+ LyXFont const & font = text.getFont(par, pos);
int const width = inset->width();
int const inset_x = font.isVisibleRightToLeft()
} // anon namespace
-Inset * LyXText::checkInsetHit(int & x, int & y)
+InsetOld * LyXText::checkInsetHit(int & x, int & y)
{
int y_tmp = y + top_y();
LyXCursor cur;
setCursorFromCoordinates(cur, x, y_tmp);
- Inset * inset = checkInset(bv(), *this, cur, x, y_tmp);
+ InsetOld * inset = checkInset(bv(), *this, cur, x, y_tmp);
if (inset) {
y = y_tmp;
return inset;
}
-bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
+bool LyXText::gotoNextInset(vector<InsetOld::Code> const & codes,
string const & contents)
{
ParagraphList::iterator end = ownerParagraphs().end();
ParagraphList::iterator pit = cursor.par();
pos_type pos = cursor.pos();
- Inset * inset;
+ InsetOld * inset;
do {
if (pos + 1 < pit->size()) {
++pos;
}
-void LyXText::gotoInset(vector<Inset::Code> const & codes,
+void LyXText::gotoInset(vector<InsetOld::Code> const & codes,
bool same_content)
{
bv()->beforeChange(this);
string contents;
if (same_content && cursor.pos() < cursor.par()->size()
&& cursor.par()->isInset(cursor.pos())) {
- Inset const * inset = cursor.par()->getInset(cursor.pos());
+ InsetOld const * inset = cursor.par()->getInset(cursor.pos());
if (find(codes.begin(), codes.end(), inset->lyxCode())
!= codes.end())
contents = static_cast<InsetCommand const *>(inset)->getContents();
}
-void LyXText::gotoInset(Inset::Code code, bool same_content)
+void LyXText::gotoInset(InsetOld::Code code, bool same_content)
{
- gotoInset(vector<Inset::Code>(1, code), same_content);
+ gotoInset(vector<InsetOld::Code>(1, code), same_content);
}
int y = top_y();
if (cursorRow() == rows().begin()) {
- if (y > 0) {
- int new_y = bv()->text->top_y() - bv()->workHeight();
- bv()->screen().draw(bv()->text, bv(), new_y < 0 ? 0 : new_y);
+ if (y > 0)
bv()->updateScrollbar();
- }
return;
}
return;
// This is what we used to do, so we wouldn't skip right past
// tall rows, but it's not working right now.
-#if 0
- new_y = bv->text->top_y() - bv->workHeight();
-#endif
} else {
if (inset_owner) {
new_y = bv()->text->cursor.iy()
- bv()->workHeight() + 1;
}
}
- bv()->screen().draw(bv()->text, bv(), new_y < 0 ? 0 : new_y);
+ //bv()->screen().draw(bv()->text, bv(), new_y < 0 ? 0 : new_y);
if (cursorRow() != rows().begin()) {
LyXCursor cur;
setCursor(cur, boost::prior(cursorRow())->par(),
int y = cursor.y() - cursorRow()->baseline() +
cursorRow()->height();
if (y > topy + bv()->workHeight()) {
- bv()->screen().draw(bv()->text, bv(), bv()->text->top_y() + bv()->workHeight());
+ //bv()->screen().draw(bv()->text, bv(), bv()->text->top_y() + bv()->workHeight());
bv()->updateScrollbar();
}
return;
new_y = cursor.y() - cursorRow()->baseline();
}
}
- bv()->screen().draw(bv()->text, bv(), new_y);
+ //bv()->screen().draw(bv()->text, bv(), new_y);
RowList::iterator next_row = boost::next(cursorRow());
if (next_row != rows().end()) {
void doInsertInset(LyXText * lt, FuncRequest const & cmd,
bool edit, bool pastesel)
{
- Inset * inset = createInset(cmd);
+ InsetOld * inset = createInset(cmd);
BufferView * bv = cmd.view();
if (inset) {
}
-Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
+InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
{
lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << cmd.action
<<"] arg[" << cmd.argument << ']' << endl;
if (cursor.pos() < cursor.par()->size()
&& cursor.par()->isInset(cursor.pos())
&& isHighlyEditableInset(cursor.par()->getInset(cursor.pos()))) {
- Inset * tmpinset = cursor.par()->getInset(cursor.pos());
+ InsetOld * tmpinset = cursor.par()->getInset(cursor.pos());
cmd.message(tmpinset->editMessage());
FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "right" : "left");
tmpinset->localDispatch(cmd1);
cursor.pos() < cursor.par()->size() &&
cursor.par()->isInset(cursor.pos()) &&
isHighlyEditableInset(cursor.par()->getInset(cursor.pos()))) {
- Inset * tmpinset = cursor.par()->getInset(cursor.pos());
+ InsetOld * tmpinset = cursor.par()->getInset(cursor.pos());
cmd.message(tmpinset->editMessage());
FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "left" : "right");
tmpinset->localDispatch(cmd1);
}
case LFUN_GOTOERROR:
- gotoInset(Inset::ERROR_CODE, false);
+ gotoInset(InsetOld::ERROR_CODE, false);
break;
case LFUN_GOTONOTE:
- gotoInset(Inset::NOTE_CODE, false);
+ gotoInset(InsetOld::NOTE_CODE, false);
break;
case LFUN_REFERENCE_GOTO:
{
- vector<Inset::Code> tmp;
- tmp.push_back(Inset::LABEL_CODE);
- tmp.push_back(Inset::REF_CODE);
+ vector<InsetOld::Code> tmp;
+ tmp.push_back(InsetOld::LABEL_CODE);
+ tmp.push_back(InsetOld::REF_CODE);
gotoInset(tmp, true);
break;
}
// Check for inset locking
if (bv->theLockingInset()) {
- Inset * tli = bv->theLockingInset();
+ InsetOld * tli = bv->theLockingInset();
LyXCursor cursor = bv->text->cursor;
- LyXFont font = bv->text->getFont(bv->buffer(),
- cursor.par(), cursor.pos());
+ LyXFont font = bv->text->getFont(cursor.par(), cursor.pos());
int width = tli->width();
int inset_x = font.isVisibleRightToLeft()
? cursor.ix() - width : cursor.ix();
int x = cmd.x;
int y = cmd.y;
- Inset * inset_hit = bv->text->checkInsetHit(x, y);
+ InsetOld * inset_hit = bv->text->checkInsetHit(x, y);
// Middle button press pastes if we have a selection
// We do this here as if the selection was inside an inset
// inset, inset_hit is 0, and inset_x == x, inset_y == y.
int x = cmd.x;
int y = cmd.y;
- Inset * inset_hit = bv->text->checkInsetHit(x, y);
+ InsetOld * inset_hit = bv->text->checkInsetHit(x, y);
if (bv->theLockingInset()) {
// We are in inset locking mode.
// (Joacim)
// ...or maybe the SetCursorParUndo()
// below isn't necessary at all anylonger?
- if (inset_hit->lyxCode() == Inset::REF_CODE)
+ if (inset_hit->lyxCode() == InsetOld::REF_CODE)
recordUndo(bv, Undo::ATOMIC);
bv->owner()->message(inset_hit->editMessage());