#include "BufferView.h"
#include "buffer.h"
#include "cursor.h"
+#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "encoding.h"
#include "funcrequest.h"
-#include "iterators.h"
#include "language.h"
#include "lfuns.h"
#include "lyxfont.h"
#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
+#include "pariterator.h"
#include "insets/updatableinset.h"
#include "insets/insettabular.h"
#include <boost/assert.hpp>
+using lyx::par_type;
+
using std::string;
using std::vector;
using std::endl;
LCursor::col_type & c1, LCursor::col_type & c2)
{
InsetBase & p = i1.inset();
- c1 = p.col(i1.idx_);
- c2 = p.col(i2.idx_);
+ c1 = p.col(i1.idx());
+ c2 = p.col(i2.idx());
if (c1 > c2)
swap(c1, c2);
- r1 = p.row(i1.idx_);
- r2 = p.row(i2.idx_);
+ r1 = p.row(i1.idx());
+ r2 = p.row(i2.idx());
if (r1 > r2)
swap(r1, r2);
}
{}
-void LCursor::reset()
+void LCursor::reset(InsetBase & inset)
{
clear();
- push_back(CursorSlice());
+ push_back(CursorSlice(inset));
anchor_.clear();
- anchor_.push_back(CursorSlice());
cached_y_ = 0;
clearTargetX();
selection_ = false;
DispatchResult LCursor::dispatch(FuncRequest const & cmd0)
{
+ lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
if (empty())
return DispatchResult();
- //lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
FuncRequest cmd = cmd0;
- nopop_ = false;
LCursor safe = *this;
for ( ; size(); pop()) {
}
// it completely to get a 'bomb early' behaviour in case this
// object will be used again.
- if (nopop_ || !disp_.dispatched())
+ if (!disp_.dispatched()) {
+ lyxerr << "RESTORING OLD CURSOR!" << endl;
operator=(safe);
+ }
return disp_;
}
bool LCursor::getStatus(FuncRequest const & cmd, FuncStatus & status)
{
+ // This is, of course, a mess. Better create a new doc iterator and use
+ // this in Inset::getStatus. This might require an additional
+ // BufferView * arg, though (which should be avoided)
LCursor safe = *this;
+ bool res = false;
for ( ; size(); pop()) {
//lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
BOOST_ASSERT(pos() <= lastpos());
// a definitive decision on whether it want to handle the
// request or not. The result of this decision is put into
// the 'status' parameter.
- if (inset().getStatus(*this, cmd, status))
+ if (inset().getStatus(*this, cmd, status)) {
+ res = true;
break;
+ }
}
operator=(safe);
- return true;
+ return res;
}
{
BOOST_ASSERT(size() >= 1);
pop_back();
- anchor_.pop_back();
}
CursorSlice & LCursor::anchor()
{
+ BOOST_ASSERT(!anchor_.empty());
return anchor_.back();
}
CursorSlice const & LCursor::anchor() const
{
+ BOOST_ASSERT(!anchor_.empty());
return anchor_.back();
}
}
-CursorSlice & LCursor::selBegin()
+CursorSlice const & LCursor::selEnd() const
{
if (!selection())
return back();
- // can't use std::min as this returns a const ref
- return anchor() < back() ? anchor() : back();
+ return anchor() > back() ? anchor() : back();
}
-CursorSlice const & LCursor::selEnd() const
+DocumentIterator LCursor::selectionBegin() const
{
if (!selection())
- return back();
- return anchor() > back() ? anchor() : back();
+ return *this;
+ return anchor() < back() ? anchor_ : *this;
}
-CursorSlice & LCursor::selEnd()
+DocumentIterator LCursor::selectionEnd() const
{
if (!selection())
- return back();
- // can't use std::min as this returns a const ref
- return anchor() > back() ? anchor() : back();
+ return *this;
+ return anchor() > back() ? anchor_ : *this;
}
CursorSlice i1 = selBegin();
CursorSlice i2 = selEnd();
- if (i1.idx_ == i2.idx_) {
+ if (i1.idx() == i2.idx()) {
if (i1.inset().asMathInset()) {
MathArray::const_iterator it = i1.cell().begin();
- return asString(MathArray(it + i1.pos_, it + i2.pos_));
+ return asString(MathArray(it + i1.pos(), it + i2.pos()));
} else {
return "unknown selection 1";
}
CursorSlice const & i2 = selEnd();
#warning FIXME
if (i1.inset().asMathInset()) {
- if (i1.idx_ == i2.idx_) {
- i1.cell().erase(i1.pos_, i2.pos_);
+ if (i1.idx() == i2.idx()) {
+ i1.cell().erase(i1.pos(), i2.pos());
} else {
MathInset * p = i1.asMathInset();
row_type r1, r2;
std::ostream & operator<<(std::ostream & os, LCursor const & cur)
{
- for (size_t i = 0, n = cur.size(); i != n; ++i)
- os << " " << cur.operator[](i) << " | " << cur.anchor_[i] << "\n";
- os << " selection: " << cur.selection_ << endl;
+ for (size_t i = 0, n = cur.size(); i != n; ++i) {
+ os << " " << cur.operator[](i) << " | ";
+ if (i < cur.anchor_.size())
+ os << cur.anchor_[i];
+ else
+ os << "-------------------------------";
+ os << "\n";
+ }
+ for (size_t i = cur.size(), n = cur.anchor_.size(); i < n; ++i) {
+ os << "------------------------------- | " << cur.anchor_[i] << "\n";
+ }
+ os << " selection: " << cur.selection_
+ << " x_target: " << cur.x_target_ << endl;
return os;
}
return true;
// we can't move into anything new during selection
- if (depth() == anchor_.size())
+ if (depth() >= anchor_.size())
return false;
if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset()))
return false;
{
if (pos() > from)
pos() += diff;
- if (anchor().pos_ > from)
- anchor().pos_ += diff;
+ if (anchor().pos() > from)
+ anchor().pos() += diff;
// just to be on the safe side
// theoretically unecessary
normalize();
return 0;
MathGridInset * p = m->asGridInset();
if (p) {
- idx = operator[](i).idx_;
+ idx = operator[](i).idx();
return p;
}
}
bool LCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh)
{
BOOST_ASSERT(!empty());
- ParagraphList::iterator beg;
- ParagraphList::iterator end;
+ par_type beg, end;
CursorSlice bottom = operator[](0);
LyXText * text = bottom.text();
BOOST_ASSERT(text);
getParsInRange(text->paragraphs(), ylow, yhigh, beg, end);
- DocumentIterator it = insetBegin(bv().buffer()->inset());
+ DocumentIterator it(bv().buffer()->inset());
DocumentIterator et;
- lyxerr << "x: " << x << " y: " << y << endl;
- lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
- lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
+ //lyxerr << "x: " << x << " y: " << y << endl;
+ //lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
+ //lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
- it.par() = text->parOffset(beg);
+ it.par() = beg;
//et.par() = text->parOffset(end);
double best_dist = 10e10;
cur.inset().getCursorPos(cur, xo, yo);
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
- lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
+ //lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
if (d <= best_dist) {
- lyxerr << "*" << endl;
+ //lyxerr << "*" << endl;
best_dist = d;
best_cursor = it;
}
}
}
- lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
+ //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
if (best_dist < 1e10)
setCursor(best_cursor, false);
return best_dist < 1e10;
DocumentIterator it = *this;
it.back().pos() = 0;
DocumentIterator et = *this;
- et.back().pos() = et.back().asMathInset()->cell(et.back().idx_).size();
+ et.back().pos() = et.back().asMathInset()->cell(et.back().idx()).size();
for (int i = 0; ; ++i) {
int xo, yo;
CursorSlice & cur = it.back();
if (inTexted()) {
Buffer const & buffer = *bv().buffer();
+ ParagraphList & pars = text()->paragraphs();
// should be const ...
- ParagraphList::iterator startpit = text()->getPar(selBegin());
- ParagraphList::iterator endpit = text()->getPar(selEnd());
+ par_type startpit = selBegin().par();
+ par_type endpit = selEnd().par();
size_t const startpos = selBegin().pos();
size_t const endpos = selEnd().pos();
if (startpit == endpit)
- return startpit->asString(buffer, startpos, endpos, label);
+ return pars[startpit].asString(buffer, startpos, endpos, label);
// First paragraph in selection
- string result =
- startpit->asString(buffer, startpos, startpit->size(), label) + "\n\n";
+ string result = pars[startpit].
+ asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
// The paragraphs in between (if any)
- ParagraphList::iterator pit = startpit;
- for (++pit; pit != endpit; ++pit)
- result += pit->asString(buffer, 0, pit->size(), label) + "\n\n";
+ for (par_type pit = startpit + 1; pit != endpit; ++pit) {
+ Paragraph & par = pars[pit];
+ result += par.asString(buffer, 0, par.size(), label) + "\n\n";
+ }
// Last paragraph in selection
- result += endpit->asString(buffer, 0, endpos, label);
+ result += pars[endpit].asString(buffer, 0, endpos, label);
return result;
}
}
-// only used by the spellchecker
-void LCursor::replaceWord(string const & replacestring)
-{
- LyXText * t = text();
- BOOST_ASSERT(t);
-
- t->replaceSelectionWithString(*this, replacestring);
- t->setSelectionRange(*this, replacestring.length());
-
- // Go back so that replacement string is also spellchecked
- for (string::size_type i = 0; i < replacestring.length() + 1; ++i)
- t->cursorLeft(*this);
-}
-
-
-void LCursor::update()
-{
- bv().update();
-}
-
-
string LCursor::getPossibleLabel()
{
return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
break;
CursorSlice const & sl = operator[](s);
LyXText & text = *sl.text();
- ParagraphList::iterator pit = text.getPar(sl.par());
- LyXFont font = pit->getFont(
- bv().buffer()->params(), sl.pos(), outerFont(pit, text.paragraphs()));
+ LyXFont font = text.getPar(sl.par()).getFont(
+ bv().buffer()->params(), sl.pos(), outerFont(sl.par(), text.paragraphs()));
return font.language()->encoding();
}
}
+void LCursor::dispatched()
+{
+ disp_.dispatched(true);
+}
+
+
void LCursor::noUpdate()
{
disp_.update(false);
projects / lyx.git / blobdiff