#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
+#include "frontends/Painter.h"
#include "insets/insettext.h"
#include "insets/insetbibitem.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <sstream>
-using lyx::par_type;
+using lyx::pit_type;
using lyx::pos_type;
using lyx::word_location;
}
-unsigned int maxParagraphWidth(ParagraphList const & plist)
-{
- unsigned int width = 0;
- ParagraphList::const_iterator pit = plist.begin();
- ParagraphList::const_iterator end = plist.end();
- for (; pit != end; ++pit)
- width = std::max(width, pit->width);
- return width;
-}
-
-
int numberOfLabelHfills(Paragraph const & par, Row const & row)
{
pos_type last = row.endpos() - 1;
}
-void LyXText::updateParPositions()
-{
- par_type pit = 0;
- par_type end = pars_.size();
- for (height_ = 0; pit != end; ++pit) {
- pars_[pit].y = height_;
- height_ += pars_[pit].height;
- }
-}
-
-
int LyXText::width() const
{
- return width_;
+ return dim_.wid;
}
int LyXText::height() const
{
- return height_;
+ return dim_.height();
}
&& font.language()->lang() == "arabic") {
if (Encodings::IsComposeChar_arabic(c))
return 0;
- else
- c = par.transformChar(c, pos);
+ c = par.transformChar(c, pos);
} else if (font.language()->lang() == "hebrew" &&
Encodings::IsComposeChar_hebrew(c))
return 0;
}
-int LyXText::leftMargin(par_type pit) const
+int LyXText::leftMargin(pit_type pit) const
{
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
return leftMargin(pit, pars_[pit].size());
}
-int LyXText::leftMargin(par_type const pit, pos_type const pos) const
+int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
{
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(pars_.size()));
Paragraph const & par = pars_[pit];
+ BOOST_ASSERT(pos >= 0);
+ BOOST_ASSERT(pos <= par.size());
+ //lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl;
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
LyXLayout_ptr const & layout = par.layout();
int l_margin = 0;
- if (xo_ == 0)
+ if (isMainText())
l_margin += changebarMargin();
l_margin += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
if (par.getDepth() != 0) {
// find the next level paragraph
- par_type newpar = outerHook(pit, pars_);
- if (newpar != par_type(pars_.size())) {
+ pit_type newpar = outerHook(pit, pars_);
+ if (newpar != pit_type(pars_.size())) {
if (pars_[newpar].layout()->isEnvironment()) {
l_margin = leftMargin(newpar);
}
#if 0
// ok, a terrible hack. The left margin depends on the widest
// row in this paragraph.
- RowList::iterator rit = par.rows.begin();
- RowList::iterator end = par.rows.end();
+ RowList::iterator rit = par.rows().begin();
+ RowList::iterator end = par.rows().end();
#ifdef WITH_WARNINGS
#warning This is wrong.
#endif
&& !isFirstInSequence(pit, pars_)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
- // in tabulars and ert paragraphs are never indented!
+ // in charstyles, tabulars and ert paragraphs are never indented!
&& (par.ownerCode() != InsetBase::TEXT_CODE
- && par.ownerCode() != InsetBase::ERT_CODE)
+ && par.ownerCode() != InsetBase::ERT_CODE
+ && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
&& (par.layout() != tclass.defaultLayout()
|| bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
int LyXText::rightMargin(Paragraph const & par) const
{
- LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
-
// We do not want rightmargins on inner texts.
if (bv()->text() != this)
return 0;
+ LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
int const r_margin =
::rightMargin()
+ font_metrics::signedWidth(tclass.rightmargin(),
* 4 / (par.getDepth() + 4);
return r_margin;
-
}
-int LyXText::labelEnd(par_type const pit) const
+int LyXText::labelEnd(pit_type const pit) const
{
// labelEnd is only needed if the layout fills a flushleft label.
if (pars_[pit].layout()->margintype != MARGIN_MANUAL)
};
-void LyXText::rowBreakPoint(par_type const pit, Row & row) const
+void LyXText::rowBreakPoint(pit_type const pit, Row & row) const
{
Paragraph const & par = pars_[pit];
pos_type const end = par.size();
// pixel width since last breakpoint
int chunkwidth = 0;
- FontIterator fi = FontIterator(*this, pit, pos);
+ FontIterator fi = FontIterator(*this, par, pos);
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
}
-void LyXText::setRowWidth(par_type const pit, Row & row) const
+void LyXText::setRowWidth(pit_type const pit, Row & row) const
{
// get the pure distance
pos_type const end = row.endpos();
pos_type i = row.pos();
if (i < end) {
- FontIterator fi = FontIterator(*this, pit, i);
+ FontIterator fi = FontIterator(*this, par, i);
for ( ; i < end; ++i, ++fi) {
if (body_pos > 0 && i == body_pos) {
w += font_metrics::width(labelsep, getLabelFont(par));
}
-void LyXText::setHeightOfRow(par_type const pit, Row & row)
+void LyXText::setHeightOfRow(pit_type const pit, Row & row)
{
Paragraph const & par = pars_[pit];
// get the maximum ascent and the maximum descent
++maxasc;
++maxdesc;
- row.ascent_of_text(maxasc);
+ row.ascent(maxasc);
// is it a top line?
if (row.pos() == 0) {
// a section, or between the items of a itemize or enumerate
// environment.
- par_type prev = depthHook(pit, pars_, par.getDepth());
+ pit_type prev = depthHook(pit, pars_, par.getDepth());
if (prev != pit
&& pars_[prev].layout() == layout
&& pars_[prev].getDepth() == par.getDepth()
}
prev = outerHook(pit, pars_);
- if (prev != par_type(pars_.size())) {
+ if (prev != pit_type(pars_.size())) {
maxasc += int(pars_[prev].layout()->parsep * dh);
} else if (pit != 0) {
if (pars_[pit - 1].getDepth() != 0 ||
// add the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
- par_type nextpit = pit + 1;
- if (nextpit != par_type(pars_.size())) {
- par_type cpit = pit;
+ pit_type nextpit = pit + 1;
+ if (nextpit != pit_type(pars_.size())) {
+ pit_type cpit = pit;
double usual = 0;
double unusual = 0;
maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth()));
maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth()));
- row.height(maxasc + maxdesc + labeladdon);
- row.baseline(maxasc + labeladdon);
- row.top_of_text(row.baseline() - font_metrics::maxAscent(font));
+ row.ascent(maxasc + labeladdon);
+ row.descent(maxdesc);
}
BOOST_ASSERT(this == cur.text());
// allow only if at start or end, or all previous is new text
Paragraph & cpar = cur.paragraph();
- par_type cpit = cur.par();
+ pit_type cpit = cur.pit();
if (cur.pos() != 0 && cur.pos() != cur.lastpos()
&& cpar.isChangeEdited(0, cur.pos()))
return;
// a layout change may affect also the following paragraph
- recUndo(cur.par(), undoSpan(cur.par()) - 1);
+ recUndo(cur.pit(), undoSpan(cur.pit()) - 1);
// Always break behind a space
// It is better to erase the space (Dekel)
::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
cur.pos(), keep_layout);
- cpit = cur.par();
- par_type next_par = cpit + 1;
+ cpit = cur.pit();
+ pit_type next_par = cpit + 1;
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
pars_[next_par].erase(0);
updateCounters();
- redoParagraph(cpit);
- redoParagraph(next_par);
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
if (cur.pos() != 0 || isempty)
- setCursor(cur, cur.par() + 1, 0);
+ setCursor(cur, cur.pit() + 1, 0);
else
- setCursor(cur, cur.par(), 0);
-}
-
-
-// convenience function
-void LyXText::redoParagraph(LCursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- cur.clearSelection();
- redoParagraph(cur.par());
- setCursorIntern(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), 0);
}
Paragraph & par = cur.paragraph();
// try to remove this
- par_type const pit = cur.par();
+ pit_type const pit = cur.pit();
bool const freeSpacing = par.layout()->free_spacing ||
par.isFreeSpacing();
current_font = rawtmpfont;
real_current_font = realtmpfont;
- redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
charInserted();
}
}
-RowMetrics LyXText::computeRowMetrics(par_type const pit, Row const & row) const
+RowMetrics
+LyXText::computeRowMetrics(pit_type const pit, Row const & row) const
{
RowMetrics result;
Paragraph const & par = pars_[pit];
- double w = width_ - row.width();
+ double w = dim_.wid - row.width();
bool const is_rtl = isRTL(par);
if (is_rtl)
void LyXText::cursorRightOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == cur.lastpos() && cur.par() != cur.lastpar()) {
- ++cur.par();
+ if (cur.pos() == cur.lastpos() && cur.pit() != cur.lastpit()) {
+ ++cur.pit();
cur.pos() = 0;
} else {
// Skip through initial nonword stuff.
// Treat floats and insets as words.
- while (cur.pos() != cur.lastpos() && !cur.paragraph().isWord(cur.pos()))
+ while (cur.pos() != cur.lastpos() && !cur.paragraph().isLetter(cur.pos()))
++cur.pos();
// Advance through word.
- while (cur.pos() != cur.lastpos() && cur.paragraph().isWord(cur.pos()))
+ while (cur.pos() != cur.lastpos() && cur.paragraph().isLetter(cur.pos()))
++cur.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), cur.pos());
}
void LyXText::cursorLeftOneWord(LCursor & cur)
{
BOOST_ASSERT(this == cur.text());
- if (cur.pos() == 0 && cur.par() != 0) {
- --cur.par();
+ if (cur.pos() == 0 && cur.pit() != 0) {
+ --cur.pit();
cur.pos() = cur.lastpos();
} else {
// Skip through initial nonword stuff.
// Treat floats and insets as words.
- while (cur.pos() != 0 && !cur.paragraph().isWord(cur.pos() - 1))
+ while (cur.pos() != 0 && !cur.paragraph().isLetter(cur.pos() - 1))
--cur.pos();
// Advance through word.
- while (cur.pos() != 0 && cur.paragraph().isWord(cur.pos() - 1))
+ while (cur.pos() != 0 && cur.paragraph().isLetter(cur.pos() - 1))
--cur.pos();
}
- setCursor(cur, cur.par(), cur.pos());
+ setCursor(cur, cur.pit(), cur.pos());
}
CursorSlice to = cur.top();
getWord(from, to, loc);
if (cur.top() != from)
- setCursor(cur, from.par(), from.pos());
+ setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
cur.resetAnchor();
- setCursor(cur, to.par(), to.pos());
+ setCursor(cur, to.pit(), to.pos());
cur.setSelection();
}
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
+ if (startc.pit() == endc.pit()) {
recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].acceptChange(startc.pos(), endc.pos());
+ pars_[startc.pit()].acceptChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ setCursorIntern(cur, startc.pit(), 0);
}
#ifdef WITH_WARNINGS
#warning handle multi par selection
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- if (startc.par() == endc.par()) {
+ if (startc.pit() == endc.pit()) {
recordUndoSelection(cur, Undo::INSERT);
- pars_[startc.par()].rejectChange(startc.pos(), endc.pos());
+ pars_[startc.pit()].rejectChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
- redoParagraph(startc.par());
- setCursorIntern(cur, startc.par(), 0);
+ setCursorIntern(cur, startc.pit(), 0);
}
#ifdef WITH_WARNINGS
#warning handle multi par selection
} else {
from = cur.top();
getWord(from, to, lyx::PARTIAL_WORD);
- setCursor(cur, to.par(), to.pos() + 1);
+ setCursor(cur, to.pit(), to.pos() + 1);
}
recordUndoSelection(cur);
pos_type pos = from.pos();
- int par = from.par();
+ int par = from.pit();
- while (par != int(pars_.size()) && (pos != to.pos() || par != to.par())) {
- par_type pit = par;
+ while (par != int(pars_.size()) && (pos != to.pos() || par != to.pit())) {
+ pit_type pit = par;
if (pos == pars_[pit].size()) {
++par;
pos = 0;
{
BOOST_ASSERT(this == cur.text());
if (cur.pos() != cur.lastpos()) {
- recordUndo(cur, Undo::DELETE, cur.par());
- setCursorIntern(cur, cur.par(), cur.pos() + 1, false, cur.boundary());
+ recordUndo(cur, Undo::DELETE, cur.pit());
+ setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
backspace(cur);
}
// should we do anything in an else branch?
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
- if (cur.par() != 0) {
+ if (cur.pit() != 0) {
cursorLeft(cur);
- // the layout things can change the height of a row !
- redoParagraph(cur);
return;
}
}
- if (cur.par() != 0)
- recordUndo(cur, Undo::DELETE, cur.par() - 1);
+ if (cur.pit() != 0)
+ recordUndo(cur, Undo::DELETE, cur.pit() - 1);
- par_type tmppit = cur.par();
+ pit_type tmppit = cur.pit();
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- if (cur.par() != 0) {
+ if (cur.pit() != 0) {
// steps into the above paragraph.
- setCursorIntern(cur, cur.par() - 1,
- pars_[cur.par() - 1].size(),
+ setCursorIntern(cur, cur.pit() - 1,
+ pars_[cur.pit() - 1].size(),
false);
}
Buffer & buf = cur.buffer();
BufferParams const & bufparams = buf.params();
LyXTextClass const & tclass = bufparams.getLyXTextClass();
- par_type const cpit = cur.par();
+ pit_type const cpit = cur.pit();
if (cpit != tmppit
&& (pars_[cpit].layout() == pars_[tmppit].layout()
|| pars_[tmppit].layout() == tclass.defaultLayout())
&& pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
- mergeParagraph(bufparams, buf.paragraphs(), cpit);
+ mergeParagraph(bufparams, pars_, cpit);
if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
--cur.pos();
// the counters may have changed
updateCounters();
- setCursor(cur, cur.par(), cur.pos(), false);
+ setCursor(cur, cur.pit(), cur.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- setCursorIntern(cur, cur.par(), cur.pos() - 1,
+ setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
cur.paragraph().erase(cur.pos());
}
if (cur.pos() == cur.lastpos())
setCurrentFont(cur);
- redoParagraph(cur);
- setCursor(cur, cur.par(), cur.pos(), false, cur.boundary());
+ setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary());
}
-Paragraph & LyXText::getPar(par_type par) const
+Paragraph & LyXText::getPar(pit_type par) const
{
//lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
BOOST_ASSERT(par >= 0);
Row const & LyXText::firstRow() const
{
- return *paragraphs().front().rows.begin();
+ return *paragraphs().front().rows().begin();
}
-void LyXText::redoParagraphInternal(par_type const pit)
+void LyXText::redoParagraph(pit_type const pit)
{
// remove rows of paragraph, keep track of height changes
Paragraph & par = pars_[pit];
- height_ -= par.height;
-
- // clear old data
- par.rows.clear();
- par.height = 0;
- par.width = 0;
// redo insets
InsetList::iterator ii = par.insetlist.begin();
}
// rebreak the paragraph
+ par.rows().clear();
+ Dimension dim;
+
par.setBeginOfBody();
pos_type z = 0;
do {
rowBreakPoint(pit, row);
setRowWidth(pit, row);
setHeightOfRow(pit, row);
- row.y_offset(par.height);
- par.rows.push_back(row);
- par.width = std::max(par.width, row.width());
- par.height += row.height();
+ par.rows().push_back(row);
+ dim.wid = std::max(dim.wid, row.width());
+ dim.des += row.height();
z = row.endpos();
} while (z < par.size());
- height_ += par.height;
- //lyxerr << "redoParagraph: " << par.rows.size() << " rows\n";
-}
-
-
-void LyXText::redoParagraphs(par_type pit, par_type end)
-{
- for (; pit != end; ++pit)
- redoParagraphInternal(pit);
- updateParPositions();
- updateCounters();
-}
-
-
-void LyXText::redoParagraph(par_type pit)
-{
- redoParagraphInternal(pit);
- updateParPositions();
-}
-
-
-void LyXText::fullRebreak()
-{
- redoParagraphs(0, paragraphs().size());
- bv()->cursor().resetAnchor();
+ dim.asc += par.rows()[0].ascent();
+ dim.des -= par.rows()[0].ascent();
+ par.dim_ = dim;
+ //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n";
}
if (mi.base.textwidth)
maxwidth_ = mi.base.textwidth;
//lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
- //<< " maxWidth: " << maxwidth << "\nfont: " << mi.base.font
- //<< endl;
-
- // Rebuild row cache. This recomputes height as well.
- redoParagraphs(0, paragraphs().size());
+ // << " maxWidth: " << maxwidth_ << "\nfont: " << mi.base.font << endl;
+
+ unsigned int h = 0;
+ unsigned int w = 0;
+ for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) {
+ redoParagraph(pit);
+ Paragraph & par = paragraphs()[pit];
+ h += par.height();
+ if (w < par.width())
+ w = par.width();
+ }
- width_ = maxParagraphWidth(paragraphs());
+ dim.wid = w;
+ dim.asc = pars_[0].ascent();
+ dim.des = h - dim.asc;
- // final dimension
- dim.asc = firstRow().ascent_of_text();
- dim.des = height_ - dim.asc;
- dim.wid = width_;
+ dim_ = dim;
}
// only used for inset right now. should also be used for main text
void LyXText::draw(PainterInfo & pi, int x, int y) const
{
- xo_ = x;
- yo_ = y;
- paintTextInset(*this, pi);
+ paintTextInset(*this, pi, x, y);
}
+/*
// only used for inset right now. should also be used for main text
-void LyXText::drawSelection(PainterInfo &, int, int) const
+void LyXText::drawSelection(PainterInfo & pi, int x , int) const
{
- //lyxerr << "LyXText::drawSelection at " << x << " " << y << endl;
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr << "draw selection at " << x << endl;
+
+ // is there a better way of getting these two iterators?
+ DocIterator beg = cur;
+ DocIterator end = cur;
+
+ beg.top() = cur.selBegin();
+ end.top() = cur.selEnd();
+
+ // the selection doesn't touch the visible screen
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+ return;
+
+ Paragraph const & par1 = pars_[beg.pit()];
+ Paragraph const & par2 = pars_[end.pit()];
+
+ Row const & row1 = par1.getRow(beg.pos());
+ Row const & row2 = par2.getRow(end.pos());
+
+ int y1,x1,x2;
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_ABOVE) {
+ y1 = 0;
+ x1 = 0;
+ x2 = 0;
+ } else {
+ y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+ int const startx = cursorX(beg.top());
+ x1 = isRTL(par1) ? startx : 0;
+ x2 = isRTL(par1) ? 0 + dim_.wid : startx;
+ }
+
+ int y2,X1,X2;
+ if (bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_BELOW) {
+ y2 = pi.base.bv->workHeight();
+ X1 = 0;
+ X2 = 0;
+ } else {
+ y2 = bv_funcs::getPos(end).y_ + row2.descent();
+ int const endx = cursorX(end.top());
+ X1 = isRTL(par2) ? 0 : endx;
+ X2 = isRTL(par2) ? endx : 0 + dim_.wid;
+ }
+
+ lyxerr << " y1: " << y1 << " y2: " << y2
+ << " xo: " << xo_ << " wid: " << dim_.wid
+ << endl;
+
+ // paint big rectangle in one go
+ pi.pain.fillRectangle(x, y1, dim_.wid, y2 - y1, LColor::selection);
+
+ // reset background at begin of first selected line
+ pi.pain.fillRectangle(x + x1, y1, x2 - x1, row1.height(),
+ LColor::background);
+
+ // reset background at end of last selected line
+ pi.pain.fillRectangle(x + X1, y2 - row2.height(),
+ X2 - X1, row2.height(), LColor::background);
}
+*/
-bool LyXText::isLastRow(par_type pit, Row const & row) const
+void LyXText::drawSelection(PainterInfo & pi, int x, int) const
+{
+ LCursor & cur = pi.base.bv->cursor();
+ if (!cur.selection())
+ return;
+ if (!ptr_cmp(cur.text(), this))
+ return;
+
+ lyxerr << "draw selection at " << x << endl;
+
+ // is there a better way of getting these two iterators?
+ DocIterator beg = cur;
+ DocIterator end = cur;
+
+ beg.top() = cur.selBegin();
+ end.top() = cur.selEnd();
+
+ // the selection doesn't touch the visible screen
+ if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW
+ || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE)
+ return;
+
+ Paragraph const & par1 = pars_[beg.pit()];
+ Paragraph const & par2 = pars_[end.pit()];
+
+ bool const above = (bv_funcs::status(pi.base.bv, beg)
+ == bv_funcs::CUR_ABOVE);
+ bool const below = (bv_funcs::status(pi.base.bv, end)
+ == bv_funcs::CUR_BELOW);
+ int y1,y2,x1,x2;
+ if (above) {
+ y1 = 0;
+ y2 = 0;
+ x1 = 0;
+ x2 = dim_.wid;
+ } else {
+ Row const & row1 = par1.getRow(beg.pos());
+ y1 = bv_funcs::getPos(beg).y_ - row1.ascent();
+ y2 = y1 + row1.height();
+ int const startx = cursorX(beg.top());
+ x1 = !isRTL(par1) ? startx : 0;
+ x2 = !isRTL(par1) ? 0 + dim_.wid : startx;
+ }
+
+ int Y1,Y2,X1,X2;
+ if (below) {
+ Y1 = pi.base.bv->workHeight();
+ Y2 = pi.base.bv->workHeight();
+ X1 = 0;
+ X2 = dim_.wid;
+ } else {
+ Row const & row2 = par2.getRow(end.pos());
+ Y1 = bv_funcs::getPos(end).y_ - row2.ascent();
+ Y2 = Y1 + row2.height();
+ int const endx = cursorX(end.top());
+ X1 = !isRTL(par2) ? 0 : endx;
+ X2 = !isRTL(par2) ? endx : 0 + dim_.wid;
+ }
+
+ if (!above && !below && &par1.getRow(beg.pos())
+ == &par2.getRow(end.pos()))
+ {
+ // paint only one rectangle
+ pi.pain.fillRectangle(x + x1, y1, X2 - x1, y2 - y1,
+ LColor::selection);
+ return;
+ }
+
+ // paint upper rectangle
+ pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
+ LColor::selection);
+ // paint bottom rectangle
+ pi.pain.fillRectangle(x + X1, Y1, X2 - X1, Y2 - Y1,
+ LColor::selection);
+ // paint center rectangle
+ pi.pain.fillRectangle(x, y2, dim_.wid,
+ Y1 - y2, LColor::selection);
+}
+
+bool LyXText::isLastRow(pit_type pit, Row const & row) const
{
return row.endpos() >= pars_[pit].size()
- && pit + 1 == par_type(paragraphs().size());
+ && pit + 1 == pit_type(paragraphs().size());
}
-bool LyXText::isFirstRow(par_type pit, Row const & row) const
+bool LyXText::isFirstRow(pit_type pit, Row const & row) const
{
return row.pos() == 0 && pit == 0;
}
void LyXText::getWord(CursorSlice & from, CursorSlice & to,
word_location const loc)
{
- Paragraph const & from_par = pars_[from.par()];
+ Paragraph const & from_par = pars_[from.pit()];
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par.size()
- || !from_par.isWord(from.pos())
- || !from_par.isWord(from.pos() - 1)) {
+ || !from_par.isLetter(from.pos())
+ || !from_par.isLetter(from.pos() - 1)) {
to = from;
return;
}
case lyx::WHOLE_WORD:
// If we are already at the beginning of a word, do nothing
- if (!from.pos() || !from_par.isWord(from.pos() - 1))
+ if (!from.pos() || !from_par.isLetter(from.pos() - 1))
break;
// no break here, we go to the next
case lyx::PREVIOUS_WORD:
// always move the cursor to the beginning of previous word
- while (from.pos() && from_par.isWord(from.pos() - 1))
+ while (from.pos() && from_par.isLetter(from.pos() - 1))
--from.pos();
break;
case lyx::NEXT_WORD:
break;
}
to = from;
- Paragraph & to_par = pars_[to.par()];
- while (to.pos() < to_par.size() && to_par.isWord(to.pos()))
+ Paragraph & to_par = pars_[to.pit()];
+ while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
++to.pos();
}
int LyXText::ascent() const
{
- return firstRow().ascent_of_text();
+ return dim_.asc;
}
int LyXText::descent() const
{
- return height_ - firstRow().ascent_of_text();
+ return dim_.des;
}
int LyXText::cursorX(CursorSlice const & cur) const
{
- par_type const pit = cur.par();
+ pit_type const pit = cur.pit();
Paragraph const & par = pars_[pit];
- if (par.rows.empty())
- return xo_;
+ if (par.rows().empty())
+ return 0;
- Row const & row = *par.getRow(cur.pos());
+ Row const & row = par.getRow(cur.pos());
pos_type pos = cur.pos();
pos_type cursor_vpos = 0;
} else
x += singleWidth(par, pos);
}
- return xo_ + int(x);
+ return int(x);
}
int LyXText::cursorY(CursorSlice const & cur) const
{
- Paragraph const & par = getPar(cur.par());
- Row const & row = *par.getRow(cur.pos());
- return yo_ + par.y + row.y_offset() + row.baseline();
+ Paragraph const & par = getPar(cur.pit());
+ int h = 0;
+ h -= pars_[0].rows()[0].ascent();
+ for (pit_type pit = 0; pit < cur.pit(); ++pit)
+ h += pars_[pit].height();
+ for (size_t rit = 0, rend = par.pos2row(cur.pos()); rit != rend; ++rit)
+ h += par.rows()[rit].height();
+ h += par.rows()[par.pos2row(cur.pos())].ascent();
+ return h;
}
// The paragraph depth
int depth = cur.paragraph().getDepth();
if (depth > 0)
- os << bformat(_(", Depth: %1$s"), tostr(depth));
+ os << bformat(_(", Depth: %1$d"), depth);
// The paragraph spacing, but only if different from
// buffer spacing.
os << _("Double");
break;
case Spacing::Other:
- os << _("Other (") << spacing.getValue() << ')';
+ os << _("Other (") << spacing.getValueAsString() << ')';
break;
case Spacing::Default:
// should never happen, do nothing
#ifdef DEVEL_VERSION
os << _(", Inset: ") << &cur.inset();
- os << _(", Paragraph: ") << cur.par();
+ os << _(", Paragraph: ") << cur.pit();
os << _(", Id: ") << par.id();
os << _(", Position: ") << cur.pos();
- Row & row = cur.textRow();
- os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+// Row & row = cur.textRow();
+// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
#endif
return os.str();
}
string LyXText::getPossibleLabel(LCursor & cur) const
{
- par_type pit = cur.par();
+ pit_type pit = cur.pit();
LyXLayout_ptr layout = pars_[pit].layout();
}
-// Manhattan distance to nearest corner
-int LyXText::dist(int x, int y) const
+//pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+//{
+// int lastx = 0;
+// int currx = 0;
+// Paragraph const & par = pars_[pit];
+// Row const & r = par.rows()[row];
+// int pos = r.pos();
+// for (; currx < x && pos < r.endpos(); ++pos) {
+// lastx = currx;
+// currx += singleWidth(par, pos);
+// }
+// if (abs(lastx - x) < abs(currx - x) && pos != r.pos())
+// --pos;
+// return pos;
+//}
+
+
+pos_type LyXText::x2pos(pit_type pit, int row, int x) const
+{
+ bool bound = false;
+ Row const & r = pars_[pit].rows()[row];
+ return r.pos() + getColumnNearX(pit, r, x, bound);
+}
+
+
+//int LyXText::pos2x(pit_type pit, pos_type pos) const
+//{
+// Paragraph const & par = pars_[pit];
+// Row const & r = par.rows()[row];
+// int x = 0;
+// pos -= r.pos();
+//}
+
+
+// x,y are screen coordinates
+// sets cursor only within this LyXText
+void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
{
- int xx = 0;
- int yy = 0;
-
- if (x < xo_)
- xx = xo_ - x;
- else if (x > xo_ + int(width_))
- xx = x - xo_ - width_;
-
- if (y < yo_ - ascent())
- yy = yo_ - ascent() - y;
- else if (y > yo_ + descent())
- yy = y - yo_ - descent();
-
- lyxerr << " xo_=" << xo_ << " yo_=" << yo_
- << " width_=" << width_ << " ascent=" << ascent()
- << " descent=" << descent()
- << " dist=" << xx+yy <<endl;
- return xx + yy;
+ pit_type pit = getPitNearY(y);
+ int yy = theCoords.get(this, pit).y_ - pars_[pit].ascent();
+ lyxerr << "setCursorFromCoordinates: x: " << x << " y: " << y
+ << " pit: " << pit << " yy: " << yy << endl;
+
+ Paragraph const & par = pars_[pit];
+ int r = 0;
+ BOOST_ASSERT(par.rows().size());
+ for (; r < int(par.rows().size()) - 1; ++r) {
+ Row const & row = par.rows()[r];
+ if (int(yy + row.height()) > y)
+ break;
+ yy += row.height();
+ }
+
+ Row const & row = par.rows()[r];
+
+ lyxerr << "setCursorFromCoordinates: row " << r
+ << " from pos: " << row.pos() << endl;
+
+ bool bound = false;
+ int xx = x;
+ pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
+ setCursor(cur, pit, pos, true, bound);
}
projects / lyx.git / blobdiff