X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fscreen.C;h=d7a1f34e55dad26386c26ecefe6c9f32f52c53dc;hb=36945644e70db39a8316570bb44fabc7a3bd3d49;hp=a7e6f67c9fd090b503505c329899e8d174435c75;hpb=12b2d2ec4d11ff589a702051820a046f8421553b;p=lyx.git diff --git a/src/frontends/screen.C b/src/frontends/screen.C index a7e6f67c9f..d7a1f34e55 100644 --- a/src/frontends/screen.C +++ b/src/frontends/screen.C @@ -5,33 +5,38 @@ * * \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 */ - #include #include "screen.h" -#include "lyxtext.h" -#include "lyxrc.h" -#include "lyxrow.h" +#include "font_metrics.h" +#include "lyx_gui.h" +#include "Painter.h" +#include "WorkArea.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" - -// 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 @@ -39,9 +44,13 @@ #include #include +using lyx::support::LibFileSearch; + +using std::endl; using std::min; using std::max; -using std::endl; +using std::string; + namespace { @@ -50,18 +59,18 @@ public: /// This is a singleton class. Get the instance. static SplashScreen const & get(); /// - grfx::Image const * image() const { return loader_.image(); } + lyx::graphics::Image const * image() const { return loader_.image(); } /// string const & text() const { return text_; } /// LyXFont const & font() const { return font_; } /// - void connect(grfx::Loader::slot_type const & slot) const { + void connect(lyx::graphics::Loader::slot_type const & slot) const { loader_.connect(slot); } /// void startLoading() const { - if (loader_.status() == grfx::WaitingToLoad) + if (loader_.status() == lyx::graphics::WaitingToLoad) loader_.startLoading(); } @@ -72,7 +81,7 @@ private: SplashScreen(); /// - grfx::Loader loader_; + lyx::graphics::Loader loader_; /// The text to be written on top of the pixmap string const text_; /// in this font... @@ -111,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(); } } @@ -126,253 +135,99 @@ LyXScreen::~LyXScreen() { } -// FIXME: GUII these cursor methods need to decide -// whether the workarea is focused or not -void LyXScreen::showCursor(LyXText const * text, BufferView const * bv) +void LyXScreen::checkAndGreyOut() { - if (cursor_visible_) - return; - - workarea().getPainter().start(); - - Cursor_Shape shape = BAR_SHAPE; - BufferParams const & bp(bv->buffer()->params); - LyXFont const & realfont(text->real_current_font); - - if (realfont.language() != bp.language - || realfont.isVisibleRightToLeft() - != bp.language->RightToLeft()) { - shape = (realfont.isVisibleRightToLeft()) - ? REVERSED_L_SHAPE : L_SHAPE; - } - - showManualCursor(text, text->cursor.x(), text->cursor.y(), - font_metrics::maxAscent(realfont), - font_metrics::maxDescent(realfont), - shape); - - workarea().getPainter().end(); -} - - -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()) { - draw(text, bv, newtop); - text->top_y(newtop); - return true; - } - - return false; + if (greyed_out_) + greyOut(); } -void LyXScreen::cursorToggle(BufferView * bv) const +void LyXScreen::showCursor(BufferView & bv) { if (cursor_visible_) - bv->hideCursor(); - else - bv->showCursor(); -} - - -unsigned int LyXScreen::topCursorVisible(LyXCursor const & cursor, int top_y) -{ - int const vheight = workarea().workHeight(); - int newtop = top_y; - - Row * row = cursor.row(); - - // Is this a hack? Yes, probably... (Lgb) - if (!row) - return max(newtop, 0); - - if (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 - newtop = cursor.y() - - vheight / 2; /* the scroll region must be so big!! */ - } - - } else if (static_cast((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; - newtop = max(newtop, 0); + if (!bv.available()) + return; - return newtop; -} + Cursor_Shape shape = BAR_SHAPE; + LyXText const & text = *bv.getLyXText(); + LyXFont const & realfont = text.real_current_font; + BufferParams const & bp = bv.buffer()->params(); + bool const samelang = realfont.language() == bp.language; + bool const isrtl = realfont.isVisibleRightToLeft(); -bool LyXScreen::fitCursor(LyXText * text, BufferView * bv) -{ - // Is a change necessary? - int const newtop = topCursorVisible(text->cursor, text->top_y()); - bool const result = (newtop != text->top_y()); - if (result) { - draw(text, bv, newtop); + if (!samelang || isrtl != bp.language->RightToLeft()) { + shape = L_SHAPE; + if (isrtl) + shape = REVERSED_L_SHAPE; } - return result; + // 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; + bv.cursor().getPos(x, y); + y -= asc; + //lyxerr << "LyXScreen::showCursor x: " << x << " y: " << y << endl; + + // if it doesn't touch the screen, don't try to show it + if (y + h < 0 || y >= workarea().workHeight()) + return; + + cursor_visible_ = true; + showCursor(x, y, h, shape); } -void LyXScreen::update(BufferView & bv, int yo, int xo) +void LyXScreen::hideCursor() { - int const vwidth = workarea().workWidth(); - int const vheight = workarea().workHeight(); - LyXText * text = bv.text; - - workarea().getPainter().start(); - - switch (text->refreshStatus()) { - case LyXText::REFRESH_AREA: - { - int const y = max(int(text->refresh_y - text->top_y()), 0); - drawFromTo(text, &bv, y, vheight, yo, xo); - expose(0, y, vwidth, vheight - y); - } - break; - case LyXText::REFRESH_ROW: - { - // ok I will update the current cursor row - drawOneRow(text, &bv, text->refresh_row, text->refresh_y, - yo, xo); - // this because if we had a major update the refresh_row could - // have been set to 0! - if (text->refresh_row) { - expose(0, text->refresh_y - text->top_y() + yo, - vwidth, text->refresh_row->height()); - } - } - break; - case LyXText::REFRESH_NONE: - // Nothing needs done - break; - } + if (!cursor_visible_) + return; - workarea().getPainter().end(); + cursor_visible_ = false; + removeCursor(); } -void LyXScreen::toggleSelection(LyXText * text, BufferView * bv, - bool kill_selection, - int yo, int xo) +void LyXScreen::toggleCursor(BufferView & bv) { - // only if there is a selection - if (!text->selection.set()) return; - - int const bottom = min( - max(static_cast(text->selection.end.y() - - text->selection.end.row()->baseline() - + text->selection.end.row()->height()), - text->top_y()), - static_cast(text->top_y() + workarea().workHeight())); - int const top = min( - max(static_cast(text->selection.start.y() - - text->selection.start.row()->baseline()), - text->top_y()), - static_cast(text->top_y() + workarea().workHeight())); - - if (kill_selection) - text->selection.set(false); - - workarea().getPainter().start(); - - drawFromTo(text, bv, top - text->top_y(), bottom - text->top_y(), - yo, xo); - expose(0, top - text->top_y(), - workarea().workWidth(), - bottom - text->top_y() - (top - text->top_y())); - - workarea().getPainter().end(); + if (cursor_visible_) + hideCursor(); + else + showCursor(bv); } -void LyXScreen::toggleToggle(LyXText * text, BufferView * bv, - int yo, int xo) +void LyXScreen::prepareCursor() { - if (text->toggle_cursor.par() == text->toggle_end_cursor.par() - && text->toggle_cursor.pos() == text->toggle_end_cursor.pos()) - return; - - int const top_tmp = text->toggle_cursor.y() - - text->toggle_cursor.row()->baseline(); - int const bottom_tmp = text->toggle_end_cursor.y() - - text->toggle_end_cursor.row()->baseline() - + text->toggle_end_cursor.row()->height(); - - int const offset = yo < 0 ? yo : 0; - int const bottom = min(max(bottom_tmp, text->top_y()), - static_cast(text->top_y() + workarea().workHeight())) - offset; - int const top = min(max(top_tmp, text->top_y()), - static_cast(text->top_y() + workarea().workHeight())) - offset; - - workarea().getPainter().start(); - - drawFromTo(text, bv, top - text->top_y(), bottom - text->top_y(), yo, xo); - expose(0, top - text->top_y(), workarea().workWidth(), - bottom - text->top_y() - (top - text->top_y())); - - workarea().getPainter().end(); + cursor_visible_ = false; } -void LyXScreen::redraw(LyXText * text, BufferView * bv) +void LyXScreen::redraw(BufferView & bv, ViewMetricsInfo const & vi) { - greyed_out_ = !text; - - if (greyed_out_) { - greyOut(); - return; - } - + greyed_out_ = false; workarea().getPainter().start(); - - drawFromTo(text, bv, 0, workarea().workHeight(), 0, 0); + paintText(bv, vi); + lyxerr[Debug::DEBUG] << "Redraw screen" << endl; expose(0, 0, workarea().workWidth(), workarea().workHeight()); - workarea().getPainter().end(); - - if (cursor_visible_) { - cursor_visible_ = false; - bv->showCursor(); - } + theCoords.doneUpdating(); } void LyXScreen::greyOut() { - if (!greyed_out_) - return; - + greyed_out_ = true; workarea().getPainter().start(); workarea().getPainter().fillRectangle(0, 0, @@ -382,7 +237,7 @@ void LyXScreen::greyOut() // Add a splash screen to the centre of the work area SplashScreen const & splash = SplashScreen::get(); - grfx::Image const * const splash_image = splash.image(); + lyx::graphics::Image const * const splash_image = splash.image(); if (splash_image) { int const w = splash_image->getWidth(); int const h = splash_image->getHeight(); @@ -392,61 +247,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; - - int y_text = text->top_y() + y1; - - // get the first needed row - Row * row = text->getRowNearY(y_text); - // y_text is now the real beginning of the row - - int y = y_text - text->top_y(); - // y1 is now the real beginning of row on the screen - - - while (row != 0 && y < y2) { - RowPainter rp(*bv, *text, *row); - rp.paint(y + yo, xo, y + text->top_y()); - y += row->height(); - row = row->next(); - } - - // 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); - } -} - - -void LyXScreen::drawOneRow(LyXText * text, BufferView * bv, Row * row, - int y_text, int yo, int xo) -{ - int const y = y_text - text->top_y() + yo; - - if (y + row->height() <= 0) - return; - - if (y - row->height() > workarea().workHeight()) - return; - - RowPainter rp(*bv, *text, *row); - rp.paint(y, xo, y + text->top_y()); -}