#include "buffer.h"
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dimension.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;
-namespace grfx = lyx::graphics;
-
// 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 = *t; // slicing intended
+ 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.cursor.par() == const_cast<ParagraphList&>(paragraphs).end())
return;
- t->selection.set(true);
+ text_.selection.set(true);
// at this point just to avoid the DEPM when setting the cursor
- t->selection.mark(sstate.selection.mark());
+ text_.selection.mark(sstate.selection.mark());
if (sstate.selection.set()) {
- t->setCursor(sstate.selection.start.par(),
+ text_.setCursor(sstate.selection.start.par(),
sstate.selection.start.pos(),
true, sstate.selection.start.boundary());
- t->selection.cursor = t->cursor;
- t->setCursor(sstate.selection.end.par(), sstate.selection.end.pos(),
+ text_.selection.cursor = text_.cursor;
+ text_.setCursor(sstate.selection.end.par(), sstate.selection.end.pos(),
true, sstate.selection.end.boundary());
- t->setSelection();
- t->setCursor(sstate.cursor.par(), sstate.cursor.pos());
+ text_.setSelection();
+ text_.setCursor(sstate.cursor.par(), sstate.cursor.pos());
} else {
- t->setCursor(sstate.cursor.par(), sstate.cursor.pos(),
+ text_.setCursor(sstate.cursor.par(), sstate.cursor.pos(),
true, sstate.cursor.boundary());
- t->selection.cursor = t->cursor;
- t->selection.set(false);
+ text_.selection.cursor = text_.cursor;
+ text_.selection.set(false);
}
}
InsetText::InsetText(BufferParams const & bp)
- : UpdatableInset(), in_update(false), text_(0, this)
+ : UpdatableInset(), text_(0, this)
{
paragraphs.push_back(Paragraph());
paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout());
InsetText::InsetText(InsetText const & in)
- : UpdatableInset(in), in_update(false), text_(0, this)
+ : UpdatableInset(in), text_(0, this)
{
init(&in);
}
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 {
+ textwidth_ = 0; // unbounded
drawFrame_ = NEVER;
frame_color = LColor::insetframe;
autoBreakRows = false;
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;
}
-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;
}
x += TEXT_TO_INSET_OFFSET;
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;
bv->hideCursor();
- while ((rowit != end) && (yf < ph)) {
- RowPainter rp(*bv, text_, rowit);
- rp.paint(y + y_offset + first, int(x), y + text_.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;
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;
}
}
-void InsetText::update(BufferView * bv, bool reinit)
-{
- if (bv)
- text_.bv_owner = const_cast<BufferView *>(bv);
-
- 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 && paragraphs.size() > 1)
- collapseParagraphs(bv);
-
- if (the_locking_inset) {
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
- the_locking_inset->update(bv, reinit);
- }
-
- if ((need_update & CURSOR_PAR) && (text_.refreshStatus() == LyXText::REFRESH_NONE) &&
- the_locking_inset) {
- text_.updateInset(the_locking_inset);
- }
-
- if (text_.refreshStatus() == LyXText::REFRESH_AREA)
- need_update |= FULL;
-
- 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 *, int what) const
+void InsetText::setUpdateStatus(int what) const
{
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 ((text_.refreshStatus() == LyXText::REFRESH_AREA) ||
- (!autoBreakRows &&
- (text_.refreshStatus() == LyXText::REFRESH_ROW)))
- {
+ // we will to redraw us full if our LyXText wants it
+ if (text_.needRefresh())
need_update |= FULL;
- } else if (text_.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)) {
void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
{
+ if (!bv)
+ return;
+
if (!autoBreakRows && paragraphs.size() > 1)
collapseParagraphs(bv);
text_.partialRebreak();
- setUpdateStatus(bv, what);
+ setUpdateStatus(what);
bool flag = mark_dirty ||
- (((need_update != CURSOR) && (need_update != NONE)) ||
- (text_.refreshStatus() != LyXText::REFRESH_NONE) || text_.selection.set());
+ ((need_update != CURSOR && need_update != NONE) ||
+ text_.needRefresh() || text_.selection.set());
if (!text_.selection.set())
text_.selection.cursor = text_.cursor;
bv->fitCursor();
if (flag) {
- text_.postPaint(0);
+ text_.postPaint();
bv->updateInset(const_cast<InsetText *>(this));
}
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();
}
}
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();
- text_.setCursor(paragraphs.begin(), 0);
+ text_.setCursorIntern(paragraphs.begin(), 0);
text_.clearSelection();
finishUndo();
// If the inset is empty set the language of the current font to the
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 && paragraphs.size() > 1)
collapseParagraphs(bv);
return false;
found = tl_inset->updateInsetInInset(bv, inset);
ustat = FULL;
- }
- if (found)
+ } else {
text_.updateInset(tl_inset);
- if (found)
- setUpdateStatus(bv, ustat);
+ setUpdateStatus(ustat);
+ }
return found;
}
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) {
updateLocal(bv, CURSOR, false);
}
- 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());
}
-Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
+InsetOld::RESULT InsetText::localDispatch(FuncRequest const & cmd)
{
BufferView * bv = cmd.view();
- if (bv)
- text_.bv_owner = bv;
+ 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();
if (cmd.argument.size()) {
if (cmd.argument == "left")
- text_.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());
+ ParagraphList::iterator it = boost::prior(paragraphs.end());
text_.setCursor(it, it->size());
}
} else {
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() &&
* true (on). */
#if 0
// This should not be needed here and is also WRONG!
- setUndo(bv, Undo::INSERT, text_.cursor.par());
+ recordUndo(bv, Undo::INSERT, text_.cursor.par());
#endif
bv->switchKeyMap();
if (lyxrc.auto_region_delete) {
break;
case LFUN_PRIOR:
- if (crow(bv) == text_.rows().begin())
+ if (crow() == text_.rows().begin())
result = FINISHED_UP;
else {
text_.cursorPrevious();
break;
case LFUN_NEXT:
- if (boost::next(crow(bv)) == text_.rows().end())
+ if (boost::next(crow()) == text_.rows().end())
result = FINISHED_DOWN;
else {
text_.cursorNext();
}
}
+ replaceSelection(bv->getLyXText());
size_t sel_index = 0;
string const & arg = cmd.argument;
if (isStrUnsignedInt(arg)) {
result = DISPATCHED;
break;
}
+ replaceSelection(bv->getLyXText());
text_.breakParagraph(paragraphs, 0);
updwhat = CURSOR | FULL;
updflag = true;
result = DISPATCHED;
break;
}
+ replaceSelection(bv->getLyXText());
text_.breakParagraph(paragraphs, 1);
updwhat = CURSOR | FULL;
updflag = true;
break;
}
+ replaceSelection(bv->getLyXText());
text_.insertInset(new InsetNewline);
updwhat = CURSOR | CURSOR_PAR;
updflag = true;
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;
text_.setLayout(layout);
- bv->owner()->setLayout(cpar(bv)->layout()->name());
+ 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:
}
+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;
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;
}
if ((paragraphs.size() == 1 && paragraphs.begin()->empty())
- || cpar(bv)->empty()) {
- getLyXText(bv)->setFont(font, toggleall);
+ || cpar()->empty()) {
+ text_.setFont(font, toggleall);
return;
}
- if (text_.selection.set()) {
- setUndo(bv, Undo::EDIT, text_.cursor.par());
- }
+ if (text_.selection.set())
+ recordUndo(bv, Undo::ATOMIC, text_.cursor.par());
- if (selectall)
- selectAll(bv);
+ if (selectall) {
+ text_.cursorTop();
+ text_.selection.cursor = text_.cursor;
+ text_.cursorBottom();
+ text_.setSelection();
+ }
text_.toggleFree(font, toggleall);
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();
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;
}
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 text_.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 text_.cursor.iy() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
+ return text_.cursor.iy() - dim_.asc + TEXT_TO_INSET_OFFSET;
}
-pos_type InsetText::cpos(BufferView *) const
+pos_type InsetText::cpos() const
{
return text_.cursor.pos();
}
-ParagraphList::iterator InsetText::cpar(BufferView *) const
+ParagraphList::iterator InsetText::cpar() const
{
return text_.cursor.par();
}
-bool InsetText::cboundary(BufferView *) const
+bool InsetText::cboundary() const
{
return text_.cursor.boundary();
}
-RowList::iterator InsetText::crow(BufferView *) const
+RowList::iterator InsetText::crow() const
{
return text_.cursorRow();
}
}
-void InsetText::resizeLyXText(BufferView * bv, bool force) const
+void InsetText::resizeLyXText(BufferView * bv, bool /*force*/) const
{
if (paragraphs.size() == 1 && paragraphs.begin()->empty()) {
// no data, resize not neccessary!
// we have to do this as a fixed width may have changed!
- saveLyXTextState(&text_);
- text_.init(bv, true);
- restoreLyXTextState(&text_);
+ saveLyXTextState();
+ text_.init(bv);
+ restoreLyXTextState();
return;
}
return;
Assert(bv);
- text_.bv_owner = bv;
-
- // one endless line, resize normally not necessary
- if (!force && getMaxWidth(bv, this) < 0)
- return;
+ setViewCache(bv);
- LyXText * t = &text_;
- saveLyXTextState(t);
+ 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));
+ 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
{
- LyXText * t = &text_;
BufferView * bv = text_.bv_owner;
if (!bv)
return;
- saveLyXTextState(t);
+ 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();
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));
+ 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
bv->updateScrollbar();
} else {
}
-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
{
WordLangTuple word;
if (the_locking_inset) {
word = the_locking_inset->selectNextWordToSpellcheck(bv, value);
if (!word.word().empty()) {
- value += cy(bv);
+ value += cy();
return word;
}
// we have to go on checking so move cursor to the next char
if (word.word().empty())
bv->unlockInset(const_cast<InsetText *>(this));
else
- value = cy(bv);
+ value = cy();
return word;
}
return true;
text_.cursorRight(true);
}
- lyxfind::SearchResult result =
- lyxfind::findNextChange(bv, &text_, length);
+ lyx::find::SearchResult result =
+ lyx::find::findNextChange(bv, &text_, length);
- if (result == lyxfind::SR_FOUND) {
+ if (result == lyx::find::SR_FOUND) {
LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
text_.setSelectionRange(length);
updateLocal(bv, SELECTION, false);
}
- return result != lyxfind::SR_NOT_FOUND;
+ return result != lyx::find::SR_NOT_FOUND;
}
return true;
text_.cursorRight(true);
}
- lyxfind::SearchResult result =
- lyxfind::LyXFind(bv, &text_, str, true, cs, mw);
+ lyx::find::SearchResult result =
+ lyx::find::find(bv, &text_, str, true, cs, mw);
- if (result == lyxfind::SR_FOUND) {
+ if (result == lyx::find::SR_FOUND) {
LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- return (result != lyxfind::SR_NOT_FOUND);
+ return (result != lyx::find::SR_NOT_FOUND);
}
bool InsetText::searchBackward(BufferView * bv, string const & str,
text_.setCursor(pit, pit->size());
}
- lyxfind::SearchResult result =
- lyxfind::LyXFind(bv, &text_, str, false, cs, mw);
+ lyx::find::SearchResult result =
+ lyx::find::find(bv, &text_, str, false, cs, mw);
- if (result == lyxfind::SR_FOUND) {
+ if (result == lyx::find::SR_FOUND) {
LyXCursor cur = text_.cursor;
bv->unlockInset(bv->theLockingInset());
if (bv->lockInset(this))
text_.setSelectionRange(str.length());
updateLocal(bv, SELECTION, false);
}
- return (result != lyxfind::SR_NOT_FOUND);
+ return (result != lyx::find::SR_NOT_FOUND);
}
}
-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