X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fscreen.C;h=79ac58e5ae6153d43421d4ea10d0b342ae94aaf9;hb=558e849e692cc72ea74ac3859405b85e54c6e315;hp=6a25817265fc6684cc1bf202d3564ff021f0d78a;hpb=4ba8a4d6f603c01d7ab7dfa937dc6072ef5db1f2;p=lyx.git diff --git a/src/frontends/screen.C b/src/frontends/screen.C index 6a25817265..79ac58e5ae 100644 --- a/src/frontends/screen.C +++ b/src/frontends/screen.C @@ -5,36 +5,39 @@ * * \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 "BufferView.h" -#include "buffer.h" -#include "WorkArea.h" -#include "Painter.h" #include "font_metrics.h" -#include "language.h" -#include "debug.h" -#include "rowpainter.h" -#include "insets/updatableinset.h" #include "lyx_gui.h" -#include "metricsinfo.h" +#include "Painter.h" +#include "WorkArea.h" -// Splash screen-specific stuff +#include "BufferView.h" +#include "buffer.h" +#include "bufferparams.h" +#include "cursor.h" +#include "debug.h" +#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 +45,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 { @@ -148,7 +153,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,39 +163,18 @@ 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(); - - 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; - } - - y -= ascent; + bv.cursor().getPos(x, y); + y -= ascent + bv.top_y(); + //lyxerr << "LyXScreen::showCursor x: " << x << " y: " << y << endl; // if it doesn't fit entirely on the screen, don't try to show it if (y < 0 || y + h > workarea().workHeight()) @@ -220,186 +204,76 @@ 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()) { - draw(text, bv, newtop); - text->top_y(newtop); - return true; - } - - return false; -} - - -unsigned int LyXScreen::topCursorVisible(LyXText * text) +bool LyXScreen::fitCursor(BufferView * bv) { - LyXCursor const & cursor = text->cursor; - int top_y = text->top_y(); + int const top_y = bv->top_y(); + int const h = workarea().workHeight(); 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 (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 (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; + int x, y, asc, desc; + + bv->cursor().getPos(x, y); + bv->cursor().getDim(asc, desc); + lyxerr[Debug::DEBUG] << "LyXScreen::fitCursor: x: " << x + << " y: " << y + << " top_y: " << top_y + << endl; + + bool const big_row = h / 4 < asc + desc && asc + desc < h; + + if (y + desc - top_y >= h) { + if (big_row) + newtop = y + desc - h; + else + newtop = y - h / 2; + + } else if (top_y > max(y - asc, 0)) { + if (big_row) + newtop = y - asc; + else { + newtop = y - h / 2; newtop = min(newtop, top_y); } } newtop = max(newtop, 0); + if (newtop == top_y) + return false; - return newtop; + bv->top_y(newtop); + return true; } -bool LyXScreen::fitCursor(LyXText * text, BufferView * bv) +void LyXScreen::redraw(BufferView & bv) { - // Is a change necessary? - int const newtop = topCursorVisible(text); - bool const result = (newtop != text->top_y()); - if (result) { - draw(text, bv, newtop); - } - - return result; -} - - -void LyXScreen::update(BufferView & bv, int yo, int xo) -{ - LyXText * text = bv.text; - - workarea().getPainter().start(); + greyed_out_ = !bv.text(); - if (text->needRefresh()) { - int const vwidth = workarea().workWidth(); - int const vheight = workarea().workHeight(); - text->updateRowPositions(); - int const y = 0; - drawFromTo(text, &bv, y, vheight, yo, xo); - expose(0, y, vwidth, vheight - y); - } - - workarea().getPainter().end(); -} - - -void LyXScreen::toggleSelection(LyXText * text, BufferView * bv, - bool kill_selection, - int yo, int xo) -{ - // only if there is a selection - if (!text->selection.set()) return; - - int const bottom = min( - max(static_cast(text->selection.end.y() - - text->getRow(text->selection.end)->baseline() - + text->getRow(text->selection.end)->height()), - text->top_y()), - static_cast(text->top_y() + workarea().workHeight())); - int const top = min( - max(static_cast(text->selection.start.y() - - text->getRow(text->selection.start)->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(); -} - - -void LyXScreen::toggleToggle(LyXText * text, BufferView * bv, - int yo, int xo) -{ - if (text->toggle_cursor.par() == text->toggle_end_cursor.par() - && text->toggle_cursor.pos() == text->toggle_end_cursor.pos()) + if (greyed_out_) { + greyOut(); return; - - int const top_tmp = text->toggle_cursor.y() - - text->getRow(text->toggle_cursor)->baseline(); - int const bottom_tmp = text->toggle_end_cursor.y() - - text->getRow(text->toggle_end_cursor)->baseline() - + text->getRow(text->toggle_end_cursor)->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(); -} - + hideCursor(); -void LyXScreen::redraw(LyXText * text, BufferView * bv) -{ - greyed_out_ = !text; + int const y = paintText(bv); - if (greyed_out_) { - greyOut(); - return; + // maybe we have to clear the screen at the bottom + int const y2 = workarea().workHeight(); + if (y < y2 && bv.text()->isMainText()) { + workarea().getPainter().fillRectangle(0, y, + workarea().workWidth(), y2 - y, + LColor::bottomarea); } - workarea().getPainter().start(); + lyxerr[Debug::DEBUG] << "Redraw screen" << endl; - text->updateRowPositions(); - drawFromTo(text, bv, 0, workarea().workHeight(), 0, 0); expose(0, 0, workarea().workWidth(), workarea().workHeight()); workarea().getPainter().end(); + + showCursor(bv); } @@ -427,53 +301,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 const topy = text->top_y(); - int y_text = topy + y1; - RowList::iterator rit = text->getRowNearY(y_text); - int y = y_text - topy; - // y1 is now the real beginning of row on the screen - - hideCursor(); - -#if 0 - // some day it should look like that: - // redo metrics - Dimension dim; - LyXFont font; - MetricsInfo mi(bv, font, workarea().workWidth()); - text->metrics(mi, dim); -#endif - - // draw it - RowList::iterator const rend = text->rows().end(); - while (rit != rend && y < y2) { - paintRows(*bv, *text, rit, y + yo, xo, y + topy); - y += rit->height(); - ++rit; - } - - // 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); - } -}