*
* \author Jürgen Vigna
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "insettext.h"
+#include "insetnewline.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "bufferview_funcs.h"
#include "CutAndPaste.h"
#include "debug.h"
-#include "dimension.h"
+#include "errorlist.h"
#include "funcrequest.h"
#include "gettext.h"
-#include "errorlist.h"
#include "intl.h"
-#include "LaTeXFeatures.h"
#include "LColor.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
-#include "lyxcursor.h"
#include "lyxfind.h"
#include "lyxlex.h"
-#include "lyxrow.h"
#include "lyxrc.h"
-#include "lyxtext.h"
+#include "metricsinfo.h"
#include "paragraph.h"
-#include "ParagraphParameters.h"
-#include "trans_mgr.h"
-#include "undo_funcs.h"
-#include "WordLangTuple.h"
#include "paragraph_funcs.h"
-#include "sgml.h"
+#include "ParagraphParameters.h"
#include "rowpainter.h"
-#include "insetnewline.h"
-#include "metricsinfo.h"
+#include "sgml.h"
+#include "texrow.h"
+#include "undo.h"
+#include "WordLangTuple.h"
#include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
-#include "frontends/screen.h"
-#include "support/textutils.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
#include "support/lyxalgo.h" // lyx::count
#include <boost/bind.hpp>
-#include <fstream>
-#include <algorithm>
-#include <cstdlib>
-
-using std::ostream;
-using std::ifstream;
-using std::endl;
-using std::min;
-using std::max;
-using std::make_pair;
-using std::vector;
-using std::pair;
-using std::for_each;
-
-using namespace lyx::support;
-using namespace bv_funcs;
+using bv_funcs::replaceSelection;
using lyx::pos_type;
-using lyx::textclass_type;
-namespace grfx = lyx::graphics;
+using lyx::graphics::PreviewLoader;
-// These functions should probably go into bufferview_funcs somehow (Jug)
+using lyx::support::isStrUnsignedInt;
+using lyx::support::strToUnsignedInt;
-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 == text_.cursor.par())
- break;
- }
-
- if (it != end && text_.cursor.pos() <= it->size())
- sstate = text_; // slicing intended
- else
- sstate.cursor.par(end);
-}
-
-
-void InsetText::restoreLyXTextState() const
-{
- if (sstate.cursor.par() == const_cast<ParagraphList&>(paragraphs).end())
- return;
-
- 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 {
- text_.setCursor(sstate.cursor.par(), sstate.cursor.pos(),
- true, sstate.cursor.boundary());
- text_.selection.cursor = text_.cursor;
- text_.selection.set(false);
- }
-}
+using std::endl;
+using std::for_each;
+using std::max;
+using std::string;
+using std::auto_ptr;
+using std::ostream;
+using std::vector;
InsetText::InsetText(BufferParams const & bp)
- : UpdatableInset(), text_(0, this)
-{
- paragraphs.push_back(Paragraph());
+ : UpdatableInset(),
+ paragraphs(1),
+ autoBreakRows_(false),
+ drawFrame_(NEVER),
+ frame_color_(LColor::insetframe),
+ text_(0, this, true, paragraphs)
+{
+ textwidth_ = 0; // broken
paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout());
if (bp.tracking_changes)
paragraphs.begin()->trackChanges();
- init(0);
+ init();
}
InsetText::InsetText(InsetText const & in)
- : UpdatableInset(in), text_(0, this)
+ : UpdatableInset(in),
+ text_(in.text_.bv_owner, this, true, paragraphs)
{
- init(&in);
+ // this is ugly...
+ operator=(in);
}
-InsetText & InsetText::operator=(InsetText const & it)
+void InsetText::operator=(InsetText const & in)
{
- init(&it);
- return *this;
+ UpdatableInset::operator=(in);
+ paragraphs = in.paragraphs;
+ autoBreakRows_ = in.autoBreakRows_;
+ drawFrame_ = in.drawFrame_;
+ frame_color_ = in.frame_color_;
+ textwidth_ = in.textwidth_;
+ text_ = LyXText(in.text_.bv_owner, this, true, paragraphs);
+ init();
}
-void InsetText::init(InsetText const * ins)
+void InsetText::init()
{
- 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;
- }
- the_locking_inset = 0;
- for_each(paragraphs.begin(), paragraphs.end(),
- boost::bind(&Paragraph::setInsetOwner, _1, this));
+ ParagraphList::iterator pit = paragraphs.begin();
+ ParagraphList::iterator end = paragraphs.end();
+ for (; pit != end; ++pit)
+ pit->setInsetOwner(this);
+ text_.paragraphs_ = ¶graphs;
top_y = 0;
- no_selection = true;
- need_update = FULL;
- drawTextXOffset = 0;
- drawTextYOffset = 0;
+
locked = false;
- old_par = paragraphs.end();
- last_drawn_width = -1;
- sstate.cursor.par(paragraphs.end());
+ inset_par = -1;
+ inset_pos = 0;
+ inset_x = 0;
+ inset_y = 0;
+ no_selection = true;
+ the_locking_inset = 0;
+ old_par = -1;
in_insetAllowed = false;
+ mouse_x = 0;
+ mouse_y = 0;
}
if (just_mark_erased) {
ParagraphList::iterator it = paragraphs.begin();
ParagraphList::iterator end = paragraphs.end();
- for (; it != end; ++it) {
+ for (; it != end; ++it)
it->markErased();
- }
- need_update = FULL;
return;
}
paragraphs.push_back(Paragraph());
paragraphs.begin()->setInsetOwner(this);
paragraphs.begin()->layout(old_layout);
-
- reinitLyXText();
- need_update = INIT;
}
-InsetBase * InsetText::clone() const
+auto_ptr<InsetBase> InsetText::clone() const
{
- return new InsetText(*this);
+ return auto_ptr<InsetBase>(new InsetText(*this));
}
-void InsetText::write(Buffer const * buf, ostream & os) const
+void InsetText::write(Buffer const & buf, ostream & os) const
{
os << "Text\n";
writeParagraphData(buf, os);
}
-void InsetText::writeParagraphData(Buffer const * buf, ostream & os) const
+void InsetText::writeParagraphData(Buffer const & buf, ostream & os) const
{
ParagraphList::const_iterator it = paragraphs.begin();
ParagraphList::const_iterator end = paragraphs.end();
Paragraph::depth_type dth = 0;
for (; it != end; ++it) {
- it->write(buf, os, buf->params, dth);
+ it->write(buf, os, buf.params(), dth);
}
}
-void InsetText::read(Buffer const * buf, LyXLex & lex)
+void InsetText::read(Buffer const & buf, LyXLex & lex)
{
string token;
Paragraph::depth_type depth = 0;
clear(false);
- if (buf->params.tracking_changes)
+#warning John, look here. Doesnt make much sense.
+ if (buf.params().tracking_changes)
paragraphs.begin()->trackChanges();
// delete the initial paragraph
+ Paragraph oldpar = *paragraphs.begin();
paragraphs.clear();
ParagraphList::iterator pit = paragraphs.begin();
break;
}
- if (token == "\\the_end") {
- lex.printError("\\the_end read in inset! Error in document!");
+ if (token == "\\end_document") {
+ lex.printError("\\end_document read in inset! Error in document!");
return;
}
// FIXME: ugly.
- const_cast<Buffer*>(buf)->readParagraph(lex, token, paragraphs, pit, depth);
+ const_cast<Buffer&>(buf).readParagraph(lex, token, paragraphs, pit, depth);
}
pit = paragraphs.begin();
lex.printError("Missing \\end_inset at this point. "
"Read: `$$Token'");
}
- need_update = FULL;
+
+ // sanity check
+ // ensure we have at least one par.
+ if (paragraphs.empty())
+ paragraphs.push_back(oldpar);
}
void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
{
- //lyxerr << "InsetText::metrics: " << getInsetName()
- // << " width: " << mi.base.textwidth << "\n";
- if (mi.base.textwidth)
- textwidth_ = mi.base.textwidth;
+ //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
+
+ textwidth_ = mi.base.textwidth;
BufferView * bv = mi.base.bv;
setViewCache(bv);
- text_.rebuild(mi.base.textwidth);
- 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;
- lyxerr << "InsetText::textWidth: " << getInsetName()
- << " " << textwidth_ << endl;
-*/
return textwidth_;
}
-void InsetText::draw(PainterInfo & pi, int x, int baseline) const
+void InsetText::draw(PainterInfo & pi, int x, int y) const
{
- if (nodraw())
- return;
-
// 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;
// repaint the background if needed
if (backgroundColor() != LColor::background)
- clearInset(bv, start_x + TEXT_TO_INSET_OFFSET, baseline);
+ clearInset(bv, start_x + TEXT_TO_INSET_OFFSET, y);
// no draw is necessary !!!
if (drawFrame_ == LOCKED && !locked && paragraphs.begin()->empty()) {
- top_baseline = baseline;
- need_update = NONE;
+ top_baseline = y;
return;
}
+ bv->hideCursor();
+
if (!owner())
x += scroll();
- top_baseline = baseline;
- top_y = baseline - dim_.asc;
-
- if (last_drawn_width != dim_.wid) {
- need_update |= FULL;
- last_drawn_width = dim_.wid;
- }
+ top_baseline = y;
+ top_y = y - dim_.asc;
- if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
- inset_x = cix(bv) - int(x) + drawTextXOffset;
- inset_y = ciy() + drawTextYOffset;
+ if (the_locking_inset
+ && text_.cursor.par() == inset_par && cpos() == inset_pos) {
+ inset_x = cx() - x;
+ inset_y = cy();
}
x += TEXT_TO_INSET_OFFSET;
- 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)) {
- y += rowit->height();
- first += rowit->height();
- ++rowit;
- }
- if (y_offset < 0) {
- text_.top_y(-y_offset);
- first = y;
- y_offset = 0;
- } else {
- text_.top_y(first);
- first = 0;
- }
-
- int yf = y_offset + first;
- y = 0;
-
- bv->hideCursor();
-
- 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)) {
- drawFrame(pain, int(start_x));
- }
+ paintTextInset(*bv, text_, x, y);
- if (need_update != INIT) {
- need_update = NONE;
- }
+ if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked))
+ drawFrame(pain, start_x);
}
void InsetText::drawFrame(Painter & pain, int x) const
{
- static int const ttoD2 = TEXT_TO_INSET_OFFSET / 2;
- frame_x = x + ttoD2;
- frame_y = top_baseline - dim_.asc + ttoD2;
- frame_w = dim_.wid - TEXT_TO_INSET_OFFSET;
- frame_h = dim_.asc + dim_.des - TEXT_TO_INSET_OFFSET;
- pain.rectangle(frame_x, frame_y, frame_w, frame_h,
- frame_color);
+ int const ttoD2 = TEXT_TO_INSET_OFFSET / 2;
+ int const frame_x = x + ttoD2;
+ int const frame_y = top_baseline - 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());
}
-void InsetText::setUpdateStatus(int what) const
-{
- need_update |= what;
- // we will to redraw us full if our LyXText wants it
- if (text_.needRefresh())
- need_update |= FULL;
-
- // this to not draw a selection when we redraw all of it!
- if (need_update & CURSOR && !(need_update & SELECTION)) {
- if (text_.selection.set())
- need_update = FULL;
- text_.clearSelection();
- }
-}
-
-
-void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
+void InsetText::updateLocal(BufferView * bv, bool /*mark_dirty*/)
{
if (!bv)
return;
- if (!autoBreakRows && paragraphs.size() > 1)
+ if (!autoBreakRows_ && paragraphs.size() > 1)
collapseParagraphs(bv);
- text_.partialRebreak();
- setUpdateStatus(what);
- bool flag = mark_dirty ||
- ((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();
- bv->updateInset(const_cast<InsetText *>(this));
- }
-
- if (need_update == CURSOR)
- need_update = NONE;
+ bv->updateInset(this);
bv->owner()->view_state_changed();
bv->owner()->updateMenubar();
bv->owner()->updateToolbar();
- if (old_par != cpar()) {
+ if (old_par != text_.cursor.par()) {
bv->owner()->setLayout(cpar()->layout()->name());
- old_par = cpar();
+ old_par = text_.cursor.par();
}
}
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
the_locking_inset = 0;
- updateLocal(bv, CURSOR_PAR, false);
+ updateLocal(bv, false);
}
no_selection = true;
locked = false;
- int code = NONE;
- if (text_.selection.set()) {
+ if (text_.selection.set())
text_.clearSelection();
- code = FULL;
- } else if (owner()) {
+ else if (owner())
bv->owner()->setLayout(owner()->getLyXText(bv)
- ->cursor.par()->layout()->name());
- } else
- bv->owner()->setLayout(bv->text->cursor.par()->layout()->name());
+ ->cursorPar()->layout()->name());
+ else
+ bv->owner()->setLayout(bv->text->cursorPar()->layout()->name());
// hack for deleteEmptyParMech
- 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 0
- updateLocal(bv, code, false);
-#else
- if (code != NONE)
- setUpdateStatus(code);
-#endif
+ if (!paragraphs.begin()->empty())
+ text_.setCursor(0, 0);
+ else if (paragraphs.size() > 1)
+ text_.setCursor(1, 0);
}
the_locking_inset = 0;
inset_pos = inset_x = inset_y = 0;
inset_boundary = false;
- inset_par = paragraphs.end();
- old_par = paragraphs.end();
- text_.setCursorIntern(paragraphs.begin(), 0);
+ inset_par = -1;
+ old_par = -1;
+ text_.setCursorIntern(0, 0);
text_.clearSelection();
finishUndo();
// If the inset is empty set the language of the current font to the
font.setLanguage(bv->getParentLanguage(this));
setFont(bv, font, false);
}
- int code = CURSOR;
- if (drawFrame_ == LOCKED)
- code = CURSOR|DRAW_FRAME;
- setUpdateStatus(code);
}
-void InsetText::lockInset(BufferView * bv, UpdatableInset * inset)
+void InsetText::lockInset(BufferView * /*bv*/, UpdatableInset * inset)
{
the_locking_inset = inset;
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy() + drawTextYOffset;
+ inset_x = cx() - top_x;
+ inset_y = cy();
inset_pos = cpos();
- inset_par = cpar();
+ inset_par = text_.cursor.par();
inset_boundary = cboundary();
- //updateLocal(bv, CURSOR, false);
}
bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset)
{
lyxerr[Debug::INSETS] << "InsetText::LockInsetInInset("
- << inset << "): ";
+ << inset << "): " << endl;
if (!inset)
return false;
if (!the_locking_inset) {
ParagraphList::iterator pit = paragraphs.begin();
ParagraphList::iterator pend = paragraphs.end();
- int const id = inset->id();
for (; pit != pend; ++pit) {
InsetList::iterator it = pit->insetlist.begin();
InsetList::iterator const end = pit->insetlist.end();
for (; it != end; ++it) {
if (it->inset == inset) {
- lyxerr << "InsetText::lockInsetInInset: 1 a\n";
- text_.setCursorIntern(pit, it->pos);
- lyxerr << "InsetText::lockInsetInInset: 1 b\n";
- lyxerr << "bv: " << bv << " inset: " << inset << "\n";
+ lyxerr << "InsetText::lockInsetInInset: 1 a" << endl;
+ text_.setCursorIntern(
+ std::distance(paragraphs.begin(), pit), it->pos);
+ lyxerr << "InsetText::lockInsetInInset: 1 b" << endl;
+ lyxerr << "bv: " << bv << " inset: " << inset << endl;
lockInset(bv, inset);
lyxerr << "InsetText::lockInsetInInset: 1 c" << endl;
return true;
}
- if (it->inset->getInsetFromID(id)) {
- 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";
+ lyxerr << "InsetText::lockInsetInInset: 3" << endl;
return false;
}
if (inset == cpar()->getInset(cpos())) {
}
if (the_locking_inset && the_locking_inset == inset) {
- if (cpar() == inset_par && cpos() == inset_pos) {
+ if (text_.cursor.par() == inset_par && cpos() == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy() + drawTextYOffset;
+ inset_x = cx() - top_x;
+ inset_y = cy();
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
return false;
if (the_locking_inset == inset) {
the_locking_inset->insetUnlock(bv);
- getLyXText(bv)->updateInset(inset);
the_locking_inset = 0;
if (lr)
moveRightIntern(bv, true, false);
- old_par = paragraphs.end(); // force layout setting
+ old_par = -1; // force layout setting
if (scroll())
scroll(bv, 0.0F);
else
- updateLocal(bv, CURSOR, false);
+ updateLocal(bv, false);
return true;
}
return the_locking_inset->unlockInsetInInset(bv, inset, lr);
}
-bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset)
-{
- if (!autoBreakRows && paragraphs.size() > 1)
- collapseParagraphs(bv);
-
- if (inset == this)
- return true;
-
- if (inset->owner() != this) {
- int ustat = CURSOR_PAR;
- bool found = false;
- UpdatableInset * tl_inset = the_locking_inset;
- if (tl_inset)
- found = tl_inset->updateInsetInInset(bv, inset);
- if (!found) {
- tl_inset = static_cast<UpdatableInset *>(inset);
- while(tl_inset->owner() && tl_inset->owner() != this)
- tl_inset = static_cast<UpdatableInset *>(tl_inset->owner());
- if (!tl_inset->owner())
- return false;
- found = tl_inset->updateInsetInInset(bv, inset);
- ustat = FULL;
- }
- if (found)
- text_.updateInset(tl_inset);
- if (found)
- setUpdateStatus(ustat);
- return found;
- }
- bool found = text_.updateInset(inset);
- if (found) {
- setUpdateStatus(CURSOR_PAR);
- if (the_locking_inset &&
- cpar() == inset_par && cpos() == inset_pos)
- {
- inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy() + drawTextYOffset;
- }
- }
- return found;
-}
-
-
void InsetText::lfunMousePress(FuncRequest const & cmd)
{
no_selection = true;
if (!locked)
lockInset(bv);
- 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);
+ int tmp_x = cmd.x;
+ int tmp_y = cmd.y + dim_.asc - bv->top_y();
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
if (the_locking_inset) {
if (the_locking_inset == inset) {
- the_locking_inset->localDispatch(cmd1);
+ the_locking_inset->dispatch(cmd1);
return;
}
// otherwise only unlock the_locking_inset
if (!bv->lockInset(uinset)) {
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
}
- inset->localDispatch(cmd1);
+ inset->dispatch(cmd1);
if (the_locking_inset)
- updateLocal(bv, CURSOR, false);
+ updateLocal(bv, false);
return;
}
}
if (!inset) {
bool paste_internally = false;
if (cmd.button() == mouse_button::button2 && getLyXText(bv)->selection.set()) {
- localDispatch(FuncRequest(bv, LFUN_COPY));
+ dispatch(FuncRequest(bv, LFUN_COPY));
paste_internally = true;
}
- int old_top_y = text_.top_y();
+ int old_top_y = bv->top_y();
- text_.setCursorFromCoordinates(cmd.x - drawTextXOffset,
- cmd.y + dim_.asc);
+ text_.setCursorFromCoordinates(cmd.x, cmd.y + dim_.asc);
// set the selection cursor!
text_.selection.cursor = text_.cursor;
text_.cursor.x_fix(text_.cursor.x());
- if (text_.selection.set()) {
- text_.clearSelection();
- updateLocal(bv, FULL, false);
- } else {
- text_.clearSelection();
- updateLocal(bv, CURSOR, false);
- }
+ text_.clearSelection();
+ updateLocal(bv, false);
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)
+ if (bv->top_y() != old_top_y)
no_selection = true;
- old_par = cpar();
+ old_par = text_.cursor.par();
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
// insert this
if (cmd.button() == mouse_button::button2) {
if (paste_internally)
- localDispatch(FuncRequest(bv, LFUN_PASTE));
+ dispatch(FuncRequest(bv, LFUN_PASTE));
else
- localDispatch(FuncRequest(bv, LFUN_PASTESELECTION, "paragraph"));
+ dispatch(FuncRequest(bv, LFUN_PASTESELECTION, "paragraph"));
}
} else {
getLyXText(bv)->clearSelection();
no_selection = true;
if (the_locking_inset)
- return the_locking_inset->localDispatch(cmd1);
-
- 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);
- bool ret = false;
- if (inset) {
-// This code should probably be removed now. Simple insets
-// (!highlyEditable) can actually take the localDispatch,
-// and turn it into edit() if necessary. But we still
-// need to deal properly with the whole relative vs.
-// absolute mouse co-ords thing in a realiable, sensible way
-#if 0
- if (isHighlyEditableInset(inset))
- ret = inset->localDispatch(cmd1);
- else {
- inset_x = cix(bv) - top_x + drawTextXOffset;
- 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());
- ret = true;
- }
-#endif
- ret = inset->localDispatch(cmd1);
- updateLocal(bv, CURSOR_PAR, false);
+ return the_locking_inset->dispatch(cmd1);
- }
+ int tmp_x = cmd.x;
+ int tmp_y = cmd.y + dim_.asc - bv->top_y();
+ InsetOld * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
+ if (!inset)
+ return false;
+
+ // We still need to deal properly with the whole relative vs.
+ // absolute mouse co-ords thing in a realiable, sensible way
+ bool ret = inset->dispatch(cmd1);
+ updateLocal(bv, false);
return ret;
}
cmd1.y -= inset_y;
if (the_locking_inset) {
- the_locking_inset->localDispatch(cmd1);
+ the_locking_inset->dispatch(cmd1);
return;
}
BufferView * bv = cmd.view();
LyXCursor cur = text_.cursor;
- text_.setCursorFromCoordinates
- (cmd.x - drawTextXOffset, cmd.y + dim_.asc);
+ text_.setCursorFromCoordinates (cmd.x, cmd.y + dim_.asc);
text_.cursor.x_fix(text_.cursor.x());
if (cur == text_.cursor)
return;
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);
- }
+ updateLocal(bv, false);
}
-Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
+dispatch_result
+InsetText::priv_dispatch(FuncRequest const & cmd,
+ idx_type & idx, pos_type & pos)
{
BufferView * bv = cmd.view();
setViewCache(bv);
- if (cmd.action == LFUN_INSET_EDIT) {
- UpdatableInset::localDispatch(cmd);
+ switch (cmd.action) {
+ case LFUN_INSET_EDIT: {
+ UpdatableInset::priv_dispatch(cmd, idx, pos);
if (!bv->lockInset(this)) {
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
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();
+ inset_par = -1;
+ old_par = -1;
if (cmd.argument.size()) {
if (cmd.argument == "left")
- 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());
- text_.setCursor(it, it->size());
- }
+ text_.setCursorIntern(0, 0);
+ else
+ text_.setCursor(paragraphs.size() - 1, paragraphs.back().size());
} else {
int tmp_y = (cmd.y < 0) ? 0 : cmd.y;
// we put here -1 and not button as now the button in the
// cycle hopefully (Jug 20020509)
// FIXME: GUII I've changed this to none: probably WRONG
if (!checkAndActivateInset(bv, cmd.x, tmp_y, mouse_button::none)) {
- text_.setCursorFromCoordinates(cmd.x - drawTextXOffset,
- cmd.y + dim_.asc);
+ text_.setCursorFromCoordinates(cmd.x, cmd.y + dim_.asc);
+ text_.cursor.x(text_.cursor.x());
text_.cursor.x_fix(text_.cursor.x());
}
}
setFont(bv, font, false);
}
- int code = CURSOR;
- if (drawFrame_ == LOCKED)
- code = CURSOR | DRAW_FRAME;
-
- updateLocal(bv, code, false);
+ updateLocal(bv, false);
// Tell the paragraph dialog that we've entered an insettext.
bv->dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
return DISPATCHED;
}
+ case LFUN_MOUSE_PRESS:
+ lfunMousePress(cmd);
+ return DISPATCHED;
+
+ case LFUN_MOUSE_MOTION:
+ lfunMouseMotion(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_RELEASE:
+ return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
- bool was_empty = (paragraphs.begin()->empty() &&
- paragraphs.size() == 1);
+ default:
+ break;
+ }
+ bool was_empty = paragraphs.begin()->empty() && paragraphs.size() == 1;
no_selection = false;
- RESULT result = UpdatableInset::localDispatch(cmd);
+
+ dispatch_result result = UpdatableInset::priv_dispatch(cmd, idx, pos);
if (result != UNDISPATCHED)
return DISPATCHED;
return FINISHED;
if (the_locking_inset) {
- result = the_locking_inset->localDispatch(cmd);
+ result = the_locking_inset->dispatch(cmd);
if (result == DISPATCHED_NOUPDATE)
return result;
- else if (result == DISPATCHED) {
- updateLocal(bv, CURSOR_PAR, false);
+ if (result == DISPATCHED) {
+ updateLocal(bv, false);
return result;
- } else if (result >= FINISHED) {
+ }
+ if (result >= FINISHED) {
switch (result) {
case FINISHED_RIGHT:
moveRightIntern(bv, false, false);
result = DISPATCHED;
break;
case FINISHED_UP:
- if ((result = moveUp(bv)) >= FINISHED) {
- updateLocal(bv, CURSOR, false);
+ result = moveUp(bv);
+ if (result >= FINISHED) {
+ updateLocal(bv, false);
bv->unlockInset(this);
}
break;
case FINISHED_DOWN:
- if ((result = moveDown(bv)) >= FINISHED) {
- updateLocal(bv, CURSOR, false);
+ result = moveDown(bv);
+ if (result >= FINISHED) {
+ updateLocal(bv, false);
bv->unlockInset(this);
}
break;
break;
}
the_locking_inset = 0;
- updateLocal(bv, CURSOR, false);
+ updateLocal(bv, false);
// make sure status gets reset immediately
bv->owner()->clearMessage();
return result;
}
}
- int updwhat = 0;
- int updflag = false;
-
- // what type of update to do on a cursor movement
- int cursor_update = CURSOR;
-
- if (text_.selection.set())
- cursor_update = SELECTION;
+ bool updflag = false;
switch (cmd.action) {
* 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_.cursorPar());
#endif
bv->switchKeyMap();
- if (lyxrc.auto_region_delete) {
- if (text_.selection.set()) {
- text_.cutSelection(false, false);
- }
- }
+
+ if (lyxrc.auto_region_delete && text_.selection.set())
+ text_.cutSelection(false, false);
text_.clearSelection();
- for (string::size_type i = 0; i < cmd.argument.length(); ++i) {
+
+ for (string::size_type i = 0; i < cmd.argument.length(); ++i)
bv->owner()->getIntl().getTransManager().
TranslateAndInsert(cmd.argument[i], &text_);
- }
}
text_.selection.cursor = text_.cursor;
- updwhat = CURSOR | CURSOR_PAR;
updflag = true;
result = DISPATCHED_NOUPDATE;
break;
case LFUN_RIGHT:
result = moveRight(bv);
finishUndo();
- updwhat = cursor_update;
break;
case LFUN_LEFT:
finishUndo();
result = moveLeft(bv);
- updwhat = cursor_update;
break;
case LFUN_DOWN:
finishUndo();
result = moveDown(bv);
- updwhat = cursor_update;
break;
case LFUN_UP:
finishUndo();
result = moveUp(bv);
- updwhat = cursor_update;
break;
case LFUN_PRIOR:
- if (crow() == text_.rows().begin())
+ if (crow() == text_.firstRow())
result = FINISHED_UP;
else {
text_.cursorPrevious();
text_.clearSelection();
result = DISPATCHED_NOUPDATE;
}
- updwhat = cursor_update;
break;
case LFUN_NEXT:
- if (boost::next(crow()) == text_.rows().end())
+ if (crow() == text_.lastRow())
result = FINISHED_DOWN;
else {
text_.cursorNext();
text_.clearSelection();
result = DISPATCHED_NOUPDATE;
}
- updwhat = cursor_update;
break;
- case LFUN_BACKSPACE: {
+ case LFUN_BACKSPACE:
if (text_.selection.set())
text_.cutSelection(true, false);
else
text_.backspace();
- updwhat = CURSOR_PAR;
updflag = true;
break;
- }
- case LFUN_DELETE: {
- if (text_.selection.set()) {
+ case LFUN_DELETE:
+ if (text_.selection.set())
text_.cutSelection(true, false);
- } else {
+ else
text_.Delete();
- }
- updwhat = CURSOR_PAR;
updflag = true;
break;
- }
-
- case LFUN_CUT: {
- text_.cutSelection(true, true);
- updwhat = CURSOR_PAR;
- updflag = true;
- break;
- }
-
- case LFUN_COPY:
- finishUndo();
- text_.copySelection();
- updwhat = CURSOR_PAR;
- break;
-
- case LFUN_PASTESELECTION:
- {
- string const clip(bv->getClipboard());
- if (clip.empty())
- break;
- if (cmd.argument == "paragraph") {
- text_.insertStringAsParagraphs(clip);
- } else {
- text_.insertStringAsLines(clip);
- }
- // bug 393
- text_.clearSelection();
-
- updwhat = CURSOR_PAR;
- updflag = true;
- break;
- }
-
- case LFUN_PASTE: {
- if (!autoBreakRows) {
+ case LFUN_PASTE:
+ if (!autoBreakRows_) {
if (CutAndPaste::nrOfParagraphs() > 1) {
#ifdef WITH_WARNINGS
#warning FIXME horrendously bad UI
#endif
Alert::error(_("Paste failed"), _("Cannot include more than one paragraph."));
- break;
}
- }
-
- replaceSelection(bv->getLyXText());
- size_t sel_index = 0;
- string const & arg = cmd.argument;
- if (isStrUnsignedInt(arg)) {
- size_t const paste_arg = strToUnsignedInt(arg);
+ } else {
+ replaceSelection(bv->getLyXText());
+ size_t sel_index = 0;
+ string const & arg = cmd.argument;
+ if (isStrUnsignedInt(arg)) {
#warning FIXME Check if the arg is in the domain of available selections.
- sel_index = paste_arg;
+ sel_index = strToUnsignedInt(arg);
+ }
+ text_.pasteSelection(sel_index);
+ // bug 393
+ text_.clearSelection();
+ updflag = true;
}
- text_.pasteSelection(sel_index);
- // bug 393
- text_.clearSelection();
- updwhat = CURSOR_PAR;
- updflag = true;
break;
- }
case LFUN_BREAKPARAGRAPH:
- if (!autoBreakRows) {
+ if (!autoBreakRows_) {
result = DISPATCHED;
- break;
+ } else {
+ replaceSelection(bv->getLyXText());
+ text_.breakParagraph(paragraphs, 0);
+ updflag = true;
}
- replaceSelection(bv->getLyXText());
- text_.breakParagraph(paragraphs, 0);
- updwhat = CURSOR | FULL;
- updflag = true;
break;
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- if (!autoBreakRows) {
+ if (!autoBreakRows_) {
result = DISPATCHED;
- break;
+ } else {
+ replaceSelection(bv->getLyXText());
+ text_.breakParagraph(paragraphs, 1);
+ updflag = true;
}
- replaceSelection(bv->getLyXText());
- text_.breakParagraph(paragraphs, 1);
- updwhat = CURSOR | FULL;
- updflag = true;
break;
case LFUN_BREAKLINE: {
- if (!autoBreakRows) {
+ if (!autoBreakRows_) {
result = DISPATCHED;
- break;
+ } else {
+ replaceSelection(bv->getLyXText());
+ text_.insertInset(new InsetNewline);
+ updflag = true;
}
-
- 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) {
+ if (autoBreakRows_) {
string cur_layout = cpar()->layout()->name();
// Derive layout number from given argument (string)
- // and current buffer's textclass (number). */
+ // and current buffer's textclass (number).
LyXTextClass const & tclass =
- bv->buffer()->params.getLyXTextClass();
+ bv->buffer()->params().getLyXTextClass();
string layout = cmd.argument;
bool hasLayout = tclass.hasLayout(layout);
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
- string const & obs =
- tclass[layout]->obsoleted_by();
+ string const & obs = tclass[layout]->obsoleted_by();
if (!obs.empty())
layout = obs;
}
cur_layout = layout;
text_.setLayout(layout);
bv->owner()->setLayout(cpar()->layout()->name());
- updwhat = CURSOR_PAR;
updflag = true;
}
} else {
bv->owner()->setLayout(cpar()->layout()->name());
}
break;
- case LFUN_PARAGRAPH_SPACING:
- // This one is absolutely not working. When fiddling with this
- // it also seems to me that the paragraphs inside the insettext
- // inherit bufferparams/paragraphparams in a strange way. (Lgb)
- // FIXME: how old is this comment ? ...
- {
- ParagraphList::iterator pit = text_.cursor.par();
- Spacing::Space cur_spacing = pit->params().spacing().getSpace();
- float cur_value = 1.0;
- if (cur_spacing == Spacing::Other) {
- cur_value = pit->params().spacing().getValue();
- }
-
- istringstream istr(STRCONV(cmd.argument));
- string tmp;
- istr >> tmp;
- Spacing::Space new_spacing = cur_spacing;
- float new_value = cur_value;
- if (tmp.empty()) {
- lyxerr << "Missing argument to `paragraph-spacing'"
- << endl;
- } else if (tmp == "single") {
- new_spacing = Spacing::Single;
- } else if (tmp == "onehalf") {
- new_spacing = Spacing::Onehalf;
- } else if (tmp == "double") {
- new_spacing = Spacing::Double;
- } else if (tmp == "other") {
- new_spacing = Spacing::Other;
- float tmpval = 0.0;
- istr >> tmpval;
- lyxerr << "new_value = " << tmpval << endl;
- if (tmpval != 0.0)
- new_value = tmpval;
- } else if (tmp == "default") {
- new_spacing = Spacing::Default;
- } else {
- lyxerr << _("Unknown spacing argument: ")
- << cmd.argument << endl;
- }
- if (cur_spacing != new_spacing || cur_value != new_value) {
- pit->params().spacing(Spacing(new_spacing, new_value));
- updwhat = CURSOR_PAR;
- updflag = true;
- }
- }
- break;
-
- // These need to do repaints but don't require
- // special handling otherwise. A *lot* of the
- // above could probably be done similarly ...
-
- case LFUN_HOME:
- case LFUN_END:
- case LFUN_WORDLEFT:
- case LFUN_WORDRIGHT:
- // these two are really unhandled ...
- case LFUN_ENDBUF:
- case LFUN_BEGINNINGBUF:
- updwhat = cursor_update;
- if (!bv->dispatch(cmd))
- result = UNDISPATCHED;
- break;
-
- case LFUN_RIGHTSEL:
- case LFUN_UPSEL:
- case LFUN_DOWNSEL:
- case LFUN_LEFTSEL:
- case LFUN_HOMESEL:
- case LFUN_ENDSEL:
- case LFUN_WORDLEFTSEL:
- case LFUN_WORDRIGHTSEL:
- updwhat = SELECTION;
-
- // fallthrough
default:
if (!bv->dispatch(cmd))
break;
}
- if (updwhat > 0)
- updateLocal(bv, updwhat, updflag);
+ updateLocal(bv, 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() &&
if (result >= FINISHED)
bv->unlockInset(this);
- if (result == DISPATCHED_NOUPDATE && (need_update & FULL))
+ if (result == DISPATCHED_NOUPDATE)
result = DISPATCHED;
return result;
}
-int InsetText::latex(Buffer const * buf, ostream & os,
+int InsetText::latex(Buffer const & buf, ostream & os,
LatexRunParams const & runparams) const
{
TexRow texrow;
}
-int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const
+int InsetText::ascii(Buffer const & buf, ostream & os, int linelen) const
{
unsigned int lines = 0;
ParagraphList::const_iterator end = paragraphs.end();
ParagraphList::const_iterator it = beg;
for (; it != end; ++it) {
- string const tmp = buf->asciiParagraph(*it, linelen, it == beg);
+ string const tmp = buf.asciiParagraph(*it, linelen, it == beg);
lines += lyx::count(tmp.begin(), tmp.end(), '\n');
os << tmp;
}
}
-int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+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;
ParagraphList::iterator pend = const_cast<ParagraphList&>(paragraphs).end();
for (; pit != pend; ++pit) {
- string sgmlparam;
int desc_on = 0; // description mode
LyXLayout_ptr const & style = pit->layout();
break;
case LATEX_COMMAND:
- buf->error(ErrorItem(_("Error"), _("LatexType Command not allowed here.\n"), pit->id(), 0, pit->size()));
+ buf.error(ErrorItem(_("Error"), _("LatexType Command not allowed here.\n"), pit->id(), 0, pit->size()));
return -1;
break;
break;
}
- buf->simpleDocBookOnePar(os, pit, desc_on, depth + 1 + command_depth);
+ buf.simpleDocBookOnePar(os, pit, desc_on, depth + 1 + command_depth);
string end_tag;
// write closing SGML tags
}
break;
case LATEX_ITEM_ENVIRONMENT:
- if (desc_on == 1) break;
+ if (desc_on == 1)
+ break;
end_tag= "para";
lines += sgml::closeTag(os, depth + 1 + command_depth, mixcont, end_tag);
break;
the_locking_inset->getCursor(bv, x, y);
return;
}
- x = cx(&bv);
+ x = cx();
y = cy() + InsetText::y();
}
the_locking_inset->getCursorPos(bv, x, y);
return;
}
- x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
+ x = cx() - top_x - 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(), cpos());
+
+ LyXFont const font = text_.getFont(cpar(), cpos());
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
- if (bv->fitLockedInsetCursor(cx(bv), cy(), asc, desc))
- need_update |= FULL;
+ bv->fitLockedInsetCursor(cx(), cy(), asc, desc);
}
-Inset::RESULT
-InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
+dispatch_result InsetText::moveRight(BufferView * bv)
{
- if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
- return moveLeftIntern(bv, false, activate_inset, selecting);
+ if (text_.cursorPar()->isRightToLeftPar(bv->buffer()->params()))
+ return moveLeftIntern(bv, false, true, false);
else
- return moveRightIntern(bv, true, activate_inset, selecting);
+ return moveRightIntern(bv, true, true, false);
}
-Inset::RESULT
-InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
+dispatch_result InsetText::moveLeft(BufferView * bv)
{
- if (text_.cursor.par()->isRightToLeftPar(bv->buffer()->params))
- return moveRightIntern(bv, true, activate_inset, selecting);
+ if (text_.cursorPar()->isRightToLeftPar(bv->buffer()->params()))
+ return moveRightIntern(bv, true, true, false);
else
- return moveLeftIntern(bv, false, activate_inset, selecting);
+ return moveLeftIntern(bv, false, true, false);
}
-Inset::RESULT
+dispatch_result
InsetText::moveRightIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
}
-Inset::RESULT
+dispatch_result
InsetText::moveLeftIntern(BufferView * bv, bool front,
bool activate_inset, bool selecting)
{
}
-Inset::RESULT InsetText::moveUp(BufferView * bv)
+dispatch_result InsetText::moveUp(BufferView * bv)
{
- if (crow() == text_.rows().begin())
+ if (crow() == text_.firstRow())
return FINISHED_UP;
text_.cursorUp(bv);
text_.clearSelection();
}
-Inset::RESULT InsetText::moveDown(BufferView * bv)
+dispatch_result InsetText::moveDown(BufferView * bv)
{
- if (boost::next(crow()) == text_.rows().end())
+ if (crow() == text_.lastRow())
return FINISHED_DOWN;
text_.cursorDown(bv);
text_.clearSelection();
}
-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);
+ updateLocal(bv, 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;
}
-void InsetText::getLabelList(std::vector<string> & list) const
+void InsetText::getLabelList(Buffer const & buffer,
+ std::vector<string> & list) const
{
ParagraphList::const_iterator pit = paragraphs.begin();
ParagraphList::const_iterator pend = paragraphs.end();
InsetList::const_iterator beg = pit->insetlist.begin();
InsetList::const_iterator end = pit->insetlist.end();
for (; beg != end; ++beg)
- beg->inset->getLabelList(list);
+ beg->inset->getLabelList(buffer, list);
}
}
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());
+ text_.recUndo(text_.cursor.par());
if (selectall) {
text_.cursorTop();
text_.clearSelection();
bv->fitCursor();
-
- bool flag = (selectall || text_.selection.set());
-
- if (flag)
- updateLocal(bv, FULL, true);
- else
- updateLocal(bv, CURSOR_PAR, true);
+ updateLocal(bv, true);
}
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;
+ if (cpos() == cpar()->size())
+ return false;
+ InsetOld * inset = cpar()->getInset(cpos());
+ if (!isHighlyEditableInset(inset))
+ return false;
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
+ inset->dispatch(cmd);
+ if (!the_locking_inset)
+ return false;
+ updateLocal(bv, false);
+ return true;
}
bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
mouse_button::state button)
{
- 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
-}
-
-
-void InsetText::setParagraphData(ParagraphList const & plist)
-{
- // we have to unlock any locked inset otherwise we're in troubles
- the_locking_inset = 0;
-
- // But it it makes no difference that is a lot better.
-#warning FIXME.
- // See if this can be simplified when std::list is in effect.
- paragraphs.clear();
-
- ParagraphList::const_iterator it = plist.begin();
- ParagraphList::const_iterator end = plist.end();
- for (; it != end; ++it) {
- paragraphs.push_back(*it);
- Paragraph & tmp = paragraphs.back();
- tmp.setInsetOwner(this);
- }
-
- reinitLyXText();
- need_update = INIT;
+ if (!inset)
+ return false;
+ if (x < 0)
+ x = dim_.wid;
+ if (y < 0)
+ y = dim_.des;
+ inset_x = cx() - top_x;
+ inset_y = cy();
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
+ inset->dispatch(cmd);
+ if (!the_locking_inset)
+ return false;
+ updateLocal(bv, false);
+ return true;
}
void InsetText::markNew(bool track_changes)
{
ParagraphList::iterator pit = paragraphs.begin();
- ParagraphList::iterator pend = paragraphs.end();
- for (; pit != pend; ++pit) {
+ ParagraphList::iterator end = paragraphs.end();
+ for (; pit != end; ++pit) {
if (track_changes) {
pit->trackChanges();
} else {
clear(false);
for (unsigned int i = 0; i < data.length(); ++i)
paragraphs.begin()->insertChar(i, data[i], font);
- reinitLyXText();
}
void InsetText::setAutoBreakRows(bool flag)
{
- if (flag != autoBreakRows) {
- autoBreakRows = flag;
+ if (flag != autoBreakRows_) {
+ autoBreakRows_ = flag;
if (!flag)
removeNewlines();
- need_update = INIT;
}
}
-void InsetText::setDrawFrame(BufferView * bv, DrawFrame how)
+void InsetText::setDrawFrame(DrawFrame how)
{
- if (how != drawFrame_) {
- drawFrame_ = how;
- if (bv)
- updateLocal(bv, DRAW_FRAME, false);
- }
+ drawFrame_ = how;
}
-void InsetText::setFrameColor(BufferView * bv, LColor::color col)
+LColor_color InsetText::frameColor() const
{
- if (frame_color != col) {
- frame_color = col;
- if (bv)
- updateLocal(bv, DRAW_FRAME, false);
- }
+ return LColor::color(frame_color_);
}
-int InsetText::cx(BufferView * bv) const
+void InsetText::setFrameColor(LColor_color col)
{
- int x = text_.cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
- if (the_locking_inset) {
- LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
- text_.cursor.pos());
- if (font.isVisibleRightToLeft())
- x -= the_locking_inset->width();
- }
- return x;
+ frame_color_ = col;
}
-int InsetText::cix(BufferView * bv) const
+int InsetText::cx() const
{
- int x = text_.cursor.ix() + top_x + TEXT_TO_INSET_OFFSET;
+ int x = text_.cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
- text_.cursor.pos());
+ LyXFont font = text_.getFont(text_.cursorPar(), text_.cursor.pos());
if (font.isVisibleRightToLeft())
x -= the_locking_inset->width();
}
}
-int InsetText::ciy() const
-{
- return text_.cursor.iy() - dim_.asc + TEXT_TO_INSET_OFFSET;
-}
-
-
pos_type InsetText::cpos() const
{
return text_.cursor.pos();
ParagraphList::iterator InsetText::cpar() const
{
- return text_.cursor.par();
+ return text_.cursorPar();
}
void InsetText::setViewCache(BufferView const * bv) const
{
- if (bv)
+ if (bv) {
+ if (bv != text_.bv_owner) {
+ //lyxerr << "setting view cache from "
+ // << text_.bv_owner << " to " << bv << "\n";
+ text_.init(const_cast<BufferView *>(bv));
+ }
text_.bv_owner = const_cast<BufferView *>(bv);
+ }
}
}
-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_.init(bv);
- restoreLyXTextState();
- return;
- }
-
- if (!bv)
- return;
-
- 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(),
- const_cast<ParagraphList&>(paragraphs).end(),
- boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
-
- 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()) {
- 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;
- }
-}
-
-
-void InsetText::reinitLyXText() const
-{
- BufferView * bv = text_.bv_owner;
-
- if (!bv)
- return;
-
- saveLyXTextState();
-
- for_each(const_cast<ParagraphList&>(paragraphs).begin(),
- const_cast<ParagraphList&>(paragraphs).end(),
- boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
-
- 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()) {
- 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;
- }
-}
-
-
void InsetText::removeNewlines()
{
- bool changed = false;
-
ParagraphList::iterator it = paragraphs.begin();
ParagraphList::iterator end = paragraphs.end();
- for (; it != end; ++it) {
- for (int i = 0; i < it->size(); ++i) {
- if (it->isNewline(i)) {
- changed = true;
+ for (; it != end; ++it)
+ for (int i = 0; i < it->size(); ++i)
+ if (it->isNewline(i))
it->erase(i);
- }
- }
- }
- if (changed)
- reinitLyXText();
-}
-
-
-bool InsetText::nodraw() const
-{
- if (the_locking_inset)
- return the_locking_inset->nodraw();
- return UpdatableInset::nodraw();
}
}
-void InsetText::clearSelection(BufferView * bv)
+void InsetText::clearSelection(BufferView *)
{
- getLyXText(bv)->clearSelection();
+ text_.clearSelection();
}
h += ty;
ty = 0;
}
- if ((ty + h) > pain.paperHeight())
+ if (ty + h > pain.paperHeight())
h = pain.paperHeight();
- if ((top_x + drawTextXOffset + w) > pain.paperWidth())
+ if (top_x + w > pain.paperWidth())
w = pain.paperWidth();
pain.fillRectangle(start_x + 1, ty + 1, w - 3, h - 1, backgroundColor());
- need_update = FULL;
}
}
+LyXText * InsetText::getText(int i) const
+{
+ return (i == 0) ? const_cast<LyXText*>(&text_) : 0;
+}
+
+
LyXCursor const & InsetText::cursor(BufferView * bv) const
{
if (the_locking_inset)
}
-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;
}
getLyXText(bv)->selectSelectedWord();
- updateLocal(bv, SELECTION, false);
-}
-
-
-void InsetText::toggleSelection(BufferView * bv, bool kill_selection)
-{
- if (the_locking_inset) {
- the_locking_inset->toggleSelection(bv, kill_selection);
- }
-
- int x = top_x + TEXT_TO_INSET_OFFSET;
-
- 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)) {
- y += rowit->height();
- ++rowit;
- }
- if (y_offset < 0)
- y_offset = y;
-
- if (need_update & SELECTION)
- need_update = NONE;
- bv->screen().toggleSelection(&text_, bv, kill_selection, y_offset, x);
+ updateLocal(bv, false);
}
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))
locked = true;
text_.cursor = cur;
text_.setSelectionRange(length);
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, 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))
locked = true;
text_.cursor = cur;
text_.setSelectionRange(str.length());
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, false);
}
- return (result != lyxfind::SR_NOT_FOUND);
+ return result != lyx::find::SR_NOT_FOUND;
}
+
bool InsetText::searchBackward(BufferView * bv, string const & str,
bool cs, bool mw)
{
return true;
}
if (!locked) {
- ParagraphList::iterator pit = paragraphs.begin();
- ParagraphList::iterator pend = paragraphs.end();
-
- while (boost::next(pit) != pend)
- ++pit;
-
- text_.setCursor(pit, pit->size());
+ text_.setCursor(paragraphs.size() - 1, paragraphs.back().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))
locked = true;
text_.cursor = cur;
text_.setSelectionRange(str.length());
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, false);
}
- return (result != lyxfind::SR_NOT_FOUND);
+ return result != lyx::find::SR_NOT_FOUND;
}
bool InsetText::checkInsertChar(LyXFont & font)
{
- if (owner())
- return owner()->checkInsertChar(font);
- return true;
+ return owner() ? owner()->checkInsertChar(font) : true;
}
void InsetText::collapseParagraphs(BufferView * 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();
-
- if (!first_par->empty() &&
- !next_par->empty() &&
- !first_par->isSeparator(first_par_size - 1)) {
- first_par->insertChar(first_par_size, ' ');
+ ParagraphList::iterator const first = paragraphs.begin();
+ ParagraphList::iterator second = first;
+ advance(second, 1);
+ 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() == next_par) {
- text_.selection.start.par(first_par);
- text_.selection.start.pos(
- text_.selection.start.pos() + first_par_size);
+ 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() == next_par) {
- text_.selection.end.par(first_par);
- text_.selection.end.pos(
- text_.selection.end.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_par);
+ mergeParagraph(bv->buffer()->params(), paragraphs, first);
}
- reinitLyXText();
}
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, boost::prior(ins));
ParagraphList::iterator pend = plist.end();
- for (; pit != pend; ++pit) {
+ for (; pit != pend; ++pit)
paragraphs.push_back(*pit);
- }
-
- 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();
for (; pit != pend; ++pit) {
InsetList::const_iterator it = pit->insetlist.begin();
InsetList::const_iterator end = pit->insetlist.end();
- for (; it != end; ++it) {
+ for (; it != end; ++it)
it->inset->addPreview(loader);
- }
}
}
projects / lyx.git / blobdiff