X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fscreen.C;h=d7a1f34e55dad26386c26ecefe6c9f32f52c53dc;hb=36945644e70db39a8316570bb44fabc7a3bd3d49;hp=2065c9ab85b8403a74d1daaab9db5c430dcf1946;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git diff --git a/src/frontends/screen.C b/src/frontends/screen.C index 2065c9ab85..d7a1f34e55 100644 --- a/src/frontends/screen.C +++ b/src/frontends/screen.C @@ -13,28 +13,30 @@ #include #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 "coordcache.h" +#include "cursor.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 "graphics/GraphicsImage.h" +#include "graphics/GraphicsLoader.h" #include "support/filetools.h" // LibFileSearch @@ -42,11 +44,13 @@ #include #include -using namespace lyx::support; +using lyx::support::LibFileSearch; +using std::endl; using std::min; using std::max; -using std::endl; +using std::string; + namespace { @@ -116,12 +120,12 @@ SplashScreen::SplashScreen() LyXScreen::LyXScreen() - : cursor_visible_(false), greyed_out_(true) + : greyed_out_(true), cursor_visible_(false) { // Start loading the pixmap as soon as possible if (lyxrc.show_banner) { SplashScreen const & splash = SplashScreen::get(); - splash.connect(boost::bind(&LyXScreen::greyOut, this)); + splash.connect(boost::bind(&LyXScreen::checkAndGreyOut, this)); splash.startLoading(); } } @@ -132,12 +136,15 @@ LyXScreen::~LyXScreen() } -void LyXScreen::showCursor(BufferView & bv) +void LyXScreen::checkAndGreyOut() { - // this is needed to make sure we copy back the right - // pixmap on the hide for the Qt frontend - lyx_gui::sync_events(); + if (greyed_out_) + greyOut(); +} + +void LyXScreen::showCursor(BufferView & bv) +{ if (cursor_visible_) return; @@ -148,7 +155,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,42 +165,22 @@ void LyXScreen::showCursor(BufferView & bv) shape = REVERSED_L_SHAPE; } - int ascent = font_metrics::maxAscent(realfont); - int descent = font_metrics::maxDescent(realfont); - int h = ascent + descent; + // The ERT language hack needs fixing up + if (realfont.language() == latex_language) + shape = BAR_SHAPE; + + LyXFont const font = bv.cursor().getFont(); + int const asc = font_metrics::maxAscent(font); + int const des = font_metrics::maxDescent(font); + int h = asc + des; int x = 0; int y = 0; - int const top_y = bv.text->top_y(); - - if (bv.theLockingInset()) { - // Would be nice to clean this up to make some understandable sense... - UpdatableInset * inset = bv.theLockingInset(); - inset->getCursor(bv, x, y); - - // Non-obvious. The reason we have to have these - // extra checks is that the ->getCursor() calls rely - // on the inset's own knowledge of its screen position. - // If we scroll up or down in a big enough increment, the - // inset->draw() is not called: this doesn't update - // inset.top_baseline, so getCursor() returns an old value. - // Ugly as you like. - int bx, by; - inset->getCursorPos(&bv, bx, by); - by += inset->insetInInsetY() + bv.text->cursor.iy(); - if (by < top_y) - return; - if (by > top_y + workarea().workHeight()) - return; - } else { - x = bv.text->cursor.x(); - y = bv.text->cursor.y(); - y -= top_y; - } + bv.cursor().getPos(x, y); + y -= asc; + //lyxerr << "LyXScreen::showCursor x: " << x << " y: " << y << endl; - y -= ascent; - - // if it doesn't fit entirely on the screen, don't try to show it - if (y < 0 || y + h > workarea().workHeight()) + // if it doesn't touch the screen, don't try to show it + if (y + h < 0 || y >= workarea().workHeight()) return; cursor_visible_ = true; @@ -220,106 +207,27 @@ void LyXScreen::toggleCursor(BufferView & bv) } -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) - newtop = y - 3 * vheight / 4; // the scroll region must be so big!! - else if (y - asc < text->top_y() && text->top_y() > 0) - newtop = y - vheight / 4; - - newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb) - - if (newtop == text->top_y()) - return false; - - text->top_y(newtop); - return true; -} - - -unsigned int LyXScreen::topCursorVisible(LyXText * text) +void LyXScreen::prepareCursor() { - LyXCursor const & cursor = text->cursor; - int top_y = text->top_y(); - int newtop = top_y; - int const vheight = workarea().workHeight(); - - RowList::iterator row = text->cursorRow(); - - 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; - } 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 { - // scroll up - newtop = cursor.y() - vheight / 2; - newtop = min(newtop, top_y); - } - } - - return max(newtop, 0); -} - - -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); - return result; + cursor_visible_ = false; } -void LyXScreen::redraw(BufferView & bv) +void LyXScreen::redraw(BufferView & bv, ViewMetricsInfo const & vi) { - greyed_out_ = !bv.text; - - if (greyed_out_) { - greyOut(); - return; - } - + greyed_out_ = false; workarea().getPainter().start(); - - bv.text->updateRowPositions(); - hideCursor(); - - int const y = paintText(bv, *bv.text); - - // 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); - } - + paintText(bv, vi); + lyxerr[Debug::DEBUG] << "Redraw screen" << endl; expose(0, 0, workarea().workWidth(), workarea().workHeight()); - workarea().getPainter().end(); + theCoords.doneUpdating(); } void LyXScreen::greyOut() { - if (!greyed_out_) - return; - + greyed_out_ = true; workarea().getPainter().start(); workarea().getPainter().fillRectangle(0, 0,