-/* This file is part of
- * ======================================================
+/**
+ * \file text3.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Alfredo Braunstein
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2002 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
int const width = inset->width();
int const inset_x = font.isVisibleRightToLeft()
- ? (cur.ix() - width) : cur.ix();
+ ? (cur.x() - width) : cur.x();
Box b(
inset_x + inset->scroll(),
inset_x + width,
- cur.iy() - inset->ascent(),
- cur.iy() + inset->descent()
+ cur.y() - inset->ascent(),
+ cur.y() + inset->descent()
);
- if (!b.contained(x, y)) {
+ if (!b.contains(x, y)) {
lyxerr[Debug::GUI] << "Missed inset at x,y "
<< x << ',' << y
<< " box " << b << endl;
x -= b.x1;
// The origin of an inset is on the baseline
- y -= text.cursor.iy();
+ y -= text.cursor.y();
return inset;
}
InsetOld * LyXText::checkInsetHit(int & x, int & y)
{
- int y_tmp = y + top_y();
+ int y_tmp = y + bv_owner->top_y();
LyXCursor cur;
setCursorFromCoordinates(cur, x, y_tmp);
void LyXText::cursorPrevious()
{
- int y = top_y();
+ int y = bv_owner->top_y();
RowList::iterator rit = cursorRow();
// tall rows, but it's not working right now.
} else {
if (inset_owner) {
- new_y = bv()->text->cursor.iy()
+ new_y = bv()->text->cursor.y()
+ bv()->theLockingInset()->insetInInsetY() + y
+ rit->height()
- bv()->workHeight() + 1;
ParagraphList::iterator pit = cursor.par();
previousRow(pit, rit);
setCursor(cur, pit, rit->pos(), false);
- if (cur.y() > top_y())
+ if (cur.y() > bv_owner->top_y())
cursorUp(true);
bv()->updateScrollbar();
}
void LyXText::cursorNext()
{
- int topy = top_y();
+ int topy = bv_owner->top_y();
RowList::iterator rit = cursorRow();
if (rit == lastRow()) {
int y = cursor.y() - rit->baseline() + cursorRow()->height();
if (y > topy + bv()->workHeight())
- bv()->updateScrollbar();
+ bv_owner->updateScrollbar();
return;
}
- int y = topy + bv()->workHeight();
+ int y = topy + bv_owner->workHeight();
if (inset_owner && !topy) {
- y -= (bv()->text->cursor.iy()
- - bv()->text->top_y()
- + bv()->theLockingInset()->insetInInsetY());
+ y -= (bv_owner->text->cursor.y()
+ - bv_owner->top_y()
+ + bv_owner->theLockingInset()->insetInInsetY());
}
ParagraphList::iterator dummypit;
- getRowNearY(y, dummypit);
+ y = getRowNearY(y, dummypit)->y();
setCursorFromCoordinates(cursor.x_fix(), y);
// + bv->workHeight());
finishUndo();
int new_y;
- if (rit == bv()->text->cursorRow()) {
+ if (rit == bv_owner->text->cursorRow()) {
// we have a row which is taller than the workarea. The
// simplest solution is to move to the next row instead.
cursorDown(true);
// 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();
+ new_y = bv->top_y() + bv->workHeight();
#endif
} else {
if (inset_owner) {
- new_y = bv()->text->cursor.iy()
+ new_y = bv()->text->cursor.y()
+ bv()->theLockingInset()->insetInInsetY()
+ y - rit->baseline();
} else {
}
ParagraphList::iterator pit = cursor.par();
- nextRow(pit, rit);
+ nextRow(pit, rit);
LyXCursor cur;
setCursor(cur, pit, rit->pos(), false);
- if (cur.y() < top_y() + bv()->workHeight())
+ if (cur.y() < bv_owner->top_y() + bv()->workHeight())
cursorDown(true);
bv()->updateScrollbar();
}
if (!bv->insertInset(new_inset))
delete new_inset;
else
- bv->updateInset();
+ bv->updateInset(new_inset);
}
if (tmp->params().startOfAppendix()) {
recordUndo(bv, Undo::ATOMIC, tmp);
tmp->params().startOfAppendix(false);
- setHeightOfRow(tmp, getRow(tmp, 0));
+ redoParagraph(tmp);
break;
}
}
if (!isInInset() && bv->theLockingInset())
break;
if (cmd.button() == mouse_button::button1) {
- if (!isInInset())
- bv->screen().toggleSelection(this, bv);
cursorHome();
selection.cursor = cursor;
cursorEnd();
setSelection();
- if (!isInInset())
- bv->screen().toggleSelection(this, bv, false);
bv->update();
bv->haveSelection(selection.set());
}
if (!isInInset() && bv->theLockingInset())
break;
if (cmd.button() == mouse_button::button1) {
- if (!isInInset()) {
- bv->screen().toggleSelection(this, bv);
- selectWord(lyx::WHOLE_WORD_STRICT);
- bv->screen().toggleSelection(this, bv, false);
- } else {
- selectWord(lyx::WHOLE_WORD_STRICT);
- }
+ selectWord(lyx::WHOLE_WORD_STRICT);
bv->update();
bv->haveSelection(selection.set());
}
LyXFont font = bv->text->getFont(cursor.par(), cursor.pos());
int width = tli->width();
int inset_x = font.isVisibleRightToLeft()
- ? cursor.ix() - width : cursor.ix();
+ ? cursor.x() - width : cursor.x();
int start_x = inset_x + tli->scroll();
FuncRequest cmd1 = cmd;
cmd1.x = cmd.x - start_x;
- cmd1.y = cmd.y - cursor.iy() + bv->text->top_y();
+ cmd1.y = cmd.y - cursor.y() + bv->top_y();
tli->localDispatch(cmd1);
break;
}
}
RowList::iterator cursorrow = bv->text->cursorRow();
- bv->text->setCursorFromCoordinates(cmd.x, cmd.y + bv->text->top_y());
+ bv->text->setCursorFromCoordinates(cmd.x, cmd.y + bv->top_y());
#if 0
// sorry for this but I have a strange error that the y value jumps at
// a certain point. This seems like an error in my xforms library or
bv->text->setSelection();
bv->update();
- bv->fitCursor();
break;
}
paste_internally = true;
}
- int const screen_first = bv->text->top_y();
+ int const screen_first = bv->top_y();
if (bv->theLockingInset()) {
// We are in inset locking mode
selection_possible = true;
// Clear the selection
- bv->screen().toggleSelection(bv->text, bv);
bv->text->clearSelection();
bv->update();
bv->updateScrollbar();
// stack. They don't *have* to
// alter the document...
// (Joacim)
- // ...or maybe the SetCursorParUndo()
+ // ...or maybe the recordUndo()
// below isn't necessary at all anylonger?
if (inset_hit->lyxCode() == InsetOld::REF_CODE)
recordUndo(bv, Undo::ATOMIC);
}
bv->beforeChange(this);
- LyXFont const old_font(real_current_font);
+ LyXFont const old_font = real_current_font;
string::const_iterator cit = cmd.argument.begin();
string::const_iterator end = cmd.argument.end();
// update the minibuffer
if (old_font != real_current_font)
bv->owner()->view_state_changed();
+ bv->updateScrollbar();
break;
}
case LFUN_INSET_CAPTION:
#endif
case LFUN_INSERT_NOTE:
+ case LFUN_INSERT_BRANCH:
case LFUN_INSERT_BIBITEM:
case LFUN_INSET_ERT:
case LFUN_INSET_FLOAT:
projects / lyx.git / blobdiff