* Splash screen code added by Angus Leeming
*/
-
#include <config.h>
#include "screen.h"
+
#include "lyxtext.h"
#include "lyxrc.h"
#include "lyxrow.h"
#include "debug.h"
#include "rowpainter.h"
#include "insets/updatableinset.h"
-#include "mathed/formulabase.h"
#include "lyx_gui.h"
+#include "metricsinfo.h"
// Splash screen-specific stuff
#include "lyxfont.h"
using std::max;
using std::endl;
-namespace grfx = lyx::graphics;
-
namespace {
class SplashScreen : boost::noncopyable, boost::signals::trackable {
/// 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();
}
SplashScreen();
///
- grfx::Loader loader_;
+ lyx::graphics::Loader loader_;
/// The text to be written on top of the pixmap
string const text_;
/// in this font...
Cursor_Shape shape = BAR_SHAPE;
LyXText const & text = *bv.getLyXText();
- LyXFont const & realfont(text.real_current_font);
- BufferParams const & bp(bv.buffer()->params);
+ 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();
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) {
+ 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;
- }
+ if (newtop == text->top_y())
+ return false;
- return false;
+ draw(text, bv, newtop);
+ text->top_y(newtop);
+ return true;
}
newtop = cursor.y() - vheight / 2;
}
- } else if (static_cast<int>((cursor.y()) - row->baseline()) <
- top_y && top_y > 0) {
- if (row->height() < vheight
- && row->height() > vheight / 4) {
+ } 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
void LyXScreen::update(BufferView & bv, int yo, int xo)
{
- int const vwidth = workarea().workWidth();
- int const vheight = workarea().workHeight();
LyXText * text = bv.text;
workarea().getPainter().start();
- switch (text->refreshStatus()) {
- case LyXText::REFRESH_AREA:
- {
+ if (text->needRefresh()) {
+ int const vwidth = workarea().workWidth();
+ int const vheight = workarea().workHeight();
text->updateRowPositions();
- int const y = max(int(text->refresh_y - text->top_y()), 0);
+ int const y = 0;
drawFromTo(text, &bv, y, vheight, yo, xo);
expose(0, y, vwidth, vheight - y);
}
- break;
- case LyXText::REFRESH_ROW:
- {
- text->updateRowPositions();
- // 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 != text->rows().end()) {
- expose(0, text->refresh_y - text->top_y() + yo,
- vwidth, text->refresh_row->height());
- }
- }
- break;
- case LyXText::REFRESH_NONE:
- // Nothing needs done
- break;
- }
workarea().getPainter().end();
}
int yo, int xo)
{
// only if there is a selection
- if (!text->selection.set()) return;
+ if (!text->selection.set())
+ return;
int const bottom = min(
- max(static_cast<int>(text->selection.end.y()
+ max(int(text->selection.end.y()
- text->getRow(text->selection.end)->baseline()
+ text->getRow(text->selection.end)->height()),
text->top_y()),
- static_cast<int>(text->top_y() + workarea().workHeight()));
+ int(text->top_y() + workarea().workHeight()));
int const top = min(
- max(static_cast<int>(text->selection.start.y() -
+ max(int(text->selection.start.y() -
text->getRow(text->selection.start)->baseline()),
text->top_y()),
- static_cast<int>(text->top_y() + workarea().workHeight()));
+ int(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())
- 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<int>(text->top_y() + workarea().workHeight())) - offset;
- int const top = min(max(top_tmp, text->top_y()),
- static_cast<int>(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()));
+ expose(0, top - text->top_y(), workarea().workWidth(), bottom - top);
workarea().getPainter().end();
}
-void LyXScreen::redraw(LyXText * text, BufferView * bv)
+void LyXScreen::redraw(BufferView * bv, LyXText * text)
{
greyed_out_ = !text;
// 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();
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;
RowList::iterator rit = text->getRowNearY(y_text);
int y = y_text - topy;
- // y1 is now the real beginning of row on the screen
- hideCursor();
-
- RowList::iterator const rend = text->rows().end();
- while (rit != rend && y < y2) {
- RowPainter rp(*bv, *text, rit);
- rp.paint(y + yo, xo, y + topy);
- y += rit->height();
- ++rit;
- }
+ 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()) {
+ if (y < y2 && !text->isInInset()) {
workarea().getPainter().fillRectangle(0, y,
workarea().workWidth(), y2 - y,
LColor::bottomarea);
}
}
-
-
-void LyXScreen::drawOneRow(LyXText * text, BufferView * bv,
- RowList::iterator 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;
-
- hideCursor();
-
- RowPainter rp(*bv, *text, row);
- rp.paint(y, xo, y + text->top_y());
-}