Joao latest bits

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

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 2065c9ab85b8403a74d1daaab9db5c430dcf1946..10dab24a2c3b1c45b55384088e6f9b1482e00a70 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -13,28 +13,30 @@
 #include <config.h>
 
 #include "screen.h"
+#include "font_metrics.h"
+#include "lyx_gui.h"
+#include "Painter.h"
+#include "WorkArea.h"
 
-#include "lyxtext.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
 #include "BufferView.h"
 #include "buffer.h"
-#include "WorkArea.h"
-#include "Painter.h"
-#include "font_metrics.h"
-#include "language.h"
+#include "bufferparams.h"
 #include "debug.h"
-#include "rowpainter.h"
-#include "insets/updatableinset.h"
-#include "lyx_gui.h"
-#include "metricsinfo.h"
-
-// Splash screen-specific stuff
+#include "language.h"
+#include "LColor.h"
 #include "lyxfont.h"
+#include "lyxrc.h"
+#include "lyxrow.h"
+#include "lyxtext.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
+#include "rowpainter.h"
 #include "version.h"
 
-#include "graphics/GraphicsLoader.h"
+#include "insets/updatableinset.h"
+
 #include "graphics/GraphicsImage.h"
+#include "graphics/GraphicsLoader.h"
 
 #include "support/filetools.h" // LibFileSearch
 
@@ -42,11 +44,13 @@
 #include <boost/bind.hpp>
 #include <boost/signals/trackable.hpp>
 
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
 
+using std::endl;
 using std::min;
 using std::max;
-using std::endl;
+using std::string;
+
 
 namespace {
 
@@ -148,7 +152,7 @@ void LyXScreen::showCursor(BufferView & bv)
 
        LyXText const & text = *bv.getLyXText();
        LyXFont const & realfont = text.real_current_font;
-       BufferParams const & bp = bv.buffer()->params;
+       BufferParams const & bp = bv.buffer()->params();
        bool const samelang = realfont.language() == bp.language;
        bool const isrtl = realfont.isVisibleRightToLeft();
 
@@ -158,12 +162,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...
@@ -179,7 +187,7 @@ void LyXScreen::showCursor(BufferView & bv)
                // Ugly as you like.
                int bx, by;
                inset->getCursorPos(&bv, bx, by);
-               by += inset->insetInInsetY() + bv.text->cursor.iy();
+               by += inset->insetInInsetY() + bv.text->cursor.y();
                if (by < top_y)
                        return;
                if (by > top_y + workarea().workHeight())
@@ -220,23 +228,25 @@ void LyXScreen::toggleCursor(BufferView & bv)
 }
 
 
-bool LyXScreen::fitManualCursor(BufferView * /*bv*/, LyXText * text,
+bool LyXScreen::fitManualCursor(BufferView * bv, LyXText *,
        int /*x*/, int y, int asc, int desc)
 {
        int const vheight = workarea().workHeight();
-       int newtop = text->top_y();
+       int const topy = bv->top_y();
+       int newtop = topy;
+
 
-       if (y + desc - text->top_y() >= vheight)
+       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,26 +254,26 @@ 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();
+       unsigned int const vheight = workarea().workHeight();
 
-       RowList::iterator row = text->cursorRow();
+       Row & row = *text->cursorPar()->getRow(cursor.pos());
 
-       if (int(cursor.y() - row->baseline() + row->height() - top_y) >= vheight) {
-               if (row->height() < vheight
-                   && row->height() > vheight / 4) {
+       if (int(cursor.y() - row.baseline() + row.height() - top_y) >= vheight) {
+               if (row.height() < vheight
+                   && row.height() > vheight / 4) {
                        newtop = cursor.y()
-                               + row->height()
-                               - row->baseline() - vheight;
+                               + row.height()
+                               - row.baseline() - vheight;
                } else {
                        // scroll down, the scroll region must be so big!!
                        newtop = cursor.y() - vheight / 2;
                }
 
-       } else if (int(cursor.y() - row->baseline()) < top_y && top_y > 0) {
-               if (row->height() < vheight && row->height() > vheight / 4) {
-                       newtop = cursor.y() - row->baseline();
+       } else if (int(cursor.y() - row.baseline()) < top_y && top_y > 0) {
+               if (row.height() < vheight && row.height() > vheight / 4) {
+                       newtop = cursor.y() - row.baseline();
                } else {
                        // scroll up
                        newtop = cursor.y() - vheight / 2;
@@ -279,8 +289,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 +306,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();
@@ -309,6 +318,8 @@ void LyXScreen::redraw(BufferView & bv)
                        LColor::bottomarea);
        }
 
+       lyxerr << "Redraw screen" << endl;
+
        expose(0, 0, workarea().workWidth(), workarea().workHeight());
 
        workarea().getPainter().end();