theFontMetrics(cursor_.getFont());
int const asc = fm.maxAscent();
int const des = fm.maxDescent();
- Point const p = bv_funcs::getPos(*this, cursor_, cursor_.boundary());
+ Point const p = getPos(cursor_, cursor_.boundary());
if (p.y_ - asc >= 0 && p.y_ + des < height_)
return false;
}
cur.clearSelection();
break;
case CUR_INSIDE:
- int const y = bv_funcs::getPos(*this, cur, cur.boundary()).y_;
+ int const y = getPos(cur, cur.boundary()).y_;
int const newy = min(last, max(y, first));
if (y != newy) {
cur.reset(buffer_.inset());
// FIXME: This does not work within mathed!
CursorStatus BufferView::cursorStatus(DocIterator const & dit) const
{
- Point const p = bv_funcs::getPos(*this, dit, dit.boundary());
+ Point const p = getPos(dit, dit.boundary());
if (p.y_ < 0)
return CUR_ABOVE;
if (p.y_ > workHeight())
CursorSlice & bot = cursor_.bottom();
TextMetrics & tm = text_metrics_[bot.text()];
ParagraphMetrics const & pm = tm.parMetrics(bot.pit());
- Point p = bv_funcs::coordOffset(*this, cursor_, cursor_.boundary());
- offset_ref_ = p.y_ + pm.ascent() - height_ / 2;
+ int y = coordOffset(cursor_, cursor_.boundary()).y_;
+ offset_ref_ = y + pm.ascent() - height_ / 2;
need_centering_ = false;
}
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN: {
- Point p = bv_funcs::getPos(*this, cur, cur.boundary());
+ Point p = getPos(cur, cur.boundary());
if (p.y_ < 0 || p.y_ > height_) {
// The cursor is off-screen so recenter before proceeding.
center();
//FIXME: updateMetrics() does not update paragraph position
// This is done at draw() time. So we need a redraw!
buffer_.changed();
- p = bv_funcs::getPos(*this, cur, cur.boundary());
+ p = getPos(cur, cur.boundary());
}
scroll(cmd.action == LFUN_SCREEN_UP? - height_ : height_);
cur.reset(buffer_.inset());
case LFUN_SCREEN_DOWN_SELECT: {
cur.selHandle(true);
size_t initial_depth = cur.depth();
- Point const p = bv_funcs::getPos(*this, cur, cur.boundary());
+ Point const p = getPos(cur, cur.boundary());
scroll(cmd.action == LFUN_SCREEN_UP_SELECT? - height_ : height_);
// FIXME: We need to verify if the cursor stayed within an inset...
//cur.reset(buffer_.inset());
}
+Point BufferView::coordOffset(DocIterator const & dit, bool boundary) const
+{
+ int x = 0;
+ int y = 0;
+ int lastw = 0;
+
+ // Addup contribution of nested insets, from inside to outside,
+ // keeping the outer paragraph for a special handling below
+ for (size_t i = dit.depth() - 1; i >= 1; --i) {
+ CursorSlice const & sl = dit[i];
+ int xx = 0;
+ int yy = 0;
+
+ // get relative position inside sl.inset()
+ sl.inset().cursorPos(*this, sl, boundary && (i + 1 == dit.depth()), xx, yy);
+
+ // Make relative position inside of the edited inset relative to sl.inset()
+ x += xx;
+ y += yy;
+
+ // In case of an RTL inset, the edited inset will be positioned to the left
+ // of xx:yy
+ if (sl.text()) {
+ bool boundary_i = boundary && i + 1 == dit.depth();
+ bool rtl = textMetrics(sl.text()).isRTL(sl, boundary_i);
+ if (rtl)
+ x -= lastw;
+ }
+
+ // remember width for the case that sl.inset() is positioned in an RTL inset
+ if (i && dit[i - 1].text()) {
+ // If this Inset is inside a Text Inset, retrieve the Dimension
+ // from the containing text instead of using Inset::dimension() which
+ // might not be implemented.
+ // FIXME (Abdel 23/09/2007): this is a bit messy because of the
+ // elimination of Inset::dim_ cache. This coordOffset() method needs
+ // to be rewritten in light of the new design.
+ Dimension const & dim = parMetrics(dit[i - 1].text(),
+ dit[i - 1].pit()).insetDimension(&sl.inset());
+ lastw = dim.wid;
+ } else {
+ Dimension const dim = sl.inset().dimension(*this);
+ lastw = dim.wid;
+ }
+
+ //lyxerr << "Cursor::getPos, i: "
+ // << i << " x: " << xx << " y: " << y << endl;
+ }
+
+ // Add contribution of initial rows of outermost paragraph
+ CursorSlice const & sl = dit[0];
+ TextMetrics const & tm = textMetrics(sl.text());
+ ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
+ BOOST_ASSERT(!pm.rows().empty());
+ y -= pm.rows()[0].ascent();
+#if 1
+ // FIXME: document this mess
+ size_t rend;
+ if (sl.pos() > 0 && dit.depth() == 1) {
+ int pos = sl.pos();
+ if (pos && boundary)
+ --pos;
+// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
+ rend = pm.pos2row(pos);
+ } else
+ rend = pm.pos2row(sl.pos());
+#else
+ size_t rend = pm.pos2row(sl.pos());
+#endif
+ for (size_t rit = 0; rit != rend; ++rit)
+ y += pm.rows()[rit].height();
+ y += pm.rows()[rend].ascent();
+
+ TextMetrics const & bottom_tm = textMetrics(dit.bottom().text());
+
+ // Make relative position from the nested inset now bufferview absolute.
+ int xx = bottom_tm.cursorX(dit.bottom(), boundary && dit.depth() == 1);
+ x += xx;
+
+ // In the RTL case place the nested inset at the left of the cursor in
+ // the outer paragraph
+ bool boundary_1 = boundary && 1 == dit.depth();
+ bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
+ if (rtl)
+ x -= lastw;
+
+ return Point(x, y);
+}
+
+
+Point BufferView::getPos(DocIterator const & dit, bool boundary) const
+{
+ CursorSlice const & bot = dit.bottom();
+ TextMetrics const & tm = textMetrics(bot.text());
+ if (!tm.has(bot.pit()))
+ return Point(-1, -1);
+
+ Point p = coordOffset(dit, boundary); // offset from outer paragraph
+ p.y_ += tm.parMetrics(bot.pit()).position();
+ return p;
+}
+
+
void BufferView::draw(frontend::Painter & pain)
{
PainterInfo pi(this, pain);
///
CoordCache const & coordCache() const { return coord_cache_; }
+ ///
+ Point getPos(DocIterator const & dit, bool boundary) const;
+
+
///
void draw(frontend::Painter & pain);
boost::signal<void(docstring layout)> layoutChanged;
private:
+ // the position relative to (0, baseline) of outermost paragraph
+ Point coordOffset(DocIterator const & dit, bool boundary) const;
/// Update current paragraph metrics.
/// \return true if no further update is needed.
bool singleParUpdate();
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) {
// avoid invalid nesting when selecting
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) {
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_;
}
// 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)
if (clipAbove)
middleTop = 0;
else
- middleTop = bv_funcs::getPos(*bv_, beg, beg.boundary()).y_ + row1.descent();
+ middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent();
// clip below
int middleBottom;
if (clipBelow)
middleBottom = bv_->workHeight();
else
- middleBottom = bv_funcs::getPos(*bv_, end, end.boundary()).y_ - row2.ascent();
+ middleBottom = bv_->getPos(end, end.boundary()).y_ - row2.ascent();
// start and end in the same line?
if (!clipAbove && !clipBelow && &row1 == &row2)
DocIterator cur = beg;
int x1 = cursorX(beg.top(), beg.boundary());
int x2 = cursorX(end.top(), end.boundary());
- int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+ int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
int y2 = y1 + row.height();
// draw the margins
}
-// the next two should probably go elsewhere
-// this give the position relative to (0, baseline) of outermost
-// paragraph
-Point coordOffset(BufferView const & bv, DocIterator const & dit,
- bool boundary)
-{
- int x = 0;
- int y = 0;
- int lastw = 0;
-
- // Addup contribution of nested insets, from inside to outside,
- // keeping the outer paragraph for a special handling below
- for (size_t i = dit.depth() - 1; i >= 1; --i) {
- CursorSlice const & sl = dit[i];
- int xx = 0;
- int yy = 0;
-
- // get relative position inside sl.inset()
- sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy);
-
- // Make relative position inside of the edited inset relative to sl.inset()
- x += xx;
- y += yy;
-
- // In case of an RTL inset, the edited inset will be positioned to the left
- // of xx:yy
- if (sl.text()) {
- bool boundary_i = boundary && i + 1 == dit.depth();
- bool rtl = bv.textMetrics(sl.text()).isRTL(sl, boundary_i);
- if (rtl)
- x -= lastw;
- }
-
- // remember width for the case that sl.inset() is positioned in an RTL inset
- if (i && dit[i - 1].text()) {
- // If this Inset is inside a Text Inset, retrieve the Dimension
- // from the containing text instead of using Inset::dimension() which
- // might not be implemented.
- // FIXME (Abdel 23/09/2007): this is a bit messy because of the
- // elimination of Inset::dim_ cache. This coordOffset() method needs
- // to be rewritten in light of the new design.
- Dimension const & dim = bv.parMetrics(dit[i - 1].text(),
- dit[i - 1].pit()).insetDimension(&sl.inset());
- lastw = dim.wid;
- } else {
- Dimension const dim = sl.inset().dimension(bv);
- lastw = dim.wid;
- }
-
- //lyxerr << "Cursor::getPos, i: "
- // << i << " x: " << xx << " y: " << y << endl;
- }
-
- // Add contribution of initial rows of outermost paragraph
- CursorSlice const & sl = dit[0];
- TextMetrics const & tm = bv.textMetrics(sl.text());
- ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
- BOOST_ASSERT(!pm.rows().empty());
- y -= pm.rows()[0].ascent();
-#if 1
- // FIXME: document this mess
- size_t rend;
- if (sl.pos() > 0 && dit.depth() == 1) {
- int pos = sl.pos();
- if (pos && boundary)
- --pos;
-// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
- rend = pm.pos2row(pos);
- } else
- rend = pm.pos2row(sl.pos());
-#else
- size_t rend = pm.pos2row(sl.pos());
-#endif
- for (size_t rit = 0; rit != rend; ++rit)
- y += pm.rows()[rit].height();
- y += pm.rows()[rend].ascent();
-
- TextMetrics const & bottom_tm = bv.textMetrics(dit.bottom().text());
-
- // Make relative position from the nested inset now bufferview absolute.
- int xx = bottom_tm.cursorX(dit.bottom(), boundary && dit.depth() == 1);
- x += xx;
-
- // In the RTL case place the nested inset at the left of the cursor in
- // the outer paragraph
- bool boundary_1 = boundary && 1 == dit.depth();
- bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
- if (rtl)
- x -= lastw;
-
- return Point(x, y);
-}
-
-
-Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
-{
- CursorSlice const & bot = dit.bottom();
- TextMetrics const & tm = bv.textMetrics(bot.text());
- if (!tm.has(bot.pit()))
- return Point(-1, -1);
-
- Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph
- p.y_ += tm.parMetrics(bot.pit()).position();
- return p;
-}
-
} // namespace bv_funcs
namespace lyx {
-class Point;
-class BufferView;
-class DocIterator;
-class Inset_code;
class Font;
namespace bv_funcs {
*/
std::string const freefont2string();
-Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary);
-
-Point coordOffset(BufferView const & bv, DocIterator const & dit, bool boundary);
-
} // namespace bv_funcs
projects / lyx.git / commitdiff