#include "Bidi.h"
#include "BufferView.h"
-#include "bufferview_funcs.h"
#include "Buffer.h"
#include "Cursor.h"
#include "CoordCache.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParIterator.h"
+#include "TextMetrics.h"
+
+#include "support/docstream.h"
#include "insets/InsetTabular.h"
#include "insets/InsetText.h"
-#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
#include "mathed/InsetMathScript.h"
#include "mathed/MacroTable.h"
-
-#include "support/limited_stack.h"
+#include "mathed/MathData.h"
+#include "mathed/MathMacro.h"
#include <boost/assert.hpp>
#include <boost/bind.hpp>
int xo;
int yo;
Inset const * inset = &it.inset();
- std::map<Inset const *, Point> const & data =
+ std::map<Inset const *, Geometry> const & data =
c.bv().coordCache().getInsets().getData();
- std::map<Inset const *, Point>::const_iterator I = data.find(inset);
+ std::map<Inset const *, Geometry>::const_iterator I = data.find(inset);
// FIXME: in the case where the inset is not in the cache, this
// means that no part of it is visible on screen. In this case
return it;
}
- Point o = I->second;
+ Point o = I->second.pos;
inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo);
// Convert to absolute
xo += o.x_;
double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
- LYXERR(Debug::DEBUG) << "i: " << i << " d: " << d
- << " best: " << best_dist << endl;
+ LYXERR(Debug::DEBUG, "i: " << i << " d: " << d
+ << " best: " << best_dist);
if (d <= best_dist) {
best_dist = d;
result = it;
}
+ /*
/// moves position closest to (x, y) in given box
bool bruteFind(Cursor & cursor,
int x, int y, int xlow, int xhigh, int ylow, int yhigh)
for ( ; it != et; it.forwardPos(true)) {
// avoid invalid nesting when selecting
if (!cursor.selection() || positionable(it, cursor.anchor_)) {
- Point p = bv_funcs::getPos(bv, it, false);
+ Point p = bv.getPos(it, false);
int xo = p.x_;
int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
return false;
}
+ */
/// moves position closest to (x, y) in given box
for ( ; it != et; it.forwardPos()) {
// avoid invalid nesting when selecting
- if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE
+ if (bv.cursorStatus(it) == CUR_INSIDE
&& (!cur.selection() || positionable(it, cur.anchor_))) {
- Point p = bv_funcs::getPos(bv, it, false);
+ Point p = bv.getPos(it, false);
int xo = p.x_;
int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
odocstringstream ods;
ods << '\n';
// only add blank line if we're not in an ERT or Listings inset
- if (par.ownerCode() != Inset::ERT_CODE
- && par.ownerCode() != Inset::LISTINGS_CODE)
+ if (par.ownerCode() != ERT_CODE
+ && par.ownerCode() != LISTINGS_CODE)
ods << '\n';
return ods.str();
}
// bv functions are not yet available!
Cursor::Cursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1), textTargetOffset_(0),
- selection_(false), mark_(false), logicalpos_(false), current_font(Font::ALL_INHERIT)
+ selection_(false), mark_(false), logicalpos_(false),
+ current_font(inherit_font)
{}
void Cursor::dispatch(FuncRequest const & cmd0)
{
- LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION
- << " cmd: " << cmd0 << '\n'
- << *this << endl;
+ LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
+ << " cmd: " << cmd0 << '\n' << *this);
if (empty())
return;
getPos(beforeDispX_, beforeDispY_);
beforeDispatchCursor_ = *this;
for (; depth(); pop()) {
- LYXERR(Debug::DEBUG) << "Cursor::dispatch: cmd: "
- << cmd0 << endl << *this << endl;
+ LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: "
+ << cmd0 << endl << *this);
BOOST_ASSERT(pos() <= lastpos());
BOOST_ASSERT(idx() <= lastidx());
BOOST_ASSERT(pit() <= lastpit());
// it completely to get a 'bomb early' behaviour in case this
// object will be used again.
if (!disp_.dispatched()) {
- LYXERR(Debug::DEBUG) << "RESTORING OLD CURSOR!" << endl;
+ LYXERR(Debug::DEBUG, "RESTORING OLD CURSOR!");
operator=(safe);
disp_.update(Update::None);
disp_.dispatched(false);
}
-void Cursor::pushLeft(Inset & p)
+void Cursor::pushBackward(Inset & p)
{
BOOST_ASSERT(!empty());
- //lyxerr << "Entering inset " << t << " left" << endl;
+ //lyxerr << "Entering inset " << t << " front" << endl;
push(p);
p.idxFirst(*this);
}
-bool Cursor::popLeft()
+bool Cursor::popBackward()
{
BOOST_ASSERT(!empty());
- //lyxerr << "Leaving inset to the left" << endl;
+ //lyxerr << "Leaving inset from in front" << endl;
inset().notifyCursorLeaves(*this);
if (depth() == 1)
return false;
}
-bool Cursor::popRight()
+bool Cursor::popForward()
{
BOOST_ASSERT(!empty());
- //lyxerr << "Leaving inset to the right" << endl;
+ //lyxerr << "Leaving inset from in back" << endl;
const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0;
inset().notifyCursorLeaves(*this);
if (depth() == 1)
void Cursor::getPos(int & x, int & y) const
{
- Point p = bv_funcs::getPos(bv(), *this, boundary());
+ Point p = bv().getPos(*this, boundary());
x = p.x_;
y = p.y_;
}
-bool Cursor::posLeft()
+bool Cursor::posBackward()
{
if (pos() == 0)
return false;
}
-bool Cursor::posRight()
+bool Cursor::posForward()
{
if (pos() == lastpos())
return false;
// we can't move into anything new during selection
if (depth() >= anchor_.depth())
return false;
- if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset()))
+ if (t.nucleus() != &anchor_[depth()].inset())
return false;
return true;
}
-void Cursor::setScreenPos(int x, int y)
+void Cursor::setScreenPos(int x, int /*y*/)
{
setTargetX(x);
- bruteFind(*this, x, y, 0, bv().workWidth(), 0, bv().workHeight());
+ //bruteFind(*this, x, y, 0, bv().workWidth(), 0, bv().workHeight());
}
plainInsert(t);
// enter the new inset and move the contents of the selection if possible
if (t->isActive()) {
- posLeft();
- // be careful here: don't use 'pushLeft(t)' as this we need to
+ posBackward();
+ // be careful here: don't use 'pushBackward(t)' as this we need to
// push the clone, not the original
- pushLeft(*nextInset());
+ pushBackward(*nextInset());
// We may not use niceInsert here (recursion)
MathData ar;
asArray(safe, ar);
if (pos() == 0) {
// If empty cell, and not part of a big cell
if (lastpos() == 0 && inset().nargs() == 1) {
- popLeft();
+ popBackward();
// Directly delete empty cell: [|[]] => [|]
if (inMathed()) {
plainErase();
if (inMathed())
pullArg();
else
- popLeft();
+ popBackward();
return true;
}
}
if (pos() == lastpos()) {
bool one_cell = inset().nargs() == 1;
if (one_cell && lastpos() == 0) {
- popLeft();
+ popBackward();
// Directly delete empty cell: [|[]] => [|]
if (inMathed()) {
plainErase();
InsetMathNest * const in = inset().asInsetMath()->asNestInset();
if (in && in->interpretString(*this, s))
return true;
- plainInsert(createInsetMath(name));
+ MathAtom atom = createInsetMath(name);
+ MathMacro * atomAsMacro = atom.nucleus()->asMacro();
+ if (atomAsMacro) {
+ // make non-greedy, i.e. don't eat parameters from the right
+ atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT);
+ }
+ plainInsert(atom);
return true;
}
MathAtom t = a;
asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
insert(t);
- posLeft();
- pushLeft(*nextInset());
+ posBackward();
+ pushBackward(*nextInset());
}
{
// FIXME: Look here
MathData ar = cell();
- if (popLeft() && inMathed()) {
+ if (popBackward() && inMathed()) {
plainErase();
cell().insert(pos(), ar);
resetAnchor();
// target
if (x_target_ == -1)
setTargetX(xo);
- else if (inset().asTextInset() && xo - textTargetOffset() != x_target()) {
+ else if (inset().asInsetText() && xo - textTargetOffset() != x_target()) {
// In text mode inside the line (not left or right) possibly set a new target_x,
// but only if we are somewhere else than the previous target-offset.
}
// any improvement going just out of inset?
- if (popLeft() && inMathed()) {
- //lyxerr << "updown: popLeft succeeded" << endl;
+ if (popBackward() && inMathed()) {
+ //lyxerr << "updown: popBackward succeeded" << endl;
int xnew;
int ynew;
getPos(xnew, ynew);
// with and without selection are handled differently
if (!selection()) {
- int yo = bv_funcs::getPos(bv(), *this, boundary()).y_;
+ int yo = bv().getPos(*this, boundary()).y_;
Cursor old = *this;
// To next/previous row
if (up)
void Cursor::handleFont(string const & font)
{
- LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION << ": " << font << endl;
+ LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << ": " << font);
docstring safe;
if (selection()) {
macroModeClose();
// something left in the cell
if (pos() == 0) {
// cursor in first position
- popLeft();
+ popBackward();
} else if (pos() == lastpos()) {
// cursor in last position
- popRight();
+ popForward();
} else {
// cursor in between. split cell
MathData::iterator bt = cell().begin();
MathAtom at = createInsetMath(from_utf8(font));
at.nucleus()->cell(0) = MathData(bt, bt + pos());
cell().erase(bt, bt + pos());
- popLeft();
+ popBackward();
plainInsert(at);
}
} else {
// on space? Take the font before (only for RTL boundary stay)
if (pos > 0) {
+ TextMetrics const & tm = bv().textMetrics(&text);
if (pos == sl.lastpos()
- || (par.isSeparator(pos) &&
- !text.isRTLBoundary(buffer(), par, pos)))
+ || (par.isSeparator(pos)
+ && !tm.isRTLBoundary(sl.pit(), pos)))
--pos;
}
void Cursor::setCurrentFont()
{
- pos_type cpos = pos();
- Paragraph & par = paragraph();
- Text const & ctext = *text();
+ CursorSlice const & cs = innerTextSlice();
+ Paragraph const & par = cs.paragraph();
+ pos_type cpit = cs.pit();
+ pos_type cpos = cs.pos();
+ Text const & ctext = *cs.text();
+ TextMetrics const & tm = bv().textMetrics(&ctext);
// are we behind previous char in fact? -> go to that char
if (cpos > 0 && boundary())
// abc| def -> font of c
// abc |[WERBEH], i.e. boundary==true -> font of c
// abc [WERBEH]| def, font of the space
- if (!ctext.isRTLBoundary(buffer(), par, cpos))
+ if (!tm.isRTLBoundary(cpit, cpos))
--cpos;
}
}
// get font
BufferParams const & bufparams = buffer().params();
current_font = par.getFontSettings(bufparams, cpos);
- real_current_font = ctext.getFont(buffer(), par, cpos);
+ real_current_font = tm.getDisplayFont(cpit, cpos);
// special case for paragraph end
- if (pos() == lastpos()
- && ctext.isRTLBoundary(buffer(), par, pos())
+ if (cs.pos() == lastpos()
+ && tm.isRTLBoundary(cpit, cs.pos())
&& !boundary()) {
Language const * lang = par.getParLanguage(bufparams);
current_font.setLanguage(lang);
- current_font.setNumber(Font::OFF);
+ current_font.fontInfo().setNumber(FONT_OFF);
real_current_font.setLanguage(lang);
- real_current_font.setNumber(Font::OFF);
+ real_current_font.fontInfo().setNumber(FONT_OFF);
}
}
+
+bool Cursor::textUndo()
+{
+ DocIterator dit = *this;
+ // Undo::textUndo() will modify dit.
+ if (!bv_->buffer().undo().textUndo(dit))
+ return false;
+ // Set cursor
+ setCursor(dit);
+ selection() = false;
+ resetAnchor();
+ fixIfBroken();
+ return true;
+}
+
+
+bool Cursor::textRedo()
+{
+ DocIterator dit = *this;
+ // Undo::textRedo() will modify dit.
+ if (!bv_->buffer().undo().textRedo(dit))
+ return false;
+ // Set cursor
+ setCursor(dit);
+ selection() = false;
+ resetAnchor();
+ fixIfBroken();
+ return true;
+}
+
+
+void Cursor::finishUndo()
+{
+ bv_->buffer().undo().finishUndo();
+}
+
+
+void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to)
+{
+ bv_->buffer().undo().recordUndo(*this, kind, from, to);
+}
+
+
+void Cursor::recordUndo(UndoKind kind, pit_type from)
+{
+ bv_->buffer().undo().recordUndo(*this, kind, from);
+}
+
+
+void Cursor::recordUndo(UndoKind kind)
+{
+ bv_->buffer().undo().recordUndo(*this, kind);
+}
+
+
+void Cursor::recordUndoInset(UndoKind kind)
+{
+ bv_->buffer().undo().recordUndoInset(*this, kind);
+}
+
+
+void Cursor::recordUndoFullDocument()
+{
+ bv_->buffer().undo().recordUndoFullDocument(*this);
+}
+
+
+void Cursor::recordUndoSelection()
+{
+ bv_->buffer().undo().recordUndo(*this, ATOMIC_UNDO,
+ selBegin().pit(), selEnd().pit());
+}
+
+
} // namespace lyx