bug 1341

[lyx.git] / src / frontends / screen.C

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 2065c9ab85b8403a74d1daaab9db5c430dcf1946..8134d61ea23b2dc7657fa78af84d74a4d9bba81e 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -158,12 +158,16 @@ void LyXScreen::showCursor(BufferView & bv)
                        shape = REVERSED_L_SHAPE;
        }
 
+       // The ERT language hack needs fixing up
+       if (realfont.language() == latex_language)
+               shape = BAR_SHAPE;
+
        int ascent = font_metrics::maxAscent(realfont);
        int descent = font_metrics::maxDescent(realfont);
        int h = ascent + descent;
        int x = 0;
        int y = 0;
-       int const top_y = bv.text->top_y();
+       int const top_y = bv.top_y();
 
        if (bv.theLockingInset()) {
                // Would be nice to clean this up to make some understandable sense...
@@ -220,23 +224,25 @@ void LyXScreen::toggleCursor(BufferView & bv)
 }
 
 
-bool LyXScreen::fitManualCursor(BufferView * /*bv*/, LyXText * text,
+bool LyXScreen::fitManualCursor(BufferView * bv, LyXText * text,
        int /*x*/, int y, int asc, int desc)
 {
        int const vheight = workarea().workHeight();
-       int newtop = text->top_y();
-
-       if (y + desc - text->top_y() >= vheight)
+       int const topy = bv->top_y();
+       int newtop = topy;
+       
+       
+       if (y + desc - topy >= vheight)
                newtop = y - 3 * vheight / 4;  // the scroll region must be so big!!
-       else if (y - asc < text->top_y() && text->top_y() > 0)
+       else if (y - asc < topy && topy > 0)
                newtop = y - vheight / 4;
 
        newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
 
-       if (newtop == text->top_y())
+       if (newtop == topy)
                return false;
 
-       text->top_y(newtop);
+       bv->top_y(newtop);
        return true;
 }
 
@@ -244,7 +250,7 @@ bool LyXScreen::fitManualCursor(BufferView * /*bv*/, LyXText * text,
 unsigned int LyXScreen::topCursorVisible(LyXText * text)
 {
        LyXCursor const & cursor = text->cursor;
-       int top_y = text->top_y();
+       int top_y = text->bv()->top_y();
        int newtop = top_y;
        int const vheight = workarea().workHeight();
 
@@ -279,8 +285,8 @@ bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
 {
        // Is a change necessary?
        int const newtop = topCursorVisible(text);
-       bool const result = (newtop != text->top_y());
-       text->top_y(newtop);
+       bool const result = (newtop != bv->top_y());
+       bv->top_y(newtop);
        return result;
 }
 
@@ -296,10 +302,9 @@ void LyXScreen::redraw(BufferView & bv)
 
        workarea().getPainter().start();
 
-       bv.text->updateRowPositions();
        hideCursor();
 
-       int const y = paintText(bv, *bv.text);
+       int const y = paintText(bv);
 
        // maybe we have to clear the screen at the bottom
        int const y2 = workarea().workHeight();