#include <boost/bind.hpp>
-using bv_funcs::replaceSelection;
-
using lyx::pos_type;
using lyx::graphics::PreviewLoader;
InsetText::InsetText(BufferParams const & bp)
- : autoBreakRows_(false), drawFrame_(NEVER),
- frame_color_(LColor::insetframe), text_(0, true)
+ : autoBreakRows_(false), drawFrame_(false),
+ frame_color_(LColor::insetframe), text_(0)
{
paragraphs().push_back(Paragraph());
- paragraphs().begin()->layout(bp.getLyXTextClass().defaultLayout());
+ paragraphs().back().layout(bp.getLyXTextClass().defaultLayout());
if (bp.tracking_changes)
- paragraphs().begin()->trackChanges();
+ paragraphs().back().trackChanges();
init();
}
InsetText::InsetText(InsetText const & in)
- : UpdatableInset(in), text_(in.text_.bv_owner, true)
+ : UpdatableInset(in), text_(in.text_.bv_owner)
{
// this is ugly...
operator=(in);
}
+InsetText::InsetText() : text_(0)
+{}
+
+
void InsetText::operator=(InsetText const & in)
{
UpdatableInset::operator=(in);
autoBreakRows_ = in.autoBreakRows_;
drawFrame_ = in.drawFrame_;
frame_color_ = in.frame_color_;
- text_ = LyXText(in.text_.bv_owner, true);
+ text_ = LyXText(in.text_.bv_owner);
text_.paragraphs() = in.text_.paragraphs();
init();
}
for (; pit != end; ++pit)
pit->setInsetOwner(this);
old_par = -1;
- in_insetAllowed = false;
}
{
clear(false);
+#ifdef WITH_WARNINGS
#warning John, look here. Doesnt make much sense.
+#endif
if (buf.params().tracking_changes)
paragraphs().begin()->trackChanges();
{
//lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
setViewCache(mi.base.bv);
- mi.base.textwidth -= 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;
- mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
dim_ = dim;
font_ = mi.base.font;
text_.font_ = mi.base.font;
void InsetText::draw(PainterInfo & pi, int x, int y) const
{
+ BOOST_ASSERT(!text_.paragraphs().begin()->rows.empty());
// update our idea of where we are
- xo_ = x;
- yo_ = y;
-
- Painter & pain = pi.pain;
-
- // repaint the background if needed
- x += TEXT_TO_INSET_OFFSET;
- if (backgroundColor() != LColor::background)
- clearInset(pain, x, y);
+ setPosCache(pi, x, y);
BufferView * bv = pi.base.bv;
bv->hideCursor();
- if (!owner())
- x += scroll();
- y += bv->top_y() - text_.firstRow()->ascent_of_text();
+ x += scroll();
+ y -= text_.ascent();
- text_.draw(pi, x, y);
+ // repaint the background if needed
+ if (backgroundColor() != LColor::background)
+ clearInset(pi.pain, x, y);
- if (drawFrame_ == ALWAYS || drawFrame_ == LOCKED)
- drawFrame(pain, xo_);
+ text_.draw(pi, x, y + bv->top_y());
+
+ if (drawFrame_)
+ drawFrame(pi.pain, x, y);
}
-void InsetText::drawFrame(Painter & pain, int x) const
+void InsetText::drawSelection(PainterInfo & pi, int x, int y) const
{
- int const ttoD2 = TEXT_TO_INSET_OFFSET / 2;
- int const frame_x = x + ttoD2;
- int const frame_y = yo_ - dim_.asc + ttoD2;
- int const frame_w = dim_.wid - TEXT_TO_INSET_OFFSET;
- int const frame_h = dim_.asc + dim_.des - TEXT_TO_INSET_OFFSET;
- pain.rectangle(frame_x, frame_y, frame_w, frame_h, frameColor());
+ text_.drawSelection(pi, x, y);
}
-void InsetText::updateLocal(BufferView * bv)
+void InsetText::drawFrame(Painter & pain, int x, int y) const
{
- if (!bv)
- return;
-
- if (!autoBreakRows_ && paragraphs().size() > 1)
- collapseParagraphs(bv);
-
- if (!text_.selection.set())
- text_.selection.cursor = text_.cursor;
-
- bv->owner()->view_state_changed();
- bv->owner()->updateMenubar();
- bv->owner()->updateToolbar();
- if (old_par != text_.cursor.par()) {
- bv->owner()->setLayout(text_.cursorPar()->layout()->name());
- old_par = text_.cursor.par();
- }
+ int const w = text_.width();
+ int const h = text_.height();
+ pain.rectangle(x, y, w, h, frameColor());
}
-string const InsetText::editMessage() const
+void InsetText::clearInset(Painter & pain, int x, int y) const
{
- return _("Opened Text Inset");
+ int const w = text_.width();
+ int const h = text_.height();
+ pain.fillRectangle(x, y, w, h, backgroundColor());
}
-void InsetText::sanitizeEmptyText(BufferView * bv)
+void InsetText::updateLocal(LCursor & cur)
{
- if (paragraphs().size() == 1
- && paragraphs().begin()->empty()
- && bv->getParentLanguage(this) != text_.current_font.language()) {
- LyXFont font(LyXFont::ALL_IGNORE);
- font.setLanguage(bv->getParentLanguage(this));
- text_.setFont(font, false);
- }
-}
+ if (!autoBreakRows_ && paragraphs().size() > 1) {
+ // collapseParagraphs
+ while (paragraphs().size() > 1) {
+ ParagraphList::iterator const first = paragraphs().begin();
+ ParagraphList::iterator second = first;
+ ++second;
+ size_t const first_par_size = first->size();
+ if (!first->empty() &&
+ !second->empty() &&
+ !first->isSeparator(first_par_size - 1)) {
+ first->insertChar(first_par_size, ' ');
+ }
-extern LCursor theTempCursor;
+ cur.clearSelection();
+ mergeParagraph(cur.buffer().params(), paragraphs(), 0);
+ }
+ }
+ if (!cur.selection())
+ cur.resetAnchor();
-void InsetText::edit(BufferView * bv, bool left)
-{
- lyxerr << "InsetText: edit left/right" << endl;
- old_par = -1;
- setViewCache(bv);
+ LyXView * lv = cur.bv().owner();
+ lv->view_state_changed();
+ lv->updateMenubar();
+ lv->updateToolbars();
+ if (old_par != cur.par()) {
+ lv->setLayout(text_.getPar(cur.par()).layout()->name());
+ old_par = cur.par();
+ }
+}
- if (left)
- text_.setCursorIntern(0, 0);
- else
- text_.setCursor(paragraphs().size() - 1, paragraphs().back().size());
- sanitizeEmptyText(bv);
- updateLocal(bv);
- bv->updateParagraphDialog();
+string const InsetText::editMessage() const
+{
+ return _("Opened Text Inset");
}
-void InsetText::edit(BufferView * bv, int x, int y)
+void InsetText::edit(LCursor & cur, bool left)
{
- lyxerr << "InsetText::edit xy" << endl;
+ //lyxerr << "InsetText: edit left/right" << endl;
old_par = -1;
-
- sanitizeEmptyText(bv);
- text_.setCursorFromCoordinates(x - text_.xo_, y + bv->top_y()
- - text_.yo_);
- text_.clearSelection();
+ setViewCache(&cur.bv());
+ int const par = left ? 0 : paragraphs().size() - 1;
+ int const pos = left ? 0 : paragraphs().back().size();
+ text_.setCursor(cur.top(), par, pos);
+ cur.clearSelection();
finishUndo();
-
- updateLocal(bv);
- bv->updateParagraphDialog();
+#ifdef WITH_WARNINGS
+#warning can someone check if/when this is needed?
+#endif
+//Andre?
+// updateLocal(cur);
}
-DispatchResult InsetText::priv_dispatch(FuncRequest const & cmd,
- idx_type &, pos_type &)
+InsetBase * InsetText::editXY(LCursor & cur, int x, int y) const
{
- lyxerr << "InsetText::priv_dispatch (begin), act: "
- << cmd.action << " " << endl;
+ old_par = -1;
+ return text_.editXY(cur, x, y);
+ //sanitizeEmptyText(cur.bv());
+ //updateLocal(cur);
+}
- BufferView * bv = cmd.view();
- setViewCache(bv);
- DispatchResult result;
- result.dispatched(true);
+void InsetText::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+{
+ //lyxerr << "InsetText::priv_dispatch: " << cmd.action << " " << endl;
+ setViewCache(&cur.bv());
bool was_empty = paragraphs().begin()->empty() && paragraphs().size() == 1;
+ text_.dispatch(cur, cmd);
- switch (cmd.action) {
- case LFUN_MOUSE_PRESS:
- bv->cursor() = theTempCursor;
- // fall through
- default:
- result = text_.dispatch(cmd);
- break;
- }
+}
- // 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() &&
- paragraphs().size() == 1) {
- LyXFont font(LyXFont::ALL_IGNORE);
- font.setLanguage(bv->getParentLanguage(this));
- text_.setFont(font, false);
- }
- lyxerr << "InsetText::priv_dispatch (end)" << endl;
- return result;
+bool InsetText::getStatus(LCursor & cur, FuncRequest const & cmd,
+ FuncStatus & status) const
+{
+ return text_.getStatus(cur, cmd, status);
}
int InsetText::docbook(Buffer const & buf, ostream & os,
OutputParams const & runparams) const
{
- docbookParagraphs(buf, paragraphs(), os, runparams);
+ docbookParagraphs(paragraphs(), buf, os, runparams);
return 0;
}
}
-void InsetText::getCursorPos(int & x, int & y) const
-{
- x = text_.cursor.x() + TEXT_TO_INSET_OFFSET;
- y = text_.cursor.y() - dim_.asc + TEXT_TO_INSET_OFFSET;
-}
-
-
-bool InsetText::insertInset(BufferView * bv, InsetOld * inset)
-{
- inset->setOwner(this);
- text_.insertInset(inset);
- updateLocal(bv);
-#warning should we mark the buffer dirty?
- return true;
-}
-
-
-bool InsetText::insetAllowed(InsetOld::Code code) const
+void InsetText::getCursorPos(LCursor const & cur, int & x, int & y) const
{
- // in_insetAllowed is a really gross hack,
- // to allow us to call the owner's insetAllowed
- // without stack overflow, which can happen
- // when the owner uses InsetCollapsable::insetAllowed()
- bool ret = true;
- if (in_insetAllowed)
- return ret;
- in_insetAllowed = true;
- if (owner())
- ret = owner()->insetAllowed(code);
- in_insetAllowed = false;
- return ret;
+ x = text_.cursorX(cur.top());
+ y = text_.cursorY(cur.top());
}
}
-void InsetText::setDrawFrame(DrawFrame how)
+void InsetText::setDrawFrame(bool flag)
{
- drawFrame_ = how;
+ drawFrame_ = flag;
}
}
-int InsetText::scroll(bool /*recursive*/) const
-{
- return UpdatableInset::scroll(false);
-}
-
-
-void InsetText::clearInset(Painter & pain, int x, int y) const
-{
- int w = dim_.wid;
- int h = dim_.asc + dim_.des;
- int ty = y - dim_.asc;
-
- if (ty < 0) {
- h += ty;
- ty = 0;
- }
- if (ty + h > pain.paperHeight())
- h = pain.paperHeight();
- if (xo_ + w > pain.paperWidth())
- w = pain.paperWidth();
- pain.fillRectangle(x + 1, ty + 1, w - 3, h - 1, backgroundColor());
-}
-
-
LyXText * InsetText::getText(int i) const
{
return (i == 0) ? const_cast<LyXText*>(&text_) : 0;
}
-void InsetText::collapseParagraphs(BufferView * bv)
-{
- while (paragraphs().size() > 1) {
- ParagraphList::iterator const first = paragraphs().begin();
- ParagraphList::iterator second = first;
- ++second;
- size_t const first_par_size = first->size();
-
- if (!first->empty() &&
- !second->empty() &&
- !first->isSeparator(first_par_size - 1)) {
- first->insertChar(first_par_size, ' ');
- }
-
-#warning probably broken
- if (text_.selection.set()) {
- if (text_.selection.start.par() == 1) {
- text_.selection.start.par(1);
- text_.selection.start.pos(text_.selection.start.pos() + first_par_size);
- }
- if (text_.selection.end.par() == 2) {
- text_.selection.end.par(1);
- text_.selection.end.pos(text_.selection.end.pos() + first_par_size);
- }
- }
-
- mergeParagraph(bv->buffer()->params(), paragraphs(), first);
- }
-}
-
-
void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
{
+#ifdef WITH_WARNINGS
#warning FIXME Check if Changes stuff needs changing here. (Lgb)
// And it probably does. You have to take a look at this John. (Lgb)
#warning John, have a look here. (Lgb)
+#endif
ParagraphList::iterator pit = plist.begin();
ParagraphList::iterator ins = paragraphs().insert(paragraphs().end(), *pit);
++pit;
- mergeParagraph(buffer->params(), paragraphs(), boost::prior(ins));
+ mergeParagraph(buffer->params(), paragraphs(),
+ ins - paragraphs().begin() - 1);
ParagraphList::iterator pend = plist.end();
for (; pit != pend; ++pit)
}
-ParagraphList & InsetText::paragraphs() const
+ParagraphList const & InsetText::paragraphs() const
+{
+ return text_.paragraphs();
+}
+
+
+ParagraphList & InsetText::paragraphs()
{
- return const_cast<ParagraphList &>(text_.paragraphs());
+ return text_.paragraphs();
}
projects / lyx.git / blobdiff