Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / bufferview_funcs.cpp

diff --git a/src/bufferview_funcs.cpp b/src/bufferview_funcs.cpp
index ea242e1be8561fd19bbb150e9083860c8feea004..4aa848d511767dadded2852865069ba6c0c3f24b 100644 (file)
--- a/src/bufferview_funcs.cpp
+++ b/src/bufferview_funcs.cpp
@@ -16,7 +16,6 @@
 
 #include "bufferview_funcs.h"
 
-#include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -36,11 +35,6 @@
 
 #include <sstream>
 
-
-namespace lyx {
-
-using support::bformat;
-
 using std::istringstream;
 using std::ostringstream;
 using std::string;
@@ -48,6 +42,10 @@ using std::vector;
 using std::find;
 
 
+namespace lyx {
+
+using support::bformat;
+
 namespace bv_funcs {
 
 // Set data using font and toggle
@@ -177,7 +175,7 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
                // of xx:yy
                if (sl.text()) {
                        bool boundary_i = boundary && i + 1 == dit.depth();
-                       bool rtl = sl.text()->isRTL(*bv.buffer(), sl, boundary_i);
+                       bool rtl = bv.textMetrics(sl.text()).isRTL(sl, boundary_i);
                        if (rtl)
                                x -= lastw;
                }
@@ -191,7 +189,8 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 
        // Add contribution of initial rows of outermost paragraph
        CursorSlice const & sl = dit[0];
-       ParagraphMetrics const & pm = bv.parMetrics(sl.text(), sl.pit());
+       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
@@ -212,14 +211,16 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
                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 = dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
+       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 = dit.bottom().text()->isRTL(*bv.buffer(), dit.bottom(), boundary_1);
+       bool rtl = bottom_tm.isRTL(dit.bottom(), boundary_1);
        if (rtl)
                x -= lastw;
        
@@ -230,19 +231,12 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
        CursorSlice const & bot = dit.bottom();
-       CoordCache::ParPosCache::const_iterator cache_it =
-               bv.coordCache().getParPos().find(bot.text());
-       if (cache_it == bv.coordCache().getParPos().end())
+       TextMetrics const & tm = bv.textMetrics(bot.text());
+       if (!tm.has(bot.pit()))
                return Point(-1, -1);
 
-       CoordCache::InnerParPosCache const & cache = cache_it->second;
-       CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
-       if (it == cache.end()) {
-               //lyxerr << "cursor out of view" << std::endl;
-               return Point(-1, -1);
-       }
        Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph
-       p.y_ += it->second.y_;
+       p.y_ += tm.parMetrics(bot.pit()).position();
        return p;
 }
 
@@ -251,15 +245,15 @@ Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 // FIXME: This does not work within mathed!
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-       CoordCache::InnerParPosCache const & cache =
-               bv->coordCache().getParPos().find(dit.bottom().text())->second;
-
-       if (cache.find(dit.bottom().pit()) != cache.end())
-               return CUR_INSIDE;
-       else if (dit.bottom().pit() < bv->anchor_ref())
+       // FIXME: it's be better to have something like TextMetrics::status().
+       TextMetrics const & tm = bv->textMetrics(dit.bottom().text());
+       int par_pos = tm.parPosition(dit.bottom().pit());
+       if (par_pos < 0)
                return CUR_ABOVE;
-       else
+       else if (par_pos > bv->workHeight())
                return CUR_BELOW;
+               
+       return CUR_INSIDE;
 }
 
 namespace {