bug 1341

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

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 33b3302b252823e16e384f9d89c86bba2e32e545..8134d61ea23b2dc7657fa78af84d74a4d9bba81e 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -5,7 +5,7 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * Splash screen code added by Angus Leeming
  */
@@ -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...
@@ -224,20 +228,21 @@ 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;
 
-       draw(text, bv, newtop);
-       text->top_y(newtop);
+       bv->top_y(newtop);
        return true;
 }
 
@@ -245,19 +250,13 @@ 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();
 
        RowList::iterator row = text->cursorRow();
 
-#warning SUPER HACK DISABLED (Lgb)
-#if 0
-       // Is this a hack? Yes, probably... (Lgb)
-       if (!row)
-               return max(newtop, 0);
-#endif
-       if (cursor.y() - row->baseline() + row->height() - top_y >= vheight) {
+       if (int(cursor.y() - row->baseline() + row->height() - top_y) >= vheight) {
                if (row->height() < vheight
                    && row->height() > vheight / 4) {
                        newtop = cursor.y()
@@ -278,9 +277,7 @@ unsigned int LyXScreen::topCursorVisible(LyXText * text)
                }
        }
 
-       newtop = max(newtop, 0);
-
-       return newtop;
+       return max(newtop, 0);
 }
 
 
@@ -288,11 +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());
-       if (result) {
-               draw(text, bv, newtop);
-       }
-
+       bool const result = (newtop != bv->top_y());
+       bv->top_y(newtop);
        return result;
 }
 
@@ -308,8 +302,18 @@ void LyXScreen::redraw(BufferView & bv)
 
        workarea().getPainter().start();
 
-       bv.text->updateRowPositions();
-       drawFromTo(bv.text, &bv, 0, workarea().workHeight(), 0, 0);
+       hideCursor();
+
+       int const y = paintText(bv);
+
+       // maybe we have to clear the screen at the bottom
+       int const y2 = workarea().workHeight();
+       if (y < y2 && !bv.text->isInInset()) {
+               workarea().getPainter().fillRectangle(0, y,
+                       workarea().workWidth(), y2 - y,
+                       LColor::bottomarea);
+       }
+
        expose(0, 0, workarea().workWidth(), workarea().workHeight());
 
        workarea().getPainter().end();
@@ -340,37 +344,11 @@ void LyXScreen::greyOut()
 
                workarea().getPainter().image(x, y, w, h, *splash_image);
 
-               string const & splash_text  = splash.text();
-               LyXFont const & splash_font = splash.font();
-
                x += 260;
                y += 265;
 
-               workarea().getPainter().text(x, y, splash_text, splash_font);
+               workarea().getPainter().text(x, y, splash.text(), splash.font());
        }
        expose(0, 0, workarea().workWidth(), workarea().workHeight());
        workarea().getPainter().end();
 }
-
-
-void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
-       int y1, int y2, int yo, int xo)
-{
-       lyxerr[Debug::GUI] << "screen: drawFromTo " << y1 << '-' << y2 << endl;
-       hideCursor();
-
-       int const topy = text->top_y();
-       int y_text = topy + y1;
-       ParagraphList::iterator dummypit;
-       RowList::iterator rit = text->getRowNearY(y_text, dummypit);
-       int y = y_text - topy;
-
-       y = paintRows(*bv, *text, rit, xo, y, y, y2, yo);
-
-       // maybe we have to clear the screen at the bottom
-       if (y < y2 && !text->isInInset()) {
-               workarea().getPainter().fillRectangle(0, y,
-                       workarea().workWidth(), y2 - y,
-                       LColor::bottomarea);
-       }
-}