*
* \author Alejandro Aguilar Sierra
* \author Alfredo Braunstein
+ * \author Dov Feldstern
* \author André Pönitz
* \author Stefan Schimanski
*
#include <config.h>
#include "Bidi.h"
-#include "BufferView.h"
#include "Buffer.h"
-#include "Cursor.h"
+#include "BufferView.h"
#include "CoordCache.h"
+#include "Cursor.h"
#include "CutAndPaste.h"
#include "DispatchResult.h"
#include "Encoding.h"
+#include "Font.h"
#include "FuncRequest.h"
#include "Language.h"
#include "lfuns.h"
-#include "Font.h"
#include "LyXFunc.h" // only for setMessage()
#include "LyXRC.h"
-#include "Row.h"
-#include "Text.h"
-#include "Paragraph.h"
#include "paragraph_funcs.h"
+#include "Paragraph.h"
#include "ParIterator.h"
+#include "Row.h"
+#include "Text.h"
#include "TextMetrics.h"
+#include "TocBackend.h"
#include "support/debug.h"
#include "support/docstream.h"
#include <boost/assert.hpp>
#include <boost/bind.hpp>
-#include <boost/current_function.hpp>
#include <sstream>
#include <limits>
#include <map>
-using std::string;
-using std::vector;
-using std::endl;
-using std::min;
-using std::for_each;
-
+using namespace std;
namespace lyx {
// Used only in mathed
DocIterator bruteFind2(Cursor const & c, int x, int y)
{
- double best_dist = std::numeric_limits<double>::max();
+ double best_dist = numeric_limits<double>::max();
DocIterator result;
int xo;
int yo;
Inset const * inset = &it.inset();
- std::map<Inset const *, Geometry> const & data =
+ map<Inset const *, Geometry> const & data =
c.bv().coordCache().getInsets().getData();
- std::map<Inset const *, Geometry>::const_iterator I = data.find(inset);
+ 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
else
++et.pit();
- double best_dist = std::numeric_limits<double>::max();;
+ double best_dist = numeric_limits<double>::max();;
DocIterator best_cursor = et;
for ( ; it != et; it.forwardPos(true)) {
it.pit() = from;
DocIterator et = doc_iterator_end(inset);
- double best_dist = std::numeric_limits<double>::max();
+ double best_dist = numeric_limits<double>::max();
DocIterator best_cursor = et;
for ( ; it != et; it.forwardPos()) {
{
clear();
push_back(CursorSlice(inset));
- anchor_ = DocIterator(inset);
+ anchor_ = doc_iterator_begin(inset);
+ anchor_.clear();
clearTargetX();
selection_ = false;
mark_ = false;
void Cursor::dispatch(FuncRequest const & cmd0)
{
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << " cmd: " << cmd0 << '\n' << *this);
+ LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this);
if (empty())
return;
Cursor safe = *this;
// store some values to be used inside of the handlers
- getPos(beforeDispX_, beforeDispY_);
beforeDispatchCursor_ = *this;
for (; depth(); pop()) {
LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: "
bool Cursor::popBackward()
{
BOOST_ASSERT(!empty());
- //lyxerr << "Leaving inset from in front" << endl;
- inset().notifyCursorLeaves(*this);
if (depth() == 1)
return false;
pop();
BOOST_ASSERT(!empty());
//lyxerr << "Leaving inset from in back" << endl;
const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0;
- inset().notifyCursorLeaves(*this);
if (depth() == 1)
return false;
pop();
Row const & Cursor::textRow() const
{
- ParagraphMetrics const & pm = bv().parMetrics(text(), pit());
+ CursorSlice const & cs = innerTextSlice();
+ ParagraphMetrics const & pm = bv().parMetrics(cs.text(), cs.pit());
BOOST_ASSERT(!pm.rows().empty());
return pm.getRow(pos(), boundary());
}
}
+void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos)
+{
+ // preparing bidi tables
+ Paragraph const & par = paragraph();
+ Buffer const & buf = buffer();
+ Row const & row = textRow();
+ Bidi bidi;
+ bidi.computeTables(par, buf, row);
+
+ LYXERR(Debug::RTL, "bidi: " << row.pos() << "--" << row.endpos());
+
+ // The cursor is painted *before* the character at pos(), or, if 'boundary'
+ // is true, *after* the character at (pos() - 1). So we already have one
+ // known position around the cursor:
+ pos_type known_pos = boundary() ? pos() - 1 : pos();
+
+ // edge case: if we're at the end of the paragraph, things are a little
+ // different (because lastpos is a position which does not really "exist"
+ // --- there's no character there yet).
+ if (known_pos == lastpos()) {
+ if (par.isRTL(buf.params())) {
+ left_pos = -1;
+ right_pos = bidi.vis2log(row.pos());
+ }
+ else { // LTR paragraph
+ right_pos = -1;
+ left_pos = bidi.vis2log(row.endpos() - 1);
+ }
+ return;
+ }
+
+ // Whether 'known_pos' is to the left or to the right of the cursor depends
+ // on whether it is an RTL or LTR character...
+ bool const cur_is_RTL =
+ par.getFontSettings(buf.params(), known_pos).isVisibleRightToLeft();
+ // ... in the following manner:
+ // For an RTL character, "before" means "to the right" and "after" means
+ // "to the left"; and for LTR, it's the reverse. So, 'known_pos' is to the
+ // right of the cursor if (RTL && boundary) or (!RTL && !boundary):
+ bool known_pos_on_right = (cur_is_RTL == boundary());
+
+ // So we now know one of the positions surrounding the cursor. Let's
+ // determine the other one:
+
+ if (known_pos_on_right) {
+ right_pos = known_pos;
+ // *visual* position of 'left_pos':
+ pos_type v_left_pos = bidi.log2vis(right_pos) - 1;
+ // If the position we just identified as 'left_pos' is a "skipped
+ // separator" (a separator which is at the logical end of a row,
+ // except for the last row in a paragraph; such separators are not
+ // painted, so they "are not really there"; note that in bidi text,
+ // such a separator could appear visually in the middle of a row),
+ // set 'left_pos' to the *next* position to the left.
+ if (bidi.inRange(v_left_pos)
+ && bidi.vis2log(v_left_pos) + 1 == row.endpos()
+ && row.endpos() < lastpos()
+ && par.isSeparator(bidi.vis2log(v_left_pos))) {
+ --v_left_pos;
+ }
+ // calculate the logical position of 'left_pos', if in row
+ if (!bidi.inRange(v_left_pos))
+ left_pos = -1;
+ else
+ left_pos = bidi.vis2log(v_left_pos);
+ // If the position we identified as 'right_pos' is a "skipped
+ // separator", set 'right_pos' to the *next* position to the right.
+ if (right_pos + 1 == row.endpos() && row.endpos() < lastpos()
+ && par.isSeparator(right_pos)) {
+ pos_type v_right_pos = bidi.log2vis(right_pos) + 1;
+ if (!bidi.inRange(v_right_pos))
+ right_pos = -1;
+ else
+ right_pos = bidi.vis2log(v_right_pos);
+ }
+ }
+ else { // known_pos is on the left
+ left_pos = known_pos;
+ // *visual* position of 'right_pos'
+ pos_type v_right_pos = bidi.log2vis(left_pos) + 1;
+ // If the position we just identified as 'right_pos' is a "skipped
+ // separator", set 'right_pos' to the *next* position to the right.
+ if (bidi.inRange(v_right_pos)
+ && bidi.vis2log(v_right_pos) + 1 == row.endpos()
+ && row.endpos() < lastpos()
+ && par.isSeparator(bidi.vis2log(v_right_pos))) {
+ ++v_right_pos;
+ }
+ // calculate the logical position of 'right_pos', if in row
+ if (!bidi.inRange(v_right_pos))
+ right_pos = -1;
+ else
+ right_pos = bidi.vis2log(v_right_pos);
+ // If the position we identified as 'left_pos' is a "skipped
+ // separator", set 'left_pos' to the *next* position to the left.
+ if (left_pos + 1 == row.endpos() && row.endpos() < lastpos()
+ && par.isSeparator(left_pos)) {
+ pos_type v_left_pos = bidi.log2vis(left_pos) - 1;
+ if (!bidi.inRange(v_left_pos))
+ left_pos = -1;
+ else
+ left_pos = bidi.vis2log(v_left_pos);
+ }
+ }
+ return;
+}
+
+
+bool Cursor::posVisToNewRow(bool movingLeft)
+{
+ Paragraph const & par = paragraph();
+ Buffer const & buf = buffer();
+ Row const & row = textRow();
+ bool par_is_LTR = !par.isRTL(buf.params());
+
+ // if moving left in an LTR paragraph or moving right in an RTL one,
+ // move to previous row
+ if (par_is_LTR == movingLeft) {
+ if (row.pos() == 0) { // we're at first row in paragraph
+ if (pit() == 0) // no previous paragraph! don't move
+ return false;
+ // move to last pos in previous par
+ --pit();
+ pos() = lastpos();
+ boundary(false);
+ } else { // move to previous row in this par
+ pos() = row.pos() - 1; // this is guaranteed to be in previous row
+ boundary(false);
+ }
+ }
+ // if moving left in an RTL paragraph or moving right in an LTR one,
+ // move to next row
+ else {
+ if (row.endpos() == lastpos()) { // we're at last row in paragraph
+ if (pit() == lastpit()) // last paragraph! don't move
+ return false;
+ // move to first row in next par
+ ++pit();
+ pos() = 0;
+ boundary(false);
+ } else { // move to next row in this par
+ pos() = row.endpos();
+ boundary(false);
+ }
+ }
+
+ // make sure we're at left-/right-most pos in new row
+ posVisToRowExtremity(!movingLeft);
+
+ return true;
+}
+
+
+void Cursor::posVisToRowExtremity(bool left)
+{
+ // prepare bidi tables
+ Paragraph const & par = paragraph();
+ Buffer const & buf = buffer();
+ Row const & row = textRow();
+ Bidi bidi;
+ bidi.computeTables(par, buf, row);
+
+ LYXERR(Debug::RTL, "entering extremity: " << pit() << "," << pos() << ","
+ << (boundary() ? 1 : 0));
+
+ if (left) { // move to leftmost position
+ // if this is an RTL paragraph, and we're at the last row in the
+ // paragraph, move to lastpos
+ if (par.isRTL(buf.params()) && row.endpos() == lastpos())
+ pos() = lastpos();
+ else {
+ pos() = bidi.vis2log(row.pos());
+
+ // Moving to the leftmost position in the row, the cursor should
+ // normally be placed to the *left* of the leftmost position.
+ // A very common exception, though, is if the leftmost character
+ // also happens to be the separator at the (logical) end of the row
+ // --- in this case, the separator is positioned beyond the left
+ // margin, and we don't want to move the cursor there (moving to
+ // the left of the separator is equivalent to moving to the next
+ // line). So, in this case we actually want to place the cursor
+ // to the *right* of the leftmost position (the separator).
+ // Another exception is if we're moving to the logically last
+ // position in the row, which is *not* a separator: this means
+ // that the entire row has no separators (if there were any, the
+ // row would have been broken there); and therefore in this case
+ // we also move to the *right* of the last position (this indicates
+ // to the user that there is no space after this position, and is
+ // consistent with the behavior in the middle of a row --- moving
+ // right or left moves to the next/previous character; if we were
+ // to move to the *left* of this position, that would simulate
+ // a separator which is not really there!).
+ // Finally, there is an exception to the previous exception: if
+ // this non-separator-but-last-position-in-row is an inset, then
+ // we *do* want to stay to the left of it anyway: this is the
+ // "boundary" which we simulate at insets.
+
+ bool right_of_pos = false; // do we want to be to the right of pos?
+
+ // as explained above, if at last pos in row, stay to the right
+ if ((pos() == row.endpos() - 1) && !par.isInset(pos()))
+ right_of_pos = true;
+
+ // Now we know if we want to be to the left or to the right of pos,
+ // let's make sure we are where we want to be.
+ bool new_pos_is_RTL =
+ par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft();
+
+ if (new_pos_is_RTL == !right_of_pos) {
+ ++pos();
+ boundary(true);
+ }
+
+ }
+ }
+ else { // move to rightmost position
+ // if this is an LTR paragraph, and we're at the last row in the
+ // paragraph, move to lastpos
+ if (!par.isRTL(buf.params()) && row.endpos() == lastpos())
+ pos() = lastpos();
+ else {
+ pos() = bidi.vis2log(row.endpos() - 1);
+
+ // Moving to the rightmost position in the row, the cursor should
+ // normally be placed to the *right* of the rightmost position.
+ // A very common exception, though, is if the rightmost character
+ // also happens to be the separator at the (logical) end of the row
+ // --- in this case, the separator is positioned beyond the right
+ // margin, and we don't want to move the cursor there (moving to
+ // the right of the separator is equivalent to moving to the next
+ // line). So, in this case we actually want to place the cursor
+ // to the *left* of the rightmost position (the separator).
+ // Another exception is if we're moving to the logically last
+ // position in the row, which is *not* a separator: this means
+ // that the entire row has no separators (if there were any, the
+ // row would have been broken there); and therefore in this case
+ // we also move to the *left* of the last position (this indicates
+ // to the user that there is no space after this position, and is
+ // consistent with the behavior in the middle of a row --- moving
+ // right or left moves to the next/previous character; if we were
+ // to move to the *right* of this position, that would simulate
+ // a separator which is not really there!).
+ // Finally, there is an exception to the previous exception: if
+ // this non-separator-but-last-position-in-row is an inset, then
+ // we *do* want to stay to the right of it anyway: this is the
+ // "boundary" which we simulate at insets.
+
+ bool left_of_pos = false; // do we want to be to the left of pos?
+
+ // as explained above, if at last pos in row, stay to the left
+ if ((pos() == row.endpos() - 1) && !par.isInset(pos()))
+ left_of_pos = true;
+
+ // Now we know if we want to be to the left or to the right of pos,
+ // let's make sure we are where we want to be.
+ bool new_pos_is_RTL =
+ par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft();
+
+ if (new_pos_is_RTL == left_of_pos) {
+ ++pos();
+ boundary(true);
+ }
+ }
+ }
+ LYXERR(Debug::RTL, "leaving extremity: " << pit() << "," << pos() << ","
+ << (boundary() ? 1 : 0));
+}
+
+
CursorSlice Cursor::anchor() const
{
BOOST_ASSERT(anchor_.depth() >= depth());
bool Cursor::selHandle(bool sel)
{
//lyxerr << "Cursor::selHandle" << endl;
+ if (mark())
+ sel = true;
if (sel == selection())
return false;
}
-std::ostream & operator<<(std::ostream & os, Cursor const & cur)
+ostream & operator<<(ostream & os, Cursor const & cur)
{
os << "\n cursor: | anchor:\n";
for (size_t i = 0, n = cur.depth(); i != n; ++i) {
//#define FILEDEBUG 1
-bool Cursor::isInside(Inset const * p)
+bool Cursor::isInside(Inset const * p) const
{
for (size_t i = 0; i != depth(); ++i)
if (&operator[](i).inset() == p)
}
+InsetMathUnknown const * Cursor::activeMacro() const
+{
+ return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0;
+}
+
+
void Cursor::pullArg()
{
// FIXME: Look here
int xo = 0;
int yo = 0;
getPos(xo, yo);
- xo = beforeDispX_;
-
+ xo = theLyXFunc().cursorBeforeDispatchX();
+
// check if we had something else in mind, if not, this is the future
// target
if (x_target_ == -1)
int x;
int y;
getPos(x, y);
- if ((!up && y <= beforeDispY_) ||
- (up && y >= beforeDispY_))
+ int oy = theLyXFunc().cursorBeforeDispatchY();
+ if ((!up && y <= oy) ||
+ (up && y >= oy))
operator=(old);
else
return true;
int x;
int y;
getPos(x, y);
- if ((!up && y <= beforeDispY_) ||
- (up && y >= beforeDispY_))
+ int oy = theLyXFunc().cursorBeforeDispatchY();
+ if ((!up && y <= oy) ||
+ (up && y >= oy))
operator=(old);
else
return true;
//lyxerr << "updown: popBackward succeeded" << endl;
int xnew;
int ynew;
+ int yold = theLyXFunc().cursorBeforeDispatchY();
getPos(xnew, ynew);
- if (up ? ynew < beforeDispY_ : ynew > beforeDispY_)
+ if (up ? ynew < yold : ynew > yold)
return true;
}
int xo = 0;
int yo = 0;
getPos(xo, yo);
- xo = beforeDispX_;
-
+ xo = theLyXFunc().cursorBeforeDispatchX();
+
// update the targetX - this is here before the "return false"
// to set a new target which can be used by InsetTexts above
// if we cannot move up/down inside this inset anymore
Cursor old = *this;
if (up) {
if (row > 0) {
- top().pos() = std::min(tm.x2pos(pit(), row - 1, xo), top().lastpos());
+ top().pos() = min(tm.x2pos(pit(), row - 1, xo), top().lastpos());
} else if (pit() > 0) {
--pit();
ParagraphMetrics const & pmcur = bv_->parMetrics(text(), pit());
- top().pos() = std::min(tm.x2pos(pit(), pmcur.rows().size() - 1, xo), top().lastpos());
+ top().pos() = min(tm.x2pos(pit(), pmcur.rows().size() - 1, xo), top().lastpos());
}
} else {
if (row + 1 < int(pm.rows().size())) {
- top().pos() = std::min(tm.x2pos(pit(), row + 1, xo), top().lastpos());
+ top().pos() = min(tm.x2pos(pit(), row + 1, xo), top().lastpos());
} else if (pit() + 1 < int(text()->paragraphs().size())) {
++pit();
- top().pos() = std::min(tm.x2pos(pit(), 0, xo), top().lastpos());
+ top().pos() = min(tm.x2pos(pit(), 0, xo), top().lastpos());
}
}
void Cursor::handleFont(string const & font)
{
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << ": " << font);
+ LYXERR(Debug::DEBUG, font);
docstring safe;
if (selection()) {
macroModeClose();
{
if (empty())
return 0;
- int s = 0;
- // go up until first non-0 text is hit
- // (innermost text is 0 in mathed)
- for (s = depth() - 1; s >= 0; --s)
- if (operator[](s).text())
- break;
- CursorSlice const & sl = operator[](s);
+ CursorSlice const & sl = innerTextSlice();
Text const & text = *sl.text();
Font font = text.getPar(sl.pit()).getFont(
bv().buffer().params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
// if a character is entered.
// HACK. far from being perfect...
- // go up until first non-0 text is hit
- // (innermost text is 0 in mathed)
- int s = 0;
- for (s = depth() - 1; s >= 0; --s)
- if (operator[](s).text())
- break;
- CursorSlice const & sl = operator[](s);
+
+ CursorSlice const & sl = innerTextSlice();
Text const & text = *sl.text();
Paragraph const & par = text.getPar(sl.pit());
}
-bool notifyCursorLeaves(DocIterator const & old, Cursor & cur)
+bool notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
// find inset in common
size_type i;
for (i = 0; i < old.depth() && i < cur.depth(); ++i) {
- if (&old.inset() != &cur.inset())
+ if (&old[i].inset() != &cur[i].inset())
break;
}
// notify everything on top of the common part in old cursor,
// but stop if the inset claims the cursor to be invalid now
- for (; i < old.depth(); ++i) {
- if (old[i].inset().notifyCursorLeaves(cur))
+ for (; i < old.depth(); ++i) {
+ Cursor insetPos = old;
+ insetPos.cutOff(i);
+ if (old[i].inset().notifyCursorLeaves(insetPos, cur))
return true;
}
}
+void Cursor::checkBufferStructure()
+{
+ if (paragraph().layout()->toclevel == Layout::NOT_IN_TOC)
+ return;
+ Buffer const * master = buffer().masterBuffer();
+ master->tocBackend().updateItem(ParConstIterator(*this));
+ master->structureChanged();
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff