#include "buffer.h"
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dimension.h"
#include "funcrequest.h"
#include "gettext.h"
+#include "errorlist.h"
#include "intl.h"
#include "LaTeXFeatures.h"
#include "LColor.h"
#include <fstream>
#include <algorithm>
#include <cstdlib>
-//#include <csignal>
using std::ostream;
using std::ifstream;
using std::vector;
using std::pair;
using std::for_each;
+using std::auto_ptr;
+
+using namespace lyx::support;
+using namespace lyx::graphics;
+using namespace bv_funcs;
using lyx::pos_type;
using lyx::textclass_type;
-
// These functions should probably go into bufferview_funcs somehow (Jug)
-void InsetText::saveLyXTextState(LyXText * t) const
+void InsetText::saveLyXTextState() const
{
// check if my paragraphs are still valid
ParagraphList::iterator it = const_cast<ParagraphList&>(paragraphs).begin();
ParagraphList::iterator end = const_cast<ParagraphList&>(paragraphs).end();
for (; it != end; ++it) {
- if (it == t->cursor.par())
+ if (it == text_.cursor.par())
break;
}
- if (it != end && t->cursor.pos() <= it->size()) {
- sstate.lpar = t->cursor.par();
- sstate.pos = t->cursor.pos();
- sstate.boundary = t->cursor.boundary();
- sstate.selstartpar = t->selection.start.par();
- sstate.selstartpos = t->selection.start.pos();
- sstate.selstartboundary = t->selection.start.boundary();
- sstate.selendpar = t->selection.end.par();
- sstate.selendpos = t->selection.end.pos();
- sstate.selendboundary = t->selection.end.boundary();
- sstate.selection = t->selection.set();
- sstate.mark_set = t->selection.mark();
- } else {
- sstate.lpar = const_cast<ParagraphList&>(paragraphs).end();
- }
+ if (it != end && text_.cursor.pos() <= it->size())
+ sstate = text_; // slicing intended
+ else
+ sstate.cursor.par(end);
}
-void InsetText::restoreLyXTextState(LyXText * t) const
+void InsetText::restoreLyXTextState() const
{
- if (sstate.
lpar == const_cast<ParagraphList&>(paragraphs).end())
+ if (sstate.
cursor.par() == const_cast<ParagraphList&>(paragraphs).end())
return;
- t->selection.set(true);
- /* at this point just to avoid the DEPM when setting the cursor */
- t->selection.mark(sstate.mark_set);
- if (sstate.selection) {
- t->setCursor(sstate.selstartpar, sstate.selstartpos,
- true, sstate.selstartboundary);
- t->selection.cursor = t->cursor;
- t->setCursor(sstate.selendpar, sstate.selendpos,
- true, sstate.selendboundary);
- t->setSelection();
- t->setCursor(sstate.lpar, sstate.pos);
+ text_.selection.set(true);
+ // at this point just to avoid the DEPM when setting the cursor
+ text_.selection.mark(sstate.selection.mark());
+ if (sstate.selection.set()) {
+ text_.setCursor(sstate.selection.start.par(),
+ sstate.selection.start.pos(),
+ true, sstate.selection.start.boundary());
+ text_.selection.cursor = text_.cursor;
+ text_.setCursor(sstate.selection.end.par(), sstate.selection.end.pos(),
+ true, sstate.selection.end.boundary());
+ text_.setSelection();
+ text_.setCursor(sstate.cursor.par(), sstate.cursor.pos());
} else {
- t->setCursor(sstate.lpar, sstate.pos, true, sstate.boundary);
- t->selection.cursor = t->cursor;
- t->selection.set(false);
+ text_.setCursor(sstate.cursor.par(), sstate.cursor.pos(),
+ true, sstate.cursor.boundary());
+ text_.selection.cursor = text_.cursor;
+ text_.selection.set(false);
}
}
-InsetText::InnerCache::InnerCache(boost::shared_ptr<LyXText> t)
-{
- text = t;
- remove = false;
-}
-
-
InsetText::InsetText(BufferParams const & bp)
- : UpdatableInset(), lt(0), in_update(false), do_resize(0),
- do_reinit(false)
+ : UpdatableInset(), text_(0, this)
{
paragraphs.push_back(Paragraph());
paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout());
InsetText::InsetText(InsetText const & in)
- : UpdatableInset(in), lt(0), in_update(false), do_resize(0),
- do_reinit(false)
+ : UpdatableInset(in), text_(0, this)
{
init(&in);
}
InsetText & InsetText::operator=(InsetText const & it)
{
init(&it);
- return * this;
+ return *this;
}
void InsetText::init(InsetText const * ins)
{
if (ins) {
+ textwidth_ = ins->textwidth_;
+ text_.bv_owner = ins->text_.bv_owner;
setParagraphData(ins->paragraphs);
autoBreakRows = ins->autoBreakRows;
drawFrame_ = ins->drawFrame_;
frame_color = ins->frame_color;
} else {
- for_each(paragraphs.begin(), paragraphs.end(),
- boost::bind(&Paragraph::setInsetOwner, _1, this));
-
- the_locking_inset = 0;
+ textwidth_ = 0; // unbounded
drawFrame_ = NEVER;
frame_color = LColor::insetframe;
autoBreakRows = false;
}
+ the_locking_inset = 0;
+ for_each(paragraphs.begin(), paragraphs.end(),
+ boost::bind(&Paragraph::setInsetOwner, _1, this));
top_y = 0;
- old_max_width = 0;
no_selection = true;
need_update = FULL;
drawTextXOffset = 0;
locked = false;
old_par = paragraphs.end();
last_drawn_width = -1;
- cached_bview = 0;
- sstate.lpar = paragraphs.end();
+ sstate.cursor.par(paragraphs.end());
in_insetAllowed = false;
}
}
-InsetBase * InsetText::clone() const
+auto_ptr<InsetBase> InsetText::clone() const
{
- return new InsetText(*this);
+ return auto_ptr<InsetBase>(new InsetText(*this));
}
void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << "\n";
+
+ textwidth_ = mi.base.textwidth;
BufferView * bv = mi.base.bv;
- LyXText * text = getLyXText(bv);
- dim.asc = text->rows().begin()->ascent_of_text() + TEXT_TO_INSET_OFFSET;
- dim.des = text->height - dim.asc + TEXT_TO_INSET_OFFSET;
- dim.wid = max(textWidth(bv), int(text->width)) + 2 * TEXT_TO_INSET_OFFSET;
+ setViewCache(bv);
+ text_.metrics(mi, dim);
+ dim.asc += TEXT_TO_INSET_OFFSET;
+ dim.des += TEXT_TO_INSET_OFFSET;
+ dim.wid += 2 * TEXT_TO_INSET_OFFSET;
dim.wid = max(dim.wid, 10);
dim_ = dim;
}
-int InsetText::textWidth(BufferView * bv, bool fordraw) const
+int InsetText::textWidth() const
{
- int w = autoBreakRows ? getMaxWidth(bv, this) : -1;
-
- if (fordraw)
- return max(w - 2 * TEXT_TO_INSET_OFFSET,
- (int)getLyXText(bv)->width);
-
- if (w < 0)
- return -1;
-
- return w - 2 * TEXT_TO_INSET_OFFSET;
+ return textwidth_;
}
// update our idea of where we are. Clearly, we should
// not have to know this information.
- if (top_x != x)
- top_x = x;
+ top_x = x;
int const start_x = x;
last_drawn_width = dim_.wid;
}
- if (the_locking_inset && (cpar(bv) == inset_par)
- && (cpos(bv) == inset_pos)) {
- inset_x = cix(bv) - int(x) + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
+ inset_x = cix(bv) - x + drawTextXOffset;
+ inset_y = ciy() + drawTextYOffset;
}
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
x += TEXT_TO_INSET_OFFSET;
- RowList::iterator rowit = lt->rows().begin();
- RowList::iterator end = lt->rows().end();
+ RowList::iterator rowit = text_.rows().begin();
+ RowList::iterator end = text_.rows().end();
int y_offset = baseline - rowit->ascent_of_text();
int ph = pain.paperHeight();
int first = 0;
int y = y_offset;
- while ((rowit != end) && ((y + rowit->height()) <= 0)) {
+ while (rowit != end && y + rowit->height() <= 0) {
y += rowit->height();
first += rowit->height();
++rowit;
}
if (y_offset < 0) {
- lt->top_y(-y_offset);
+ text_.top_y(-y_offset);
first = y;
y_offset = 0;
} else {
- lt->top_y(first);
+ text_.top_y(first);
first = 0;
}
bv->hideCursor();
- while ((rowit != end) && (yf < ph)) {
- RowPainter rp(*bv, *lt, rowit);
- rp.paint(y + y_offset + first, int(x), y + lt->top_y());
+ while (rowit != end && yf < ph) {
+ paintRows(*bv, text_, rowit,
+ y + y_offset + first, int(x), y + text_.top_y());
y += rowit->height();
yf += rowit->height();
++rowit;
}
- lt->clearPaint();
+ text_.clearPaint();
- if ((drawFrame_ == ALWAYS) || (drawFrame_ == LOCKED && locked)) {
+ if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
drawFrame(pain, int(start_x));
}
- x += dim_.wid - TEXT_TO_INSET_OFFSET;
-
if (need_update != INIT) {
need_update = NONE;
}
- if (clear)
- lt = 0;
}
}
-void InsetText::update(BufferView * bv, bool reinit)
+void InsetText::setUpdateStatus(int what) const
{
- if (in_update) {
- if (reinit && owner()) {
- reinitLyXText();
- owner()->update(bv, true);
- }
- return;
- }
- in_update = true;
-
- if (reinit || need_update == INIT) {
- need_update = FULL;
- // we should put this call where we set need_update to INIT!
- reinitLyXText();
- if (owner())
- owner()->update(bv, true);
- in_update = false;
-
- int nw = getMaxWidth(bv, this);
- if (nw > 0 && old_max_width != nw) {
- need_update |= INIT;
- old_max_width = nw;
- }
- return;
- }
-
- if (!autoBreakRows &&
- boost::next(paragraphs.begin()) != paragraphs.end())
- collapseParagraphs(bv);
-
- if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
- the_locking_inset->update(bv, reinit);
- }
-
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- if ((need_update & CURSOR_PAR) && (lt->refreshStatus() == LyXText::REFRESH_NONE) &&
- the_locking_inset) {
- lt->updateInset(the_locking_inset);
- }
-
- if (lt->refreshStatus() == LyXText::REFRESH_AREA)
- need_update |= FULL;
- if (clear)
- lt = 0;
-
- in_update = false;
-
- int nw = getMaxWidth(bv, this);
- if (nw > 0 && old_max_width != nw) {
- need_update |= INIT;
- old_max_width = nw;
- }
-}
-
-
-void InsetText::setUpdateStatus(BufferView * bv, int what) const
-{
- // this does nothing dangerous so use only a localized buffer
- LyXText * llt = getLyXText(bv);
-
need_update |= what;
- // we have to redraw us full if our LyXText REFRESH_AREA or
- // if we don't break row so that we only have one row to update!
- if ((llt->refreshStatus() == LyXText::REFRESH_AREA) ||
- (!autoBreakRows &&
- (llt->refreshStatus() == LyXText::REFRESH_ROW)))
- {
+ // we will to redraw us full if our LyXText wants it
+ if (text_.needRefresh())
need_update |= FULL;
- } else if (llt->refreshStatus() == LyXText::REFRESH_ROW) {
- need_update |= CURSOR_PAR;
- }
// this to not draw a selection when we redraw all of it!
if (need_update & CURSOR && !(need_update & SELECTION)) {
- if (llt->selection.set())
+ if (text_.selection.set())
need_update = FULL;
- llt->clearSelection();
+ text_.clearSelection();
}
}
void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
{
-#if 0
- if (!autoBreakRows &&
- boost::next(paragraphs.begin()) != paragraphs.end())
- collapseParagraphs(bv);
-#else
+ if (!bv)
+ return;
+
if (!autoBreakRows && paragraphs.size() > 1)
collapseParagraphs(bv);
-#endif
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- lt->fullRebreak();
- setUpdateStatus(bv, what);
+ text_.partialRebreak();
+ setUpdateStatus(what);
bool flag = mark_dirty ||
- (((need_update != CURSOR) && (need_update != NONE)) ||
- (lt->refreshStatus() != LyXText::REFRESH_NONE) || lt->selection.set());
- if (!lt->selection.set())
- lt->selection.cursor = lt->cursor;
+ ((need_update != CURSOR && need_update != NONE) ||
+ text_.needRefresh() || text_.selection.set());
+ if (!text_.selection.set())
+ text_.selection.cursor = text_.cursor;
bv->fitCursor();
if (flag) {
- lt->postPaint(0);
+ text_.postPaint();
bv->updateInset(const_cast<InsetText *>(this));
}
- if (clear)
- lt = 0;
-
if (need_update == CURSOR)
need_update = NONE;
bv->owner()->view_state_changed();
bv->owner()->updateMenubar();
bv->owner()->updateToolbar();
- if (old_par != cpar(bv)) {
- bv->owner()->setLayout(cpar(bv)->layout()->name());
- old_par = cpar(bv);
+ if (old_par != cpar()) {
+ bv->owner()->setLayout(cpar()->layout()->name());
+ old_par = cpar();
}
}
no_selection = true;
locked = false;
int code = NONE;
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- if (lt->selection.set()) {
- lt->clearSelection();
+ if (text_.selection.set()) {
+ text_.clearSelection();
code = FULL;
} else if (owner()) {
bv->owner()->setLayout(owner()->getLyXText(bv)
} else
bv->owner()->setLayout(bv->text->cursor.par()->layout()->name());
// hack for deleteEmptyParMech
- if (!paragraphs.begin()->empty()) {
- lt->setCursor(paragraphs.begin(), 0);
- } else if (boost::next(paragraphs.begin()) != paragraphs.end()) {
- lt->setCursor(boost::next(paragraphs.begin()), 0);
+ ParagraphList::iterator first_par = paragraphs.begin();
+ if (!first_par->empty()) {
+ text_.setCursor(first_par, 0);
+ } else if (paragraphs.size() > 1) {
+ text_.setCursor(boost::next(first_par), 0);
}
- if (clear)
- lt = 0;
#if 0
updateLocal(bv, code, false);
#else
if (code != NONE)
- setUpdateStatus(bv, code);
+ setUpdateStatus(code);
#endif
}
inset_boundary = false;
inset_par = paragraphs.end();
old_par = paragraphs.end();
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- lt->setCursor(paragraphs.begin(), 0);
- lt->clearSelection();
+ text_.setCursorIntern(paragraphs.begin(), 0);
+ text_.clearSelection();
finishUndo();
// If the inset is empty set the language of the current font to the
// language to the surronding text (if different).
- if (paragraphs.begin()->empty() &&
- boost::next(paragraphs.begin()) == paragraphs.end() &&
- bv->getParentLanguage(this) != lt->current_font.language()) {
+ if (paragraphs.begin()->empty() && paragraphs.size() == 1 &&
+ bv->getParentLanguage(this) != text_.current_font.language()) {
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
setFont(bv, font, false);
}
- if (clear)
- lt = 0;
int code = CURSOR;
if (drawFrame_ == LOCKED)
code = CURSOR|DRAW_FRAME;
- setUpdateStatus(bv, code);
+ setUpdateStatus(code);
}
{
the_locking_inset = inset;
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
- inset_pos = cpos(bv);
- inset_par = cpar(bv);
- inset_boundary = cboundary(bv);
- updateLocal(bv, CURSOR, false);
+ inset_y = ciy() + drawTextYOffset;
+ inset_pos = cpos();
+ inset_par = cpar();
+ inset_boundary = cboundary();
+ //updateLocal(bv, CURSOR, false);
}
int const id = inset->id();
for (; pit != pend; ++pit) {
- InsetList::iterator it =
- pit->insetlist.begin();
- InsetList::iterator const end =
- pit->insetlist.end();
+ InsetList::iterator it = pit->insetlist.begin();
+ InsetList::iterator const end = pit->insetlist.end();
for (; it != end; ++it) {
if (it->inset == inset) {
- getLyXText(bv)->setCursorIntern(pit, it->pos);
+ lyxerr << "InsetText::lockInsetInInset: 1 a\n";
+ text_.setCursorIntern(pit, it->pos);
+ lyxerr << "InsetText::lockInsetInInset: 1 b\n";
+ lyxerr << "bv: " << bv << " inset: " << inset << "\n";
lockInset(bv, inset);
+ lyxerr << "InsetText::lockInsetInInset: 1 c" << endl;
return true;
}
if (it->inset->getInsetFromID(id)) {
- getLyXText(bv)->setCursorIntern(pit, it->pos);
+ lyxerr << "InsetText::lockInsetInInset: 2\n";
+ text_.setCursorIntern(pit, it->pos);
it->inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
return the_locking_inset->lockInsetInInset(bv, inset);
}
}
}
+ lyxerr << "InsetText::lockInsetInInset: 3\n";
return false;
}
- if (inset == cpar(bv)->getInset(cpos(bv))) {
+ if (inset == cpar()->getInset(cpos())) {
lyxerr[Debug::INSETS] << "OK" << endl;
lockInset(bv, inset);
return true;
- } else if (the_locking_inset && (the_locking_inset == inset)) {
- if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
+ }
+
+ if (the_locking_inset && the_locking_inset == inset) {
+ if (cpar() == inset_par && cpos() == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
}
-bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset)
+bool InsetText::updateInsetInInset(BufferView * bv, InsetOld * inset)
{
- if (!autoBreakRows &&
- boost::next(paragraphs.begin()) != paragraphs.end())
+ if (!autoBreakRows && paragraphs.size() > 1)
collapseParagraphs(bv);
+
if (inset == this)
return true;
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
+
if (inset->owner() != this) {
int ustat = CURSOR_PAR;
bool found = false;
return false;
found = tl_inset->updateInsetInInset(bv, inset);
ustat = FULL;
+ } else {
+ text_.updateInset(tl_inset);
+ setUpdateStatus(ustat);
}
- if (found)
- lt->updateInset(tl_inset);
- if (clear)
- lt = 0;
- if (found)
- setUpdateStatus(bv, ustat);
return found;
}
- bool found = lt->updateInset(inset);
- if (clear)
- lt = 0;
+ bool found = text_.updateInset(inset);
if (found) {
- setUpdateStatus(bv, CURSOR_PAR);
+ setUpdateStatus(CURSOR_PAR);
if (the_locking_inset &&
- cpar(bv) == inset_par && cpos(bv) == inset_pos)
+ cpar() == inset_par && cpos() == inset_pos)
{
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
}
}
return found;
int tmp_x = cmd.x - drawTextXOffset;
int tmp_y = cmd.y + dim_.asc - getLyXText(bv)->top_y();
- Inset * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
if (the_locking_inset) {
if (the_locking_inset == inset) {
localDispatch(FuncRequest(bv, LFUN_COPY));
paste_internally = true;
}
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- int old_top_y = lt->top_y();
+ int old_top_y = text_.top_y();
- lt->setCursorFromCoordinates(cmd.x - drawTextXOffset,
+ text_.setCursorFromCoordinates(cmd.x - drawTextXOffset,
cmd.y + dim_.asc);
// set the selection cursor!
- lt->selection.cursor = lt->cursor;
- lt->cursor.x_fix(lt->cursor.x());
+ text_.selection.cursor = text_.cursor;
+ text_.cursor.x_fix(text_.cursor.x());
- if (lt->selection.set()) {
- lt->clearSelection();
+ if (text_.selection.set()) {
+ text_.clearSelection();
updateLocal(bv, FULL, false);
} else {
- lt->clearSelection();
+ text_.clearSelection();
updateLocal(bv, CURSOR, false);
}
- if (clear)
- lt = 0;
-
- bv->owner()->setLayout(cpar(bv)->layout()->name());
+ bv->owner()->setLayout(cpar()->layout()->name());
// we moved the view we cannot do mouse selection in this case!
if (getLyXText(bv)->top_y() != old_top_y)
no_selection = true;
- old_par = cpar(bv);
+ old_par = cpar();
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
// insert this
int tmp_x = cmd.x - drawTextXOffset;
int tmp_y = cmd.y + dim_.asc - getLyXText(bv)->top_y();
- Inset * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
bool ret = false;
if (inset) {
// This code should probably be removed now. Simple insets
ret = inset->localDispatch(cmd1);
else {
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
cmd1.x = cmd.x - inset_x;
cmd1.y = cmd.x - inset_y;
inset->edit(bv, cmd1.x, cmd1.y, cmd.button());
return;
BufferView * bv = cmd.view();
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- LyXCursor cur = lt->cursor;
- lt->setCursorFromCoordinates
+ LyXCursor cur = text_.cursor;
+ text_.setCursorFromCoordinates
(cmd.x - drawTextXOffset, cmd.y + dim_.asc);
- lt->cursor.x_fix(lt->cursor.x());
- if (cur == lt->cursor) {
- if (clear)
- lt = 0;
+ text_.cursor.x_fix(text_.cursor.x());
+ if (cur == text_.cursor)
return;
- }
- lt->setSelection();
- bool flag = (lt->toggle_cursor.par() != lt->toggle_end_cursor.par() ||
- lt->toggle_cursor.pos() != lt->toggle_end_cursor.pos());
- if (clear)
- lt = 0;
+ text_.setSelection();
+ bool flag = (text_.toggle_cursor.par() != text_.toggle_end_cursor.par() ||
+ text_.toggle_cursor.pos() != text_.toggle_end_cursor.pos());
if (flag) {
updateLocal(bv, SELECTION, false);
}
}
-Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
+InsetOld::RESULT InsetText::localDispatch(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
+ setViewCache(bv);
- if (cmd.action == LFUN_INSET_EDIT) {
+ switch (cmd.action) {
+ case LFUN_INSET_EDIT: {
UpdatableInset::localDispatch(cmd);
if (!bv->lockInset(this)) {
locked = true;
the_locking_inset = 0;
- inset_pos = inset_x = inset_y = 0;
+ inset_pos = 0;
+ inset_x = 0;
+ inset_y = 0;
inset_boundary = false;
inset_par = paragraphs.end();
old_par = paragraphs.end();
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
if (cmd.argument.size()) {
if (cmd.argument == "left")
- lt->setCursor(paragraphs.begin(), 0);
+ text_.setCursorIntern(paragraphs.begin(), 0);
else {
- ParagraphList::iterator it = paragraphs.begin();
- ParagraphList::iterator end = paragraphs.end();
- while (boost::next(it) != end)
- ++it;
- // int const pos = (p->size() ? p->size()-1 : p->size());
- lt->setCursor(it, it->size());
+ ParagraphList::iterator it = boost::prior(paragraphs.end());
+ text_.setCursor(it, it->size());
}
} else {
int tmp_y = (cmd.y < 0) ? 0 : cmd.y;
// cycle hopefully (Jug 20020509)
// FIXME: GUII I've changed this to none: probably WRONG
if (!checkAndActivateInset(bv, cmd.x, tmp_y, mouse_button::none)) {
- lt->setCursorFromCoordinates(cmd.x - drawTextXOffset,
+ text_.setCursorFromCoordinates(cmd.x - drawTextXOffset,
cmd.y + dim_.asc);
- lt->cursor.x_fix(lt->cursor.x());
+ text_.cursor.x_fix(text_.cursor.x());
}
}
- lt->clearSelection();
+ text_.clearSelection();
finishUndo();
// If the inset is empty set the language of the current font to the
// language to the surronding text (if different).
if (paragraphs.begin()->empty() &&
- boost::next(paragraphs.begin()) == paragraphs.end()&&
- bv->getParentLanguage(this) != lt->current_font.language())
+ paragraphs.size() == 1 &&
+ bv->getParentLanguage(this) != text_.current_font.language())
{
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
setFont(bv, font, false);
}
- if (clear)
- lt = 0;
int code = CURSOR;
if (drawFrame_ == LOCKED)
code = CURSOR | DRAW_FRAME;
return DISPATCHED;
}
+ case LFUN_MOUSE_PRESS:
+ lfunMousePress(cmd);
+ return DISPATCHED;
- switch (cmd.action) {
- case LFUN_MOUSE_PRESS:
- lfunMousePress(cmd);
- return DISPATCHED;
- case LFUN_MOUSE_MOTION:
- lfunMouseMotion(cmd);
- return DISPATCHED;
- case LFUN_MOUSE_RELEASE:
- return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
- default:
- break;
+ case LFUN_MOUSE_MOTION:
+ lfunMouseMotion(cmd);
+ return DISPATCHED;
+
+ case LFUN_MOUSE_RELEASE:
+ return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
+
+ default:
+ break;
}
bool was_empty = (paragraphs.begin()->empty() &&
- boost::next(paragraphs.begin()) == paragraphs.end());
+ paragraphs.size() == 1);
+
no_selection = false;
RESULT result = UpdatableInset::localDispatch(cmd);
if (result != UNDISPATCHED)
return result;
}
}
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
int updwhat = 0;
int updflag = false;
// what type of update to do on a cursor movement
int cursor_update = CURSOR;
- if (lt->selection.set())
+ if (text_.selection.set())
cursor_update = SELECTION;
switch (cmd.action) {
* true (on). */
#if 0
// This should not be needed here and is also WRONG!
- setUndo(bv, Undo::INSERT, lt->cursor.par());
+ recordUndo(bv, Undo::INSERT, text_.cursor.par());
#endif
bv->switchKeyMap();
if (lyxrc.auto_region_delete) {
- if (lt->selection.set()) {
- lt->cutSelection(false, false);
+ if (text_.selection.set()) {
+ text_.cutSelection(false, false);
}
}
- lt->clearSelection();
+ text_.clearSelection();
for (string::size_type i = 0; i < cmd.argument.length(); ++i) {
bv->owner()->getIntl().getTransManager().
- TranslateAndInsert(cmd.argument[i], lt);
+ TranslateAndInsert(cmd.argument[i], &text_);
}
}
- lt->selection.cursor = lt->cursor;
+ text_.selection.cursor = text_.cursor;
updwhat = CURSOR | CURSOR_PAR;
updflag = true;
result = DISPATCHED_NOUPDATE;
break;
case LFUN_PRIOR:
- if (crow(bv) == lt->rows().begin())
+ if (crow() == text_.rows().begin())
result = FINISHED_UP;
else {
- lt->cursorPrevious();
- lt->clearSelection();
+ text_.cursorPrevious();
+ text_.clearSelection();
result = DISPATCHED_NOUPDATE;
}
updwhat = cursor_update;
break;
case LFUN_NEXT:
- if (boost::next(crow(bv)) == lt->rows().end())
+ if (boost::next(crow()) == text_.rows().end())
result = FINISHED_DOWN;
else {
- lt->cursorNext();
- lt->clearSelection();
+ text_.cursorNext();
+ text_.clearSelection();
result = DISPATCHED_NOUPDATE;
}
updwhat = cursor_update;
break;
case LFUN_BACKSPACE: {
- if (lt->selection.set())
- lt->cutSelection(true, false);
+ if (text_.selection.set())
+ text_.cutSelection(true, false);
else
- lt->backspace();
+ text_.backspace();
updwhat = CURSOR_PAR;
updflag = true;
break;
}
case LFUN_DELETE: {
- if (lt->selection.set()) {
- lt->cutSelection(true, false);
+ if (text_.selection.set()) {
+ text_.cutSelection(true, false);
} else {
- lt->Delete();
+ text_.Delete();
}
updwhat = CURSOR_PAR;
updflag = true;
}
case LFUN_CUT: {
- lt->cutSelection(true, true);
+ text_.cutSelection(true, true);
updwhat = CURSOR_PAR;
updflag = true;
break;
case LFUN_COPY:
finishUndo();
- lt->copySelection();
+ text_.copySelection();
updwhat = CURSOR_PAR;
break;
if (clip.empty())
break;
if (cmd.argument == "paragraph") {
- lt->insertStringAsParagraphs(clip);
+ text_.insertStringAsParagraphs(clip);
} else {
- lt->insertStringAsLines(clip);
+ text_.insertStringAsLines(clip);
}
// bug 393
- lt->clearSelection();
+ text_.clearSelection();
updwhat = CURSOR_PAR;
updflag = true;
}
}
- lt->pasteSelection();
+ replaceSelection(bv->getLyXText());
+ size_t sel_index = 0;
+ string const & arg = cmd.argument;
+ if (isStrUnsignedInt(arg)) {
+ size_t const paste_arg = strToUnsignedInt(arg);
+#warning FIXME Check if the arg is in the domain of available selections.
+ sel_index = paste_arg;
+ }
+ text_.pasteSelection(sel_index);
// bug 393
- lt->clearSelection();
+ text_.clearSelection();
updwhat = CURSOR_PAR;
updflag = true;
break;
result = DISPATCHED;
break;
}
- lt->breakParagraph(paragraphs, 0);
+ replaceSelection(bv->getLyXText());
+ text_.breakParagraph(paragraphs, 0);
updwhat = CURSOR | FULL;
updflag = true;
break;
result = DISPATCHED;
break;
}
- lt->breakParagraph(paragraphs, 1);
+ replaceSelection(bv->getLyXText());
+ text_.breakParagraph(paragraphs, 1);
updwhat = CURSOR | FULL;
updflag = true;
break;
break;
}
- lt->insertInset(new InsetNewline);
+ replaceSelection(bv->getLyXText());
+ text_.insertInset(new InsetNewline);
updwhat = CURSOR | CURSOR_PAR;
updflag = true;
break;
case LFUN_LAYOUT:
// do not set layouts on non breakable textinsets
if (autoBreakRows) {
- string cur_layout = cpar(bv)->layout()->name();
+ string cur_layout = cpar()->layout()->name();
// Derive layout number from given argument (string)
// and current buffer's textclass (number). */
if (cur_layout != layout) {
cur_layout = layout;
- lt->setLayout(layout);
- bv->owner()->setLayout(cpar(bv)->layout()->name());
+ text_.setLayout(layout);
+ bv->owner()->setLayout(cpar()->layout()->name());
updwhat = CURSOR_PAR;
updflag = true;
}
} else {
// reset the layout box
- bv->owner()->setLayout(cpar(bv)->layout()->name());
+ bv->owner()->setLayout(cpar()->layout()->name());
}
break;
case LFUN_PARAGRAPH_SPACING:
// inherit bufferparams/paragraphparams in a strange way. (Lgb)
// FIXME: how old is this comment ? ...
{
- ParagraphList::iterator pit = lt->cursor.par();
+ ParagraphList::iterator pit = text_.cursor.par();
Spacing::Space cur_spacing = pit->params().spacing().getSpace();
float cur_value = 1.0;
if (cur_spacing == Spacing::Other) {
break;
}
- if (clear)
- lt = 0;
if (updwhat > 0)
updateLocal(bv, updwhat, updflag);
/// If the action has deleted all text in the inset, we need to change the
// language to the language of the surronding text.
if (!was_empty && paragraphs.begin()->empty() &&
- boost::next(paragraphs.begin()) == paragraphs.end()) {
+ paragraphs.size() == 1) {
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
setFont(bv, font, false);
}
+int InsetText::linuxdoc(Buffer const * buf, ostream & os) const
+{
+ ParagraphList::iterator pit = const_cast<ParagraphList&>(paragraphs).begin();
+ ParagraphList::iterator pend = const_cast<ParagraphList&>(paragraphs).end();
+
+ // There is a confusion between the empty paragraph and the default paragraph
+ // The default paragraph is <p></p>, the empty paragraph is *empty*
+ // Since none of the floats of linuxdoc accepts standard paragraphs
+ // I disable them. I don't expect problems. (jamatos 2003/07/27)
+ for (; pit != pend; ++pit) {
+ const string name = pit->layout()->latexname();
+ if (name != "p")
+ sgml::openTag(os, 1, 0, name);
+ buf->simpleLinuxDocOnePar(os, pit, 0);
+ if (name != "p")
+ sgml::closeTag(os, 1, 0, name);
+ }
+ return 0;
+}
+
+
int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
{
unsigned int lines = 0;
break;
case LATEX_COMMAND:
- buf->sgmlError(pit, 0, _("Error: LatexType Command not allowed here.\n"));
+ buf->error(ErrorItem(_("Error"), _("LatexType Command not allowed here.\n"), pit->id(), 0, pit->size()));
return -1;
break;
return;
}
x = cx(&bv);
- y = cy(&bv) + InsetText::y();
+ y = cy() + InsetText::y();
}
return;
}
x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
- y = cy(bv) - TEXT_TO_INSET_OFFSET;
+ y = cy() - TEXT_TO_INSET_OFFSET;
}
if (!the_locking_inset)
return 0;
- return (inset_y + the_locking_inset->insetInInsetY());
+ return inset_y + the_locking_inset->insetInInsetY();
}
the_locking_inset->fitInsetCursor(bv);
return;
}
- LyXFont const font =
- getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
+ LyXFont const font = text_.getFont(bv->buffer(), cpar(), cpos());
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
- if (bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc))
+ if (bv->fitLockedInsetCursor(cx(bv), cy(), asc, desc))
need_update |= FULL;
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
{
- if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+ if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
return moveLeftIntern(bv, false, activate_inset, selecting);
else
return moveRightIntern(bv, true, activate_inset, selecting);
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
{
- if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+ if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
return moveRightIntern(bv, true, activate_inset, selecting);
else
return moveLeftIntern(bv, false, activate_inset, selecting);
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveRightIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
- LyXText * text = getLyXText(bv);
-
- ParagraphList::iterator c_par = cpar(bv);
+ ParagraphList::iterator c_par = cpar();
- if (boost::next(c_par) == paragraphs.end() &&
- (cpos(bv) >= c_par->size()))
+ if (boost::next(c_par) == paragraphs.end() && cpos() >= c_par->size())
return FINISHED_RIGHT;
if (activate_inset && checkAndActivateInset(bv, front))
return DISPATCHED;
- text->cursorRight(bv);
+ text_.cursorRight(bv);
if (!selecting)
- text->clearSelection();
+ text_.clearSelection();
return DISPATCHED_NOUPDATE;
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveLeftIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
- LyXText * text = getLyXText(bv);
-
- if (cpar(bv) == paragraphs.begin() && (cpos(bv) <= 0))
+ if (cpar() == paragraphs.begin() && cpos() <= 0)
return FINISHED;
- text->cursorLeft(bv);
+ text_.cursorLeft(bv);
if (!selecting)
- text->clearSelection();
+ text_.clearSelection();
if (activate_inset && checkAndActivateInset(bv, front))
return DISPATCHED;
return DISPATCHED_NOUPDATE;
}
-Inset::RESULT InsetText::moveUp(BufferView * bv)
+InsetOld::RESULT InsetText::moveUp(BufferView * bv)
{
- if (crow(bv) == getLyXText(bv)->rows().begin())
+ if (crow() == text_.rows().begin())
return FINISHED_UP;
- getLyXText(bv)->cursorUp(bv);
- getLyXText(bv)->clearSelection();
+ text_.cursorUp(bv);
+ text_.clearSelection();
return DISPATCHED_NOUPDATE;
}
-Inset::RESULT InsetText::moveDown(BufferView * bv)
+InsetOld::RESULT InsetText::moveDown(BufferView * bv)
{
- if (boost::next(crow(bv)) == getLyXText(bv)->rows().end())
+ if (boost::next(crow()) == text_.rows().end())
return FINISHED_DOWN;
- getLyXText(bv)->cursorDown(bv);
- getLyXText(bv)->clearSelection();
+ text_.cursorDown(bv);
+ text_.clearSelection();
return DISPATCHED_NOUPDATE;
}
-bool InsetText::insertInset(BufferView * bv, Inset * inset)
+bool InsetText::insertInset(BufferView * bv, InsetOld * inset)
{
if (the_locking_inset) {
if (the_locking_inset->insetAllowed(inset))
return false;
}
inset->setOwner(this);
- getLyXText(bv)->insertInset(inset);
+ text_.insertInset(inset);
bv->fitCursor();
updateLocal(bv, CURSOR_PAR|CURSOR, true);
return true;
}
-bool InsetText::insetAllowed(Inset::Code code) const
+bool InsetText::insetAllowed(InsetOld::Code code) const
{
// in_insetAllowed is a really gross hack,
// to allow us to call the owner's insetAllowed
}
-UpdatableInset * InsetText::getFirstLockingInsetOfType(Inset::Code c)
+UpdatableInset * InsetText::getFirstLockingInsetOfType(InsetOld::Code c)
{
if (c == lyxCode())
return this;
the_locking_inset->setFont(bv, font, toggleall, selectall);
return;
}
- if ((boost::next(paragraphs.begin()) == paragraphs.end() &&
- paragraphs.begin()->empty()) || cpar(bv)->empty()) {
- getLyXText(bv)->setFont(font, toggleall);
+
+ if ((paragraphs.size() == 1 && paragraphs.begin()->empty())
+ || cpar()->empty()) {
+ text_.setFont(font, toggleall);
return;
}
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- if (lt->selection.set()) {
- setUndo(bv, Undo::EDIT, lt->cursor.par());
+
+
+ if (text_.selection.set())
+ recordUndo(bv, Undo::ATOMIC, text_.cursor.par());
+
+ if (selectall) {
+ text_.cursorTop();
+ text_.selection.cursor = text_.cursor;
+ text_.cursorBottom();
+ text_.setSelection();
}
+
+ text_.toggleFree(font, toggleall);
+
if (selectall)
- selectAll(bv);
- lt->toggleFree(font, toggleall);
- if (selectall)
- lt->clearSelection();
+ text_.clearSelection();
+
bv->fitCursor();
- bool flag = (selectall || lt->selection.set());
- if (clear)
- lt = 0;
+
+ bool flag = (selectall || text_.selection.set());
+
if (flag)
updateLocal(bv, FULL, true);
else
bool InsetText::checkAndActivateInset(BufferView * bv, bool front)
{
- if (cpar(bv)->isInset(cpos(bv))) {
- Inset * inset =
- static_cast<UpdatableInset*>(cpar(bv)->getInset(cpos(bv)));
- if (!isHighlyEditableInset(inset))
- return false;
- FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
- inset->localDispatch(cmd);
- if (!the_locking_inset)
- return false;
- updateLocal(bv, CURSOR, false);
- return true;
- }
- return false;
+ InsetOld * inset = cpar()->getInset(cpos());
+ if (!isHighlyEditableInset(inset))
+ return false;
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
+ inset->localDispatch(cmd);
+ if (!the_locking_inset)
+ return false;
+ updateLocal(bv, CURSOR, false);
+ return true;
}
x -= drawTextXOffset;
int dummyx = x;
int dummyy = y + dim_.asc;
- Inset * inset = getLyXText(bv)->checkInsetHit(dummyx, dummyy);
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(dummyx, dummyy);
// we only do the edit() call if the inset was hit by the mouse
// or if it is a highly editable inset. So we should call this
// function from our own edit with button < 0.
if (button == mouse_button::none && !isHighlyEditableInset(inset))
return false;
- if (inset) {
- if (x < 0)
- x = dim_.wid;
- if (y < 0)
- y = dim_.des;
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
- FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
- inset->localDispatch(cmd);
- if (!the_locking_inset)
- return false;
- updateLocal(bv, CURSOR, false);
- return true;
- }
- return false;
-}
-
-
-int InsetText::getMaxWidth(BufferView * bv, UpdatableInset const * inset) const
-{
-#if 0
- int w = UpdatableInset::getMaxWidth(bv, inset);
- if (w < 0) {
- return -1;
- }
- if (owner()) {
- w = w - top_x + owner()->x();
- return w;
- }
- w -= (2 * TEXT_TO_INSET_OFFSET);
- return w - top_x;
-#else
- return UpdatableInset::getMaxWidth(bv, inset);
-#endif
+ if (!inset)
+ return false;
+ if (x < 0)
+ x = dim_.wid;
+ if (y < 0)
+ y = dim_.des;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy() + drawTextYOffset;
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
+ inset->localDispatch(cmd);
+ if (!the_locking_inset)
+ return false;
+ updateLocal(bv, CURSOR, false);
+ return true;
}
ParagraphList::const_iterator end = plist.end();
for (; it != end; ++it) {
paragraphs.push_back(*it);
- Paragraph & tmp = paragraphs.back();
- tmp.setInsetOwner(this);
+ paragraphs.back().setInsetOwner(this);
}
reinitLyXText();
int InsetText::cx(BufferView * bv) const
{
- // we do nothing dangerous so we use a local cache
- LyXText * llt = getLyXText(bv);
- int x = llt->cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
+ int x = text_.cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = llt->getFont(bv->buffer(), llt->cursor.par(),
- llt->cursor.pos());
+ LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
+ text_.cursor.pos());
if (font.isVisibleRightToLeft())
- x -= the_locking_inset->width(bv, font);
+ x -= the_locking_inset->width();
}
return x;
}
int InsetText::cix(BufferView * bv) const
{
- // we do nothing dangerous so we use a local cache
- LyXText * llt = getLyXText(bv);
- int x = llt->cursor.ix() + top_x + TEXT_TO_INSET_OFFSET;
+ int x = text_.cursor.ix() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = llt->getFont(bv->buffer(), llt->cursor.par(),
- llt->cursor.pos());
+ LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
+ text_.cursor.pos());
if (font.isVisibleRightToLeft())
- x -= the_locking_inset->width(bv, font);
+ x -= the_locking_inset->width();
}
return x;
}
-int InsetText::cy(BufferView * bv) const
+int InsetText::cy() const
{
- LyXFont font;
- return getLyXText(bv)->cursor.y() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
+ return text_.cursor.y() - dim_.asc + TEXT_TO_INSET_OFFSET;
}
-int InsetText::ciy(BufferView * bv) const
+int InsetText::ciy() const
{
- LyXFont font;
- return getLyXText(bv)->cursor.iy() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
+ return text_.cursor.iy() - dim_.asc + TEXT_TO_INSET_OFFSET;
}
-pos_type InsetText::cpos(BufferView * bv) const
+pos_type InsetText::cpos() const
{
- return getLyXText(bv)->cursor.pos();
+ return text_.cursor.pos();
}
-ParagraphList::iterator InsetText::cpar(BufferView * bv) const
+ParagraphList::iterator InsetText::cpar() const
{
- return getLyXText(bv)->cursor.par();
+ return text_.cursor.par();
}
-bool InsetText::cboundary(BufferView * bv) const
+bool InsetText::cboundary() const
{
- return getLyXText(bv)->cursor.boundary();
+ return text_.cursor.boundary();
}
-RowList::iterator InsetText::crow(BufferView * bv) const
+RowList::iterator InsetText::crow() const
{
- return getLyXText(bv)->cursor.row();
+ return text_.cursorRow();
}
-LyXText * InsetText::getLyXText(BufferView const * lbv,
+LyXText * InsetText::getLyXText(BufferView const * bv,
bool const recursive) const
{
- if (cached_bview == lbv) {
- if (recursive && the_locking_inset)
- return the_locking_inset->getLyXText(lbv, true);
- LyXText * lt = cached_text.get();
- lyx::Assert(lt && lt->rows().begin()->par() == const_cast<ParagraphList&>(paragraphs).begin());
- return lt;
- }
- // Super UGLY! (Lgb)
- BufferView * bv = const_cast<BufferView *>(lbv);
-
- cached_bview = bv;
- Cache::iterator it = cache.find(bv);
-
- if (it != cache.end()) {
- if (do_reinit) {
- reinitLyXText();
- } else if (do_resize) {
- resizeLyXText(do_resize);
- } else {
- if (lt || !it->second.remove) {
- lyx::Assert(it->second.text.get());
- cached_text = it->second.text;
- if (recursive && the_locking_inset) {
- return the_locking_inset->getLyXText(bv, true);
- }
- return cached_text.get();
- } else if (it->second.remove) {
- if (locked) {
- saveLyXTextState(it->second.text.get());
- } else {
- sstate.lpar = const_cast<ParagraphList&>(paragraphs).end();
- }
- }
- //
- // when we have to reinit the existing LyXText!
- //
- it->second.text->init(bv);
- restoreLyXTextState(it->second.text.get());
- it->second.remove = false;
- }
- cached_text = it->second.text;
- if (the_locking_inset && recursive) {
- return the_locking_inset->getLyXText(bv);
- }
- return cached_text.get();
- }
- ///
- // we are here only if we don't have a BufferView * in the cache!!!
- ///
- cached_text.reset(new LyXText(bv, const_cast<InsetText *>(this)));
- cached_text->init(bv);
- restoreLyXTextState(cached_text.get());
+ setViewCache(bv);
+ if (recursive && the_locking_inset)
+ return the_locking_inset->getLyXText(bv, true);
+ return &text_;
+}
- cache.insert(make_pair(bv, cached_text));
- if (the_locking_inset && recursive) {
- return the_locking_inset->getLyXText(bv);
- }
- return cached_text.get();
+void InsetText::setViewCache(BufferView const * bv) const
+{
+ if (bv)
+ text_.bv_owner = const_cast<BufferView *>(bv);
}
void InsetText::deleteLyXText(BufferView * bv, bool recursive) const
{
- cached_bview = 0;
-
- Cache::iterator it = cache.find(bv);
-
- if (it == cache.end()) {
- return;
- }
-
- lyx::Assert(it->second.text.get());
-
- it->second.remove = true;
if (recursive) {
/// then remove all LyXText in text-insets
for_each(const_cast<ParagraphList&>(paragraphs).begin(),
}
-void InsetText::resizeLyXText(BufferView * bv, bool force) const
+void InsetText::resizeLyXText(BufferView * bv, bool /*force*/) const
{
- if (lt) {
- // we cannot resize this because we are in use!
- // so do this on the next possible getLyXText()
- do_resize = bv;
- return;
- }
- do_resize = 0;
- if (boost::next(paragraphs.begin()) == paragraphs.end() &&
- paragraphs.begin()->empty()) { // no data, resize not neccessary!
+ if (paragraphs.size() == 1 && paragraphs.begin()->empty()) {
+ // no data, resize not neccessary!
// we have to do this as a fixed width may have changed!
- LyXText * t = getLyXText(bv);
- saveLyXTextState(t);
- t->init(bv, true);
- restoreLyXTextState(t);
+ saveLyXTextState();
+ text_.init(bv);
+ restoreLyXTextState();
return;
}
- // one endless line, resize normally not necessary
- if (!force && getMaxWidth(bv, this) < 0)
- return;
- Cache::iterator it = cache.find(bv);
- if (it == cache.end()) {
+ if (!bv)
return;
- }
- lyx::Assert(it->second.text.get());
- LyXText * t = it->second.text.get();
- saveLyXTextState(t);
+ Assert(bv);
+ setViewCache(bv);
+
+ saveLyXTextState();
for_each(const_cast<ParagraphList&>(paragraphs).begin(),
const_cast<ParagraphList&>(paragraphs).end(),
boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
- t->init(bv, true);
- restoreLyXTextState(t);
+ text_.init(bv);
+ restoreLyXTextState();
+
+ // seems to be unneeded
+#if 1
if (the_locking_inset) {
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
}
- t->top_y(bv->screen().topCursorVisible(t->cursor, t->top_y()));
+ text_.top_y(bv->screen().topCursorVisible(&text_));
if (!owner()) {
const_cast<InsetText*>(this)->updateLocal(bv, FULL, false);
// this will scroll the screen such that the cursor becomes visible
} else {
need_update |= FULL;
}
+#endif
}
void InsetText::reinitLyXText() const
{
- if (lt) {
- // we cannot resize this because we are in use!
- // so do this on the next possible getLyXText()
- do_reinit = true;
- return;
- }
- do_reinit = false;
- do_resize = 0;
- for (Cache::iterator it = cache.begin(); it != cache.end(); ++it) {
- lyx::Assert(it->second.text.get());
+ BufferView * bv = text_.bv_owner;
- LyXText * t = it->second.text.get();
- BufferView * bv = it->first;
+ if (!bv)
+ return;
- saveLyXTextState(t);
+ saveLyXTextState();
-
for_each(const_cast<ParagraphList&>(paragraphs).begin(),
-
const_cast<ParagraphList&>(paragraphs).end(),
- boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
+ for_each(const_cast<ParagraphList&>(paragraphs).begin(),
+ const_cast<ParagraphList&>(paragraphs).end(),
+ boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
- t->init(bv, true);
- restoreLyXTextState(t);
- if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
- }
- t->top_y(bv->screen().topCursorVisible(t->cursor, t->top_y()));
- if (!owner()) {
- const_cast<InsetText*>(this)->updateLocal(bv, FULL, false);
- // this will scroll the screen such that the cursor becomes visible
- bv->updateScrollbar();
- } else {
- need_update = FULL;
- }
+ text_.init(bv);
+ restoreLyXTextState();
+ if (the_locking_inset) {
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy() + drawTextYOffset;
+ }
+ text_.top_y(bv->screen().topCursorVisible(&text_));
+ if (!owner()) {
+ // this will scroll the screen such that the cursor becomes visible
+ bv->updateScrollbar();
+ } else {
+ need_update = FULL;
}
}
}
-void InsetText::selectAll(BufferView * bv)
-{
- getLyXText(bv)->cursorTop();
- getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
- getLyXText(bv)->cursorBottom();
- getLyXText(bv)->setSelection();
-}
-
-
void InsetText::clearSelection(BufferView * bv)
{
getLyXText(bv)->clearSelection();
}
-Inset * InsetText::getInsetFromID(int id_arg) const
+InsetOld * InsetText::getInsetFromID(int id_arg) const
{
if (id_arg == id())
return const_cast<InsetText *>(this);
for (; it != end; ++it) {
if (it->inset->id() == id_arg)
return it->inset;
- Inset * in = it->inset->getInsetFromID(id_arg);
+ InsetOld * in = it->inset->getInsetFromID(id_arg);
if (in)
return in;
}
WordLangTuple const
-InsetText::selectNextWordToSpellcheck(BufferView * bv,
- float & value) const
+InsetText::selectNextWordToSpellcheck(BufferView * bv, float & value) const
{
- bool clear = false;
WordLangTuple word;
-
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
if (the_locking_inset) {
word = the_locking_inset->selectNextWordToSpellcheck(bv, value);
if (!word.word().empty()) {
- value += cy(bv);
- if (clear)
- lt = 0;
+ value += cy();
return word;
}
// we have to go on checking so move cursor to the next char
- lt->cursor.pos(lt->cursor.pos() + 1);
+ text_.cursor.pos(text_.cursor.pos() + 1);
}
- word = lt->selectNextWordToSpellcheck(value);
+ word = text_.selectNextWordToSpellcheck(value);
if (word.word().empty())
bv->unlockInset(const_cast<InsetText *>(this));
else
- value = cy(bv);
- if (clear)
- lt = 0;
+ value = cy();
return word;
}
if (the_locking_inset) {
the_locking_inset->toggleSelection(bv, kill_selection);
}
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
int x = top_x + TEXT_TO_INSET_OFFSET;
- RowList::iterator rowit = lt->rows().begin();
- RowList::iterator end = lt->rows().end();
+ RowList::iterator rowit = text_.rows().begin();
+ RowList::iterator end = text_.rows().end();
int y_offset = top_baseline - rowit->ascent_of_text();
int y = y_offset;
while ((rowit != end) && ((y + rowit->height()) <= 0)) {
if (need_update & SELECTION)
need_update = NONE;
- bv->screen().toggleSelection(lt, bv, kill_selection, y_offset, x);
- if (clear)
- lt = 0;
+ bv->screen().toggleSelection(&text_, bv, kill_selection, y_offset, x);
}
bool InsetText::nextChange(BufferView * bv, lyx::pos_type & length)
{
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
if (the_locking_inset) {
if (the_locking_inset->nextChange(bv, length))
return true;
- lt->cursorRight(true);
+ text_.cursorRight(true);
}
- lyxfind::SearchResult result =
- lyxfind::findNextChange(bv, lt, length);
+ lyx::find::SearchResult result =
+ lyx::find::findNextChange(bv, &text_, length);
- if (result == lyxfind::SR_FOUND) {
- LyXCursor cur = lt->cursor;
+ if (result == lyx::find::SR_FOUND) {
+ LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
locked = true;
- lt->cursor = cur;
- lt->setSelectionRange(length);
+ text_.cursor = cur;
+ text_.setSelectionRange(length);
updateLocal(bv, SELECTION, false);
}
- if (clear)
- lt = 0;
- return result != lyxfind::SR_NOT_FOUND;
+ return result != lyx::find::SR_NOT_FOUND;
}
bool InsetText::searchForward(BufferView * bv, string const & str,
bool cs, bool mw)
{
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
if (the_locking_inset) {
if (the_locking_inset->searchForward(bv, str, cs, mw))
return true;
- lt->cursorRight(true);
+ text_.cursorRight(true);
}
- lyxfind::SearchResult result =
- lyxfind::LyXFind(bv, lt, str, true, cs, mw);
+ lyx::find::SearchResult result =
+ lyx::find::find(bv, &text_, str, true, cs, mw);
- if (result == lyxfind::SR_FOUND) {
- LyXCursor cur = lt->cursor;
+ if (result == lyx::find::SR_FOUND) {
+ LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
locked = true;
- lt->cursor = cur;
- lt->setSelectionRange(str.length());
+ text_.cursor = cur;
+ text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- if (clear)
- lt = 0;
- return (result != lyxfind::SR_NOT_FOUND);
+ return (result != lyx::find::SR_NOT_FOUND);
}
bool InsetText::searchBackward(BufferView * bv, string const & str,
if (the_locking_inset->searchBackward(bv, str, cs, mw))
return true;
}
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
if (!locked) {
ParagraphList::iterator pit = paragraphs.begin();
ParagraphList::iterator pend = paragraphs.end();
while (boost::next(pit) != pend)
++pit;
- lt->setCursor(pit, pit->size());
+ text_.setCursor(pit, pit->size());
}
- lyxfind::SearchResult result =
- lyxfind::LyXFind(bv, lt, str, false, cs, mw);
+ lyx::find::SearchResult result =
+ lyx::find::find(bv, &text_, str, false, cs, mw);
- if (result == lyxfind::SR_FOUND) {
- LyXCursor cur = lt->cursor;
+ if (result == lyx::find::SR_FOUND) {
+ LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
locked = true;
- lt->cursor = cur;
- lt->setSelectionRange(str.length());
+ text_.cursor = cur;
+ text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- if (clear)
- lt = 0;
- return (result != lyxfind::SR_NOT_FOUND);
+ return (result != lyx::find::SR_NOT_FOUND);
}
void InsetText::collapseParagraphs(BufferView * bv)
{
- LyXText * llt = getLyXText(bv);
+ while (paragraphs.size() > 1) {
+ ParagraphList::iterator first_par = paragraphs.begin();
+ ParagraphList::iterator next_par = boost::next(first_par);
+ size_t const first_par_size = first_par->size();
- while (boost::next(paragraphs.begin()) != paragraphs.end()) {
- if (!paragraphs.begin()->empty() &&
- !boost::next(paragraphs.begin())->empty() &&
- !paragraphs.begin()->isSeparator(paragraphs.begin()->size() - 1))
- {
- paragraphs.begin()->insertChar(paragraphs.begin()->size(), ' ');
+ if (!first_par->empty() &&
+ !next_par->empty() &&
+ !first_par->isSeparator(first_par_size - 1)) {
+ first_par->insertChar(first_par_size, ' ');
}
- if (llt->selection.set()) {
- if (llt->selection.start.par() == boost::next(paragraphs.begin())) {
- llt->selection.start.par(paragraphs.begin());
- llt->selection.start.pos(
- llt->selection.start.pos() + paragraphs.begin()->size());
+
+ if (text_.selection.set()) {
+ if (text_.selection.start.par() == next_par) {
+ text_.selection.start.par(first_par);
+ text_.selection.start.pos(
+ text_.selection.start.pos() + first_par_size);
}
- if (llt->selection.end.par() == boost::next(paragraphs.begin())) {
- llt->selection.end.par(paragraphs.begin());
- llt->selection.end.pos(
- llt->selection.end.pos() + paragraphs.begin()->size());
+ if (text_.selection.end.par() == next_par) {
+ text_.selection.end.par(first_par);
+ text_.selection.end.pos(
+ text_.selection.end.pos() + first_par_size);
}
}
- mergeParagraph(bv->buffer()->params, paragraphs, paragraphs.begin());
+
+ mergeParagraph(bv->buffer()->params, paragraphs, first_par);
}
reinitLyXText();
}
}
-void InsetText::addPreview(grfx::PreviewLoader & loader) const
+void InsetText::addPreview(PreviewLoader & loader) const
{
ParagraphList::const_iterator pit = paragraphs.begin();
ParagraphList::const_iterator pend = paragraphs.end();
projects / lyx.git / blobdiff