*
* \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 <config.h>
#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 "coordcache.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 "graphics/GraphicsImage.h"
+#include "graphics/GraphicsLoader.h"
#include "support/filetools.h" // LibFileSearch
#include <boost/bind.hpp>
#include <boost/signals/trackable.hpp>
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
+using std::endl;
using std::min;
using std::max;
-using std::endl;
+using std::string;
+
namespace {
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();
}
}
}
-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;
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();
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;
}
-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)
-{
- 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();
-
-#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<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);
- }
- }
-
- newtop = max(newtop, 0);
-
- return newtop;
-}
-
-
-bool LyXScreen::fitCursor(LyXText * text, 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();
-
- 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<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 const top = min(
- max(static_cast<int>(text->selection.start.y() -
- 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->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)
+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->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()));
-
- 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();
-
- text->updateRowPositions();
- 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();
+ theCoords.doneUpdating();
}
void LyXScreen::greyOut()
{
- if (!greyed_out_)
- return;
-
+ greyed_out_ = true;
workarea().getPainter().start();
workarea().getPainter().fillRectangle(0, 0,
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);
- }
-}
projects / lyx.git / blobdiff