}
+ /*
/// moves position closest to (x, y) in given box
bool bruteFind(Cursor & cursor,
int x, int y, int xlow, int xhigh, int ylow, int yhigh)
return false;
}
+ */
/// moves position closest to (x, y) in given box
// << " xlow: " << xlow << " xhigh: " << xhigh
// << " ylow: " << ylow << " yhigh: " << yhigh
// << endl;
- Inset & inset = bv.buffer()->inset();
+ Inset & inset = bv.buffer().inset();
DocIterator it = doc_iterator_begin(inset);
it.pit() = from;
DocIterator et = doc_iterator_end(inset);
// bv functions are not yet available!
Cursor::Cursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1), textTargetOffset_(0),
- selection_(false), mark_(false), logicalpos_(false)
+ selection_(false), mark_(false), logicalpos_(false), current_font(Font::ALL_INHERIT)
{}
Buffer & Cursor::buffer() const
{
BOOST_ASSERT(bv_);
- BOOST_ASSERT(bv_->buffer());
- return *bv_->buffer();
+ return bv_->buffer();
}
void Cursor::setScreenPos(int x, int y)
{
setTargetX(x);
- bruteFind(*this, x, y, 0, bv().workWidth(), 0, bv().workHeight());
+ //bruteFind(*this, x, y, 0, bv().workWidth(), 0, bv().workHeight());
}
// We want to keep the x-target on subsequent up/down movements
// that cross beyond the end of short lines. Thus a special
- // handling when the cursor is at the end of line: Use the new
+ // handling when the cursor is at the end of line: Use the new
// x-target only if the old one was before the end of line
// or the old one was after the beginning of the line
bool inRTL = isWithinRtlParagraph(*this);
right = pos() == textRow().endpos();
}
if ((!left && !right) ||
- (left && !right && xo < x_target_) ||
+ (left && !right && xo < x_target_) ||
(!left && right && x_target_ < xo))
setTargetX(xo);
else
xo = targetX();
- } else
+ } else
xo = targetX();
// try neigbouring script insets
}
-bool Cursor::upDownInText(bool up, bool & updateNeeded)
+bool Cursor::upDownInText(bool up, bool & updateNeeded)
{
BOOST_ASSERT(text());
// if we cannot move up/down inside this inset anymore
if (x_target_ == -1)
setTargetX(xo);
- else if (xo - textTargetOffset() != x_target() &&
+ else if (xo - textTargetOffset() != x_target() &&
depth() == beforeDispatchCursor_.depth()) {
// In text mode inside the line (not left or right) possibly set a new target_x,
// but only if we are somewhere else than the previous target-offset.
// We want to keep the x-target on subsequent up/down movements
// that cross beyond the end of short lines. Thus a special
- // handling when the cursor is at the end of line: Use the new
+ // handling when the cursor is at the end of line: Use the new
// x-target only if the old one was before the end of line
// or the old one was after the beginning of the line
bool inRTL = isWithinRtlParagraph(*this);
right = pos() == textRow().endpos();
}
if ((!left && !right) ||
- (left && !right && xo < x_target_) ||
+ (left && !right && xo < x_target_) ||
(!left && right && x_target_ < xo))
setTargetX(xo);
else
xo = targetX();
- } else
+ } else
xo = targetX();
// first get the current line
- TextMetrics const & tm = bv_->textMetrics(text());
+ TextMetrics & tm = bv_->textMetrics(text());
ParagraphMetrics const & pm = tm.parMetrics(pit());
int row;
if (pos() && boundary())
if (pit() == 0 && row == 0)
return false;
} else {
- if (pit() + 1 >= int(text()->paragraphs().size()) &&
+ if (pit() + 1 >= int(text()->paragraphs().size()) &&
row + 1 >= int(pm.rows().size()))
return false;
}
Cursor old = *this;
// To next/previous row
if (up)
- text()->editXY(*this, xo, yo - textRow().ascent() - 1);
+ tm.editXY(*this, xo, yo - textRow().ascent() - 1);
else
- text()->editXY(*this, xo, yo + textRow().descent() + 1);
+ tm.editXY(*this, xo, yo + textRow().descent() + 1);
clearSelection();
// This happens when you move out of an inset.
return docstring();
if (inTexted()) {
- Buffer const & buffer = *bv().buffer();
+ Buffer const & buffer = bv().buffer();
ParagraphList const & pars = text()->paragraphs();
// should be const ...
{
if (empty())
return 0;
- if (!bv().buffer())
- return 0;
int s = 0;
// go up until first non-0 text is hit
// (innermost text is 0 in mathed)
CursorSlice const & sl = operator[](s);
Text const & text = *sl.text();
Font font = text.getPar(sl.pit()).getFont(
- bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
+ bv().buffer().params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
return font.language()->encoding();
}
Font Cursor::getFont() const
{
- // The logic here should more or less match to the Text::setCurrentFont
+ // The logic here should more or less match to the Cursor::setCurrentFont
// logic, i.e. the cursor height should give a hint what will happen
// if a character is entered.
// on space? Take the font before (only for RTL boundary stay)
if (pos > 0) {
+ TextMetrics const & tm = bv().textMetrics(&text);
if (pos == sl.lastpos()
- || (par.isSeparator(pos) &&
- !text.isRTLBoundary(buffer(), par, pos)))
+ || (par.isSeparator(pos)
+ && !tm.isRTLBoundary(sl.pit(), pos)))
--pos;
}
// get font at the position
- Font font = par.getFont(bv().buffer()->params(), pos,
+ Font font = par.getFont(bv().buffer().params(), pos,
outerFont(sl.pit(), text.paragraphs()));
return font;
}
-void Cursor::fixIfBroken()
+bool Cursor::fixIfBroken()
{
if (DocIterator::fixIfBroken()) {
clearSelection();
resetAnchor();
+ return true;
}
+ return false;
}
}
+void Cursor::setCurrentFont()
+{
+ CursorSlice const & cs = innerTextSlice();
+ Paragraph const & par = cs.paragraph();
+ pos_type cpit = cs.pit();
+ pos_type cpos = cs.pos();
+ Text const & ctext = *cs.text();
+ TextMetrics const & tm = bv().textMetrics(&ctext);
+
+ // are we behind previous char in fact? -> go to that char
+ if (cpos > 0 && boundary())
+ --cpos;
+
+ // find position to take the font from
+ if (cpos != 0) {
+ // paragraph end? -> font of last char
+ if (cpos == lastpos())
+ --cpos;
+ // on space? -> look at the words in front of space
+ else if (cpos > 0 && par.isSeparator(cpos)) {
+ // abc| def -> font of c
+ // abc |[WERBEH], i.e. boundary==true -> font of c
+ // abc [WERBEH]| def, font of the space
+ if (!tm.isRTLBoundary(cpit, cpos))
+ --cpos;
+ }
+ }
+
+ // get font
+ BufferParams const & bufparams = buffer().params();
+ current_font = par.getFontSettings(bufparams, cpos);
+ real_current_font = tm.getDisplayFont(cpit, cpos);
+
+ // special case for paragraph end
+ if (cs.pos() == lastpos()
+ && tm.isRTLBoundary(cpit, cs.pos())
+ && !boundary()) {
+ Language const * lang = par.getParLanguage(bufparams);
+ current_font.setLanguage(lang);
+ current_font.setNumber(Font::OFF);
+ real_current_font.setLanguage(lang);
+ real_current_font.setNumber(Font::OFF);
+ }
+}
+
} // namespace lyx