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() const
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;
setViewCache(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;
+ 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;
}
if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
- inset_x = cix(bv) - int(x) + drawTextXOffset;
+ inset_x = cix(bv) - x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
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;
text_.clearPaint();
- if ((drawFrame_ == ALWAYS) || (drawFrame_ == LOCKED && locked)) {
+ if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
drawFrame(pain, int(start_x));
}
}
-void InsetText::update(BufferView * bv, bool reinit)
-{
- setViewCache(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() + drawTextYOffset;
- the_locking_inset->update(bv, reinit);
- }
-
- if ((need_update & CURSOR_PAR) && !text_.needRefresh() &&
- the_locking_inset) {
- text_.updateInset(the_locking_inset);
- }
-
- if (text_.needRefresh())
- 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(int what) const
{
need_update |= what;
void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
{
+ if (!bv)
+ return;
+
if (!autoBreakRows && paragraphs.size() > 1)
collapseParagraphs(bv);
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
inset_pos = cpos();
inset_par = cpar();
inset_boundary = cboundary();
- updateLocal(bv, CURSOR, false);
+ //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()->getInset(cpos())) {
lyxerr[Debug::INSETS] << "OK" << endl;
lockInset(bv, inset);
return true;
- } else if (the_locking_inset && (the_locking_inset == inset)) {
+ }
+
+ 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;
}
-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(ustat);
+ }
return found;
}
bool found = text_.updateInset(inset);
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) {
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
}
-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();
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) {
}
+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;
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(), cpos());
+ LyXFont const font = text_.getFont(bv->buffer(), cpar(), cpos());
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
{
if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
{
if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveRightIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
}
-Inset::RESULT
+InsetOld::RESULT
InsetText::moveLeftIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
}
-Inset::RESULT InsetText::moveUp(BufferView * bv)
+InsetOld::RESULT InsetText::moveUp(BufferView * bv)
{
if (crow() == text_.rows().begin())
return FINISHED_UP;
}
-Inset::RESULT InsetText::moveDown(BufferView * bv)
+InsetOld::RESULT InsetText::moveDown(BufferView * bv)
{
if (boost::next(crow()) == text_.rows().end())
return FINISHED_DOWN;
}
-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()->empty()) {
- getLyXText(bv)->setFont(font, toggleall);
+ 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()->isInset(cpos())) {
- Inset * inset =
- static_cast<UpdatableInset*>(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;
- }
- 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() + 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;
}
}
-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!
Assert(bv);
setViewCache(bv);
- // one endless line, resize normally not necessary
- if (!force && getMaxWidth(bv, this) < 0)
- return;
-
saveLyXTextState();
for_each(const_cast<ParagraphList&>(paragraphs).begin(),
text_.init(bv);
restoreLyXTextState();
+ // seems to be unneeded
+#if 1
if (the_locking_inset) {
inset_x = cix(bv) - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
} else {
need_update |= FULL;
}
+#endif
}
}
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;
}
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();