#include "frontends/Clipboard.h"
#include "frontends/Painter.h"
#include "frontends/Selection.h"
-#include "frontends/nullpainter.h"
#include <sstream>
#include <iostream>
#include <limits>
-using lyx::docstring;
-using lyx::Point;
-using lyx::cap::dirtyTabularStack;
-using lyx::cap::tabularStackDirty;
+namespace lyx {
-using lyx::graphics::PreviewLoader;
+using cap::dirtyTabularStack;
+using cap::tabularStackDirty;
-using lyx::support::ltrim;
+using graphics::PreviewLoader;
-using lyx::frontend::Painter;
-using lyx::frontend::Clipboard;
+using support::ltrim;
+
+using frontend::Painter;
+using frontend::Clipboard;
using boost::shared_ptr;
using std::swap;
using std::vector;
-namespace Alert = lyx::frontend::Alert;
+namespace Alert = frontend::Alert;
namespace {
}
-bool InsetTabular::hasPasteBuffer() const
-{
- return (paste_tabular.get() != 0);
-}
-
-
InsetTabular::InsetTabular(Buffer const & buf, row_type rows,
col_type columns)
: tabular(buf.params(), max(rows, row_type(1)),
}
-void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
{
//lyxerr << "InsetTabular::metrics: " << mi.base.bv << " width: " <<
// mi.base.textwidth << "\n";
dim.asc = tabular.getAscentOfRow(0);
dim.des = tabular.getHeightOfTabular() - dim.asc;
dim.wid = tabular.getWidthOfTabular() + 2 * ADD_TO_TABULAR_WIDTH;
+ bool const changed = dim_ != dim;
dim_ = dim;
+ return changed;
}
//lyxerr << "InsetTabular::draw: " << x << " " << y << endl;
BufferView * bv = pi.base.bv;
- static lyx::frontend::NullPainter nop;
- static PainterInfo nullpi(bv, nop);
-
- //resetPos(bv->cursor());
+ resetPos(bv->cursor());
x += scx_;
x += ADD_TO_TABULAR_WIDTH;
|| nx > bv->workWidth()
|| y + d < 0
|| y - a > bv->workHeight()) {
- cell(idx)->draw(nullpi, cx, y);
- drawCellLines(nop, nx, y, i, idx, pi.erased_);
+ pi.pain.setDrawingEnabled(false);
+ cell(idx)->draw(pi, cx, y);
+ drawCellLines(pi.pain, nx, y, i, idx, pi.erased_);
+ pi.pain.setDrawingEnabled(true);
} else {
cell(idx)->draw(pi, cx, y);
drawCellLines(pi.pain, nx, y, i, idx, pi.erased_);
cur.pit() = 0;
cur.pos() = cur.lastpos(); // FIXME crude guess
}
- // this accesses the position cache before it is initialized
+ // FIXME: this accesses the position cache before it is initialized
//resetPos(cur);
//cur.bv().fitCursor();
}
case LFUN_MOUSE_PRESS:
//lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
- if (cmd.button() == mouse_button::button1
- || cmd.button() == mouse_button::button3) {
+ if (cmd.button() == mouse_button::button1
+ || (cmd.button() == mouse_button::button3
+ && (&bvcur.selBegin().inset() != this || !tablemode(bvcur)))) {
+ if (!bvcur.selection() && !cur.bv().mouseSetCursor(cur))
+ cur.noUpdate();
cur.selection() = false;
setCursorFromCoordinates(cur, cmd.x, cmd.y);
- cur.resetAnchor();
- bvcur = cur;
+ cur.bv().mouseSetCursor(cur);
break;
}
if (cmd.button() == mouse_button::button2) {
- cmd = FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph");
+ if (bvcur.selection()) {
+ // See comment in LyXText::dispatch why we
+ // do this
+ // FIXME This does not use paste_tabular,
+ // another reason why paste_tabular should go.
+ cap::copySelectionToStack(bvcur);
+ cmd = FuncRequest(LFUN_PASTE, "0");
+ } else {
+ cmd = FuncRequest(LFUN_PRIMARY_SELECTION_PASTE,
+ "paragraph");
+ }
doDispatch(cur, cmd);
}
break;
if (cmd.button() == mouse_button::button1) {
// only accept motions to places not deeper nested than the real anchor
if (bvcur.anchor_.hasPart(cur)) {
+ // only update if selection changes
+ if (bvcur.idx() == cur.idx() &&
+ !(bvcur.anchor_.idx() == cur.idx() && bvcur.pos() != cur.pos()))
+ cur.noUpdate();
setCursorFromCoordinates(cur, cmd.x, cmd.y);
bvcur.setCursor(cur);
bvcur.selection() = true;
case LFUN_MOUSE_RELEASE:
//lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
- if (cmd.button() == mouse_button::button3)
+ if (cmd.button() == mouse_button::button1) {
+ if (bvcur.selection())
+ theSelection().haveSelection(true);
+ } else if (cmd.button() == mouse_button::button3)
InsetTabularMailer(*this).showDialog(&cur.bv());
break;
cell(cur.idx())->dispatch(cur, cmd);
if (!cur.result().dispatched()) {
isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
+ if (cmd.action == LFUN_CHAR_FORWARD_SELECT)
+ theSelection().haveSelection(cur.selection());
if (sl == cur.top())
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
else
cell(cur.idx())->dispatch(cur, cmd);
if (!cur.result().dispatched()) {
isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
+ if (cmd.action == LFUN_CHAR_BACKWARD_SELECT)
+ theSelection().haveSelection(cur.selection());
if (sl == cur.top())
cmd = FuncRequest(LFUN_FINISHED_LEFT);
else
if (tabular.row_of_cell(cur.idx()) != tabular.rows() - 1) {
cur.idx() = tabular.getCellBelow(cur.idx());
cur.pit() = 0;
- cur.pos() = cell(cur.idx())->getText(0)->x2pos(
- cur.pit(), 0, cur.targetX());
+ TextMetrics const & tm =
+ cur.bv().textMetrics(cell(cur.idx())->getText(0));
+ cur.pos() = tm.x2pos(cur.pit(), 0, cur.targetX());
+ if (cmd.action == LFUN_DOWN_SELECT)
+ theSelection().haveSelection(cur.selection());
}
if (sl == cur.top()) {
// we trick it to go to the RIGHT after leaving the
cur.idx() = tabular.getCellAbove(cur.idx());
cur.pit() = cur.lastpit();
LyXText const * text = cell(cur.idx())->getText(0);
- cur.pos() = text->x2pos(
- cur.pit(),
- text->paragraphs().back().rows().size()-1,
- cur.targetX());
+ TextMetrics const & tm = cur.bv().textMetrics(text);
+ ParagraphMetrics const & pm =
+ tm.parMetrics(cur.lastpit());
+ cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX());
+ if (cmd.action == LFUN_UP_SELECT)
+ theSelection().haveSelection(cur.selection());
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_UP);
break;
case LFUN_TABULAR_FEATURE:
- if (!tabularFeatures(cur, lyx::to_utf8(cmd.argument())))
+ if (!tabularFeatures(cur, to_utf8(cmd.argument())))
cur.undispatched();
break;
// insert file functions
- case LFUN_FILE_INSERT_ASCII_PARA:
- case LFUN_FILE_INSERT_ASCII: {
- // FIXME: We don't know the encoding of filenames
- string const tmpstr = getContentsOfAsciiFile(&cur.bv(), lyx::to_utf8(cmd.argument()), false);
+ case LFUN_FILE_INSERT_PLAINTEXT_PARA:
+ case LFUN_FILE_INSERT_PLAINTEXT: {
+ // FIXME UNICODE
+ string const tmpstr = getContentsOfPlaintextFile(&cur.bv(), to_utf8(cmd.argument()), false);
// FIXME: We don't know the encoding of the file
- if (!tmpstr.empty() && !insertAsciiString(cur.bv(), lyx::from_utf8(tmpstr), false))
+ if (!tmpstr.empty() && !insertPlaintextString(cur.bv(), from_utf8(tmpstr), false))
cur.undispatched();
break;
}
case LFUN_CLIPBOARD_PASTE:
case LFUN_PRIMARY_SELECTION_PASTE: {
docstring const clip = (cmd.action == LFUN_CLIPBOARD_PASTE) ?
- theClipboard().get() :
+ theClipboard().getAsText() :
theSelection().get();
if (clip.empty())
break;
- // pass to InsertAsciiString, but
+ // pass to InsertPlaintextString, but
// only if we have multi-cell content
- if (clip.find_first_of(lyx::from_ascii("\t\n")) != docstring::npos) {
- if (insertAsciiString(cur.bv(), clip, false)) {
+ if (clip.find_first_of(from_ascii("\t\n")) != docstring::npos) {
+ if (insertPlaintextString(cur.bv(), clip, false)) {
// content has been replaced,
// so cursor might be invalid
cur.pos() = cur.lastpos();
bvcur.setCursor(cur);
break;
}
- } else {
- // so that the clipboard is used and it goes on
- // to default
- // and executes LFUN_PRIMARY_SELECTION_PASTE in insettext!
- paste_tabular.reset();
- dirtyTabularStack(false);
}
- // fall through
+ // Let the cell handle normal text
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
}
case LFUN_PASTE:
- if (hasPasteBuffer() && tabularStackDirty()) {
+ if (tabularStackDirty() && theClipboard().isInternal()) {
recordUndoInset(cur, Undo::INSERT);
pasteSelection(cur);
break;
break;
}
- resetPos(cur);
+ // FIXME: this accesses the position cache before it is initialized
+ //resetPos(cur);
InsetTabularMailer(*this).updateDialog(&cur.bv());
}
int i = 0;
for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
string const tmp = tabularFeature[i].feature;
- if (tmp == lyx::to_utf8(cmd.argument()).substr(0, tmp.length())) {
+ if (tmp == to_utf8(cmd.argument()).substr(0, tmp.length())) {
action = tabularFeature[i].action;
break;
}
}
string const argument
- = ltrim(lyx::to_utf8(cmd.argument()).substr(tabularFeature[i].feature.length()));
+ = ltrim(to_utf8(cmd.argument()).substr(tabularFeature[i].feature.length()));
row_type sel_row_start = 0;
row_type sel_row_end = 0;
}
case LFUN_PASTE:
- if (tabularStackDirty()) {
+ if (tabularStackDirty() && theClipboard().isInternal()) {
status.enabled(true);
return true;
- }
+ } else
+ return cell(cur.idx())->getStatus(cur, cmd, status);
case LFUN_INSET_MODIFY:
if (translate(cmd.getArg(0)) == TABULAR_CODE) {
}
-int InsetTabular::latex(Buffer const & buf, ostream & os,
+int InsetTabular::latex(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
return tabular.latex(buf, os, runparams);
}
-int InsetTabular::plaintext(Buffer const & buf, lyx::odocstream & os,
+int InsetTabular::plaintext(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
int const dp = runparams.linelen ? runparams.depth : 0;
}
-int InsetTabular::docbook(Buffer const & buf, ostream & os,
+int InsetTabular::docbook(Buffer const & buf, odocstream & os,
OutputParams const & runparams) const
{
int ret = 0;
}
-void InsetTabular::cursorPos
- (CursorSlice const & sl, bool boundary, int & x, int & y) const
+void InsetTabular::cursorPos(BufferView const & bv,
+ CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- cell(sl.idx())->cursorPos(sl, boundary, x, y);
+ cell(sl.idx())->cursorPos(bv, sl, boundary, x, y);
// y offset correction
int const row = tabular.row_of_cell(sl.idx());
scx_ = 0;
}
- cur.needsUpdate();
-
- InsetTabularMailer(*this).updateDialog(&bv);
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
}
cur.pit() = cur.lastpit();
cur.pos() = cur.lastpos();
- resetPos(cur);
+
+ // FIXME: this accesses the position cache before it is initialized
+ //resetPos(cur);
}
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
- tabular.setAlignSpecial(cur.idx(),value,feature);
+ tabular.setAlignSpecial(cur.idx(), from_utf8(value), feature);
break;
case LyXTabular::APPEND_ROW:
case LyXTabular::LAST_ACTION:
break;
}
-
- InsetTabularMailer(*this).updateDialog(&bv);
}
paste_tabular->setRightLine(paste_tabular->getLastCellInRow(0),
true, true);
- lyx::odocstringstream os;
+ odocstringstream os;
OutputParams const runparams;
paste_tabular->plaintext(cur.buffer(), os, runparams, 0, true, '\t');
- theClipboard().put(os.str());
+ // Needed for the "Edit->Paste recent" menu and the system clipboard.
+ cap::copySelection(cur, os.str());
+
// mark tabular stack dirty
// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
// when we (hopefully) have a one-for-all paste mechanism.
- lyx::cap::dirtyTabularStack(true);
+ // This must be called after cap::copySelection.
+ dirtyTabularStack(true);
return true;
}
shared_ptr<InsetText> inset(
new InsetText(*paste_tabular->getCellInset(r1, c1)));
tabular.setCellInset(r2, c2, inset);
- inset->markNew();
+ // FIXME: change tracking (MG)
+ inset->setChange(Change(cur.buffer().params().trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
cur.pos() = 0;
}
}
= cell(tabular.getCellNumber(i, j));
if (cur.buffer().params().trackChanges)
// FIXME: Change tracking (MG)
- t->markErased(true);
+ t->setChange(Change(Change::DELETED));
else
t->clear();
}
if (cur.pos() > cur.lastpos())
cur.pos() = cur.lastpos();
cur.clearSelection();
+ theSelection().haveSelection(false);
}
{
BOOST_ASSERT(cur.depth() > 1);
Paragraph const & parentpar = cur[cur.depth() - 2].paragraph();
- LCursor::pos_type const parentpos = cur[cur.depth() - 2].pos();
+ pos_type const parentpos = cur[cur.depth() - 2].pos();
return parentpar.getFontSettings(cur.bv().buffer()->params(),
parentpos).language()->rightToLeft();
}
}
-void InsetTabular::markErased(bool erased)
+void InsetTabular::setChange(Change const & change)
{
for (idx_type idx = 0; idx < nargs(); ++idx)
- cell(idx)->markErased(erased);
+ cell(idx)->setChange(change);
+}
+
+
+void InsetTabular::acceptChanges()
+{
+ for (idx_type idx = 0; idx < nargs(); ++idx)
+ cell(idx)->acceptChanges();
+}
+
+
+void InsetTabular::rejectChanges()
+{
+ for (idx_type idx = 0; idx < nargs(); ++idx)
+ cell(idx)->rejectChanges();
}
}
-bool InsetTabular::insertAsciiString(BufferView & bv, docstring const & buf,
+bool InsetTabular::insertPlaintextString(BufferView & bv, docstring const & buf,
bool usePaste)
{
if (buf.length() <= 0)
return true;
+ Buffer const & buffer = *bv.buffer();
+
col_type cols = 1;
row_type rows = 1;
col_type maxCols = 1;
docstring::size_type p = 0;
while (p < len &&
- (p = buf.find_first_of(lyx::from_ascii("\t\n"), p)) != docstring::npos) {
+ (p = buf.find_first_of(from_ascii("\t\n"), p)) != docstring::npos) {
switch (buf[p]) {
case '\t':
++cols;
row_type row = 0;
if (usePaste) {
paste_tabular.reset(
- new LyXTabular(bv.buffer()->params(), rows, maxCols));
+ new LyXTabular(buffer.params(), rows, maxCols));
loctab = paste_tabular.get();
cols = 0;
dirtyTabularStack(true);
col_type const columns = loctab->columns();
while (cell < cells && p < len && row < rows &&
- (p = buf.find_first_of(lyx::from_ascii("\t\n"), p)) != docstring::npos)
+ (p = buf.find_first_of(from_ascii("\t\n"), p)) != docstring::npos)
{
if (p >= len)
break;
// we can only set this if we are not too far right
if (cols < columns) {
shared_ptr<InsetText> inset = loctab->getCellInset(cell);
- inset->setViewCache(&bv);
Paragraph & par = inset->text_.getPar(0);
- LyXFont const font = inset->text_.getFont(par, 0);
- inset->setText(buf.substr(op, p - op), font);
+ LyXFont const font = inset->text_.getFont(buffer, par, 0);
+ inset->setText(buf.substr(op, p - op), font,
+ buffer.params().trackChanges);
++cols;
++cell;
}
// we can only set this if we are not too far right
if (cols < columns) {
shared_ptr<InsetText> inset = tabular.getCellInset(cell);
- inset->setViewCache(&bv);
Paragraph & par = inset->text_.getPar(0);
- LyXFont const font = inset->text_.getFont(par, 0);
- inset->setText(buf.substr(op, p - op), font);
+ LyXFont const font = inset->text_.getFont(buffer, par, 0);
+ inset->setText(buf.substr(op, p - op), font,
+ buffer.params().trackChanges);
}
cols = ocol;
++row;
// check for the last cell if there is no trailing '\n'
if (cell < cells && op < len) {
shared_ptr<InsetText> inset = loctab->getCellInset(cell);
- inset->setViewCache(&bv);
Paragraph & par = inset->text_.getPar(0);
- LyXFont const font = inset->text_.getFont(par, 0);
- inset->setText(buf.substr(op, len - op), font);
+ LyXFont const font = inset->text_.getFont(buffer, par, 0);
+ inset->setText(buf.substr(op, len - op), font,
+ buffer.params().trackChanges);
}
return true;
}
data << "\\end_inset\n";
return data.str();
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff