* Splash screen code added by Angus Leeming
*/
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include <config.h>
#include "font_metrics.h"
#include "language.h"
#include "debug.h"
+#include "rowpainter.h"
+#include "insets/updatableinset.h"
+#include "mathed/formulabase.h"
+#include "lyx_gui.h"
// Splash screen-specific stuff
#include "lyxfont.h"
#include <boost/bind.hpp>
#include <boost/signals/trackable.hpp>
+using namespace lyx::support;
+
using std::min;
using std::max;
using std::endl;
+namespace grfx = lyx::graphics;
+
namespace {
class SplashScreen : boost::noncopyable, boost::signals::trackable {
string const & text() const { return text_; }
///
LyXFont const & font() const { return font_; }
+ ///
+ void connect(grfx::Loader::slot_type const & slot) const {
+ loader_.connect(slot);
+ }
+ ///
+ void startLoading() const {
+ if (loader_.status() == grfx::WaitingToLoad)
+ loader_.startLoading();
+ }
private:
/** Make the c-tor private so we can control how many objects
if (!lyxrc.show_banner)
return;
- string const file = LibFileSearch("images", "banner", "xpm");
+ string const file = LibFileSearch("images", "banner", "ppm");
if (file.empty())
return;
// Load up the graphics file
loader_.reset(file);
- // We aren't interested here in when the image is loaded.
- // If it isn't ready when we want it, then we ignore it.
-// loader_->statusChanged.connect(
-// boost::bind(&SplashScreen::statusChanged, this));
- if (loader_.status() == grfx::WaitingToLoad)
- loader_.startLoading();
}
} // namespace anon
LyXScreen::LyXScreen()
- : force_clear_(true), cursor_visible_(false)
+ : cursor_visible_(false), greyed_out_(true)
{
// Start loading the pixmap as soon as possible
- SplashScreen::get();
+ if (lyxrc.show_banner) {
+ SplashScreen const & splash = SplashScreen::get();
+ splash.connect(boost::bind(&LyXScreen::greyOut, this));
+ splash.startLoading();
+ }
}
{
}
-// 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::showCursor(BufferView & bv)
{
+ // this is needed to make sure we copy back the right
+ // pixmap on the hide for the Qt frontend
+ lyx_gui::sync_events();
+
if (cursor_visible_)
return;
- workarea().getPainter().start();
+ if (!bv.available())
+ return;
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;
+
+ 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();
+
+ if (!samelang || isrtl != bp.language->RightToLeft()) {
+ shape = L_SHAPE;
+ if (isrtl)
+ shape = REVERSED_L_SHAPE;
}
- showManualCursor(text, text->cursor.x(), text->cursor.y(),
- font_metrics::maxAscent(realfont),
- font_metrics::maxDescent(realfont),
- 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;
+ }
- workarea().getPainter().end();
+ y -= ascent;
+
+ // if it doesn't fit entirely on the screen, don't try to show it
+ if (y < 0 || y + h > workarea().workHeight())
+ return;
+
+ cursor_visible_ = true;
+ showCursor(x, y, h, shape);
+}
+
+
+void LyXScreen::hideCursor()
+{
+ if (!cursor_visible_)
+ return;
+
+ cursor_visible_ = false;
+ removeCursor();
+}
+
+
+void LyXScreen::toggleCursor(BufferView & bv)
+{
+ if (cursor_visible_)
+ hideCursor();
+ else
+ showCursor(bv);
}
int /*x*/, int y, int asc, int desc)
{
int const vheight = workarea().workHeight();
- int newtop = text->first_y;
+ int newtop = text->top_y();
- if (y + desc - text->first_y >= vheight)
+ if (y + desc - text->top_y() >= vheight)
newtop = y - 3 * vheight / 4; // the scroll region must be so big!!
- else if (y - asc < text->first_y
- && text->first_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->first_y) {
+ if (newtop != text->top_y()) {
draw(text, bv, newtop);
- text->first_y = newtop;
+ text->top_y(newtop);
return true;
}
- return false;
-}
-
-void LyXScreen::cursorToggle(BufferView * bv) const
-{
- if (cursor_visible_)
- bv->hideCursor();
- else
- bv->showCursor();
+ return false;
}
-unsigned int LyXScreen::topCursorVisible(LyXCursor const & cursor, int top_y)
+unsigned int LyXScreen::topCursorVisible(LyXText * text)
{
- int const vheight = workarea().workHeight();
+ LyXCursor const & cursor = text->cursor;
+ int top_y = text->top_y();
int newtop = top_y;
+ int const vheight = workarea().workHeight();
- Row * row = cursor.row();
+ 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) {
+ row->height()
- row->baseline() - vheight;
} else {
- // scroll down
- newtop = cursor.y()
- - vheight / 2; /* the scroll region must be so big!! */
+ // scroll down, the scroll region must be so big!!
+ newtop = cursor.y() - vheight / 2;
}
} else if (static_cast<int>((cursor.y()) - row->baseline()) <
bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
{
// Is a change necessary?
- int const newtop = topCursorVisible(text->cursor, text->first_y);
- bool const result = (newtop != text->first_y);
- if (result)
+ int const newtop = topCursorVisible(text);
+ bool const result = (newtop != text->top_y());
+ if (result) {
draw(text, bv, newtop);
+ }
+
return result;
}
-void LyXScreen::update(LyXText * text, BufferView * bv,
- int yo, int xo)
+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->status()) {
- case LyXText::NEED_MORE_REFRESH:
+ switch (text->refreshStatus()) {
+ case LyXText::REFRESH_AREA:
{
- int const y = max(int(text->refresh_y - text->first_y), 0);
- drawFromTo(text, bv, y, vheight, yo, xo);
- text->refresh_y = 0;
- // otherwise this is called ONLY from BufferView_pimpl(update)
- // or we should see to set this flag accordingly
- if (text != bv->text)
- text->status(bv, LyXText::UNCHANGED);
+ text->updateRowPositions();
+ 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::NEED_VERY_LITTLE_REFRESH:
+ case LyXText::REFRESH_ROW:
{
+ text->updateRowPositions();
// ok I will update the current cursor row
- drawOneRow(text, bv, text->refresh_row, text->refresh_y,
+ 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) {
- // otherwise this is called ONLY from BufferView_pimpl(update)
- // or we should see to set this flag accordingly
- if (text != bv->text)
- text->status(bv, LyXText::UNCHANGED);
- expose(0, text->refresh_y - text->first_y + yo,
+ if (text->refresh_row != text->rows().end()) {
+ expose(0, text->refresh_y - text->top_y() + yo,
vwidth, text->refresh_row->height());
}
}
break;
- case LyXText::CHANGED_IN_DRAW: // just to remove the warning
- case LyXText::UNCHANGED:
+ case LyXText::REFRESH_NONE:
// Nothing needs done
break;
}
int const bottom = min(
max(static_cast<int>(text->selection.end.y()
- - text->selection.end.row()->baseline()
- + text->selection.end.row()->height()),
- text->first_y),
- static_cast<int>(text->first_y + workarea().workHeight()));
+ - text->getRow(text->selection.end)->baseline()
+ + text->getRow(text->selection.end)->height()),
+ text->top_y()),
+ static_cast<int>(text->top_y() + workarea().workHeight()));
int const top = min(
max(static_cast<int>(text->selection.start.y() -
- text->selection.start.row()->baseline()),
- text->first_y),
- static_cast<int>(text->first_y + workarea().workHeight()));
+ text->getRow(text->selection.start)->baseline()),
+ text->top_y()),
+ static_cast<int>(text->top_y() + workarea().workHeight()));
if (kill_selection)
text->selection.set(false);
workarea().getPainter().start();
- drawFromTo(text, bv, top - text->first_y, bottom - text->first_y,
+ drawFromTo(text, bv, top - text->top_y(), bottom - text->top_y(),
yo, xo);
- expose(0, top - text->first_y,
+ expose(0, top - text->top_y(),
workarea().workWidth(),
- bottom - text->first_y - (top - text->first_y));
+ bottom - text->top_y() - (top - text->top_y()));
workarea().getPainter().end();
}
return;
int const top_tmp = text->toggle_cursor.y()
- - text->toggle_cursor.row()->baseline();
+ - text->getRow(text->toggle_cursor)->baseline();
int const bottom_tmp = text->toggle_end_cursor.y()
- - text->toggle_end_cursor.row()->baseline()
- + text->toggle_end_cursor.row()->height();
+ - 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->first_y),
- static_cast<int>(text->first_y + workarea().workHeight())) - offset;
- int const top = min(max(top_tmp, text->first_y),
- static_cast<int>(text->first_y + workarea().workHeight())) - offset;
+ 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->first_y,
- bottom - text->first_y, yo,
- xo);
- expose(0, top - text->first_y, workarea().workWidth(),
- bottom - text->first_y - (top - text->first_y));
+ 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::redraw(LyXText * text, BufferView * bv)
{
- workarea().getPainter().start();
+ greyed_out_ = !text;
- if (!text) {
+ if (greyed_out_) {
greyOut();
- expose(0, 0, workarea().workWidth(), workarea().workHeight());
- workarea().getPainter().end();
return;
}
- drawFromTo(text, bv, 0, workarea().workHeight(), 0, 0, text == bv->text);
+ workarea().getPainter().start();
+
+ text->updateRowPositions();
+ drawFromTo(text, bv, 0, workarea().workHeight(), 0, 0);
expose(0, 0, workarea().workWidth(), workarea().workHeight());
workarea().getPainter().end();
-
- if (cursor_visible_) {
- cursor_visible_ = false;
- bv->showCursor();
- }
}
void LyXScreen::greyOut()
{
+ if (!greyed_out_)
+ return;
+
+ workarea().getPainter().start();
+
workarea().getPainter().fillRectangle(0, 0,
workarea().workWidth(),
workarea().workHeight(),
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,
- bool internal)
+ int y1, int y2, int yo, int xo)
{
lyxerr[Debug::GUI] << "screen: drawFromTo " << y1 << '-' << y2 << endl;
- int y_text = text->first_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->first_y;
+ 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
- while (row != 0 && y < y2) {
- LyXText::text_status st = text->status();
- text->getVisibleRow(bv, y + yo,
- xo, row, y + text->first_y);
- internal = internal && (st != LyXText::CHANGED_IN_DRAW);
- while (internal && text->status() == LyXText::CHANGED_IN_DRAW) {
- text->fullRebreak(bv);
- st = LyXText::NEED_MORE_REFRESH;
- text->setCursor(bv, text->cursor.par(), text->cursor.pos());
- text->status(bv, st);
- text->getVisibleRow(bv, y + yo,
- xo, row, y + text->first_y);
- }
- y += row->height();
- row = row->next();
+ 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;
}
- force_clear_ = false;
// maybe we have to clear the screen at the bottom
- if ((y < y2) && text->bv_owner) {
+ 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,
+void LyXScreen::drawOneRow(LyXText * text, BufferView * bv,
+ RowList::iterator row,
int y_text, int yo, int xo)
{
- int const y = y_text - text->first_y + yo;
+ int const y = y_text - text->top_y() + yo;
- if (((y + row->height()) > 0) &&
- ((y - row->height()) <= static_cast<int>(workarea().workHeight()))) {
- text->getVisibleRow(bv, y, xo, row, y + text->first_y);
- }
- force_clear_ = false;
+ 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());
}
projects / lyx.git / blobdiff