#include <config.h>
#include "screen.h"
+#include "font_metrics.h"
+#include "lyx_gui.h"
+#include "Painter.h"
+#include "WorkArea.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 "bufferparams.h"
+#include "cursor.h"
#include "debug.h"
-#include "rowpainter.h"
-#include "insets/updatableinset.h"
-#include "lyx_gui.h"
-#include "metricsinfo.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 "insets/updatableinset.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 {
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;
}
+ // 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.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())
}
-bool LyXScreen::fitManualCursor(BufferView * bv, LyXText * text,
- int /*x*/, int y, int asc, int desc)
-{
- int const vheight = workarea().workHeight();
- int const topy = bv->top_y();
- int newtop = topy;
-
-
- if (y + desc - topy >= vheight)
- newtop = y - 3 * vheight / 4; // the scroll region must be so big!!
- else if (y - asc < topy && topy > 0)
- newtop = y - vheight / 4;
-
- newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
-
- if (newtop == topy)
- return false;
-
- bv->top_y(newtop);
- return true;
-}
-
-
-unsigned int LyXScreen::topCursorVisible(LyXText * text)
+bool LyXScreen::fitCursor(BufferView * bv)
{
- LyXCursor const & cursor = text->cursor;
- int top_y = text->bv()->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();
-
- if (int(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;
- }
+ int x, y, asc, desc;
- } 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
- newtop = cursor.y() - vheight / 2;
+ bv->cursor().getPos(x, y);
+ bv->cursor().getDim(asc, desc);
+
+ 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);
}
}
- return max(newtop, 0);
-}
-
+ newtop = max(newtop, 0);
+ if (newtop == top_y)
+ return false;
-bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
-{
- // Is a change necessary?
- int const newtop = topCursorVisible(text);
- bool const result = (newtop != bv->top_y());
bv->top_y(newtop);
- return result;
+ return true;
}
void LyXScreen::redraw(BufferView & bv)
{
- greyed_out_ = !bv.text;
+ greyed_out_ = !bv.text();
if (greyed_out_) {
greyOut();
// maybe we have to clear the screen at the bottom
int const y2 = workarea().workHeight();
- if (y < y2 && !bv.text->isInInset()) {
+ if (y < y2 && !bv.text()->isInInset()) {
workarea().getPainter().fillRectangle(0, y,
workarea().workWidth(), y2 - y,
LColor::bottomarea);
}
+ lyxerr << "Redraw screen" << endl;
+
expose(0, 0, workarea().workWidth(), workarea().workHeight());
workarea().getPainter().end();
projects / lyx.git / blobdiff