#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "CutAndPaste.h"
#include "coordcache.h"
#include "debug.h"
#include "dispatchresult.h"
#include "ParagraphParameters.h"
#include "undo.h"
+#include "support/convert.h"
+
#include "frontends/Alert.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
#include <iostream>
#include <limits>
+using lyx::cap::tabularStackDirty;
+
using lyx::graphics::PreviewLoader;
using lyx::support::ltrim;
-using lyx::support::strToInt;
-using lyx::support::strToDbl;
using boost::shared_ptr;
{ LyXTabular::UNSET_ROTATE_CELL, "unset-rotate-cell" },
{ LyXTabular::SET_USEBOX, "set-usebox" },
{ LyXTabular::SET_LTHEAD, "set-lthead" },
+ { LyXTabular::UNSET_LTHEAD, "unset-lthead" },
{ LyXTabular::SET_LTFIRSTHEAD, "set-ltfirsthead" },
+ { LyXTabular::UNSET_LTFIRSTHEAD, "unset-ltfirsthead" },
{ LyXTabular::SET_LTFOOT, "set-ltfoot" },
+ { LyXTabular::UNSET_LTFOOT, "unset-ltfoot" },
{ LyXTabular::SET_LTLASTFOOT, "set-ltlastfoot" },
+ { LyXTabular::UNSET_LTLASTFOOT, "unset-ltlastfoot" },
{ LyXTabular::SET_LTNEWPAGE, "set-ltnewpage" },
{ LyXTabular::SET_SPECIAL_COLUMN, "set-special-column" },
{ LyXTabular::SET_SPECIAL_MULTI, "set-special-multi" },
InsetTabular::InsetTabular(Buffer const & buf, row_type rows,
col_type columns)
: tabular(buf.params(), max(rows, row_type(1)),
- max(columns, col_type(1))), buffer_(&buf), cursorx_(0)
+ max(columns, col_type(1))), buffer_(&buf), scx_(0)
{}
InsetTabular::InsetTabular(InsetTabular const & tab)
- : UpdatableInset(tab), tabular(tab.tabular),
- buffer_(tab.buffer_), cursorx_(0)
+ : InsetOld(tab), tabular(tab.tabular),
+ buffer_(tab.buffer_), scx_(0)
{}
int maxDesc = 0;
for (col_type j = 0; j < tabular.columns(); ++j) {
if (tabular.isPartOfMultiColumn(i, j))
+ // Multicolumn cell, but not first one
continue;
Dimension dim;
MetricsInfo m = mi;
- LyXLength p_width = tabular.column_info[j].p_width;
- if (!p_width.zero()) {
+ LyXLength p_width;
+ if (tabular.cell_info[i][j].multicolumn ==
+ LyXTabular::CELL_BEGIN_OF_MULTICOLUMN)
+ p_width = tabular.cellinfo_of_cell(cell).p_width;
+ else
+ p_width = tabular.column_info[j].p_width;
+ if (!p_width.zero())
m.base.textwidth = p_width.inPixels(mi.base.textwidth);
- }
tabular.getCellInset(cell)->metrics(m, dim);
+ if (!p_width.zero())
+ dim.wid = m.base.textwidth;
maxAsc = max(maxAsc, dim.asc);
maxDesc = max(maxDesc, dim.des);
tabular.setWidthOfCell(cell, dim.wid);
static NullPainter nop;
static PainterInfo nullpi(bv, nop);
- resetPos(bv->cursor());
+ //resetPos(bv->cursor());
- x += scroll();
+ x += scx_;
x += ADD_TO_TABULAR_WIDTH;
idx_type idx = 0;
|| y + d < 0
|| y - a > bv->workHeight()) {
cell(idx)->draw(nullpi, cx, y);
- drawCellLines(nop, nx, y, i, idx);
+ drawCellLines(nop, nx, y, i, idx, pi.erased_);
} else {
cell(idx)->draw(pi, cx, y);
- drawCellLines(pi.pain, nx, y, i, idx);
+ drawCellLines(pi.pain, nx, y, i, idx, pi.erased_);
}
nx += tabular.getWidthOfColumn(idx);
++idx;
if (!ptr_cmp(&cur.inset(), this))
return;
- resetPos(cur);
+ //resetPos(cur);
- x += scroll();
- x += ADD_TO_TABULAR_WIDTH;
+ x += scx_ + ADD_TO_TABULAR_WIDTH;
if (tablemode(cur)) {
row_type rs, re;
col_type cs, ce;
getSelection(cur, rs, re, cs, ce);
+ y -= tabular.getAscentOfRow(0);
for (row_type j = 0; j < tabular.rows(); ++j) {
int const a = tabular.getAscentOfRow(j);
int const h = a + tabular.getDescentOfRow(j);
tabular.getCellNumber(j, i);
int const w = tabular.getWidthOfColumn(cell);
if (i >= cs && i <= ce && j >= rs && j <= re)
- pi.pain.fillRectangle(xx, y - a, w, h,
+ pi.pain.fillRectangle(xx, y, w, h,
LColor::selection);
xx += w;
void InsetTabular::drawCellLines(Painter & pain, int x, int y,
- row_type row, idx_type cell) const
+ row_type row, idx_type cell, bool erased) const
{
int x2 = x + tabular.getWidthOfColumn(cell);
bool on_off = false;
+ LColor::color col = LColor::tabularline;
+ LColor::color onoffcol = LColor::tabularonoffline;
+
+ if (erased) {
+ col = LColor::strikeout;
+ onoffcol = LColor::strikeout;
+ }
if (!tabular.topAlreadyDrawn(cell)) {
on_off = !tabular.topLine(cell);
pain.line(x, y - tabular.getAscentOfRow(row),
x2, y - tabular.getAscentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular.bottomLine(cell);
pain.line(x, y + tabular.getDescentOfRow(row),
x2, y + tabular.getDescentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
if (!tabular.leftAlreadyDrawn(cell)) {
on_off = !tabular.leftLine(cell);
pain.line(x, y - tabular.getAscentOfRow(row),
x, y + tabular.getDescentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular.rightLine(cell);
y - tabular.getAscentOfRow(row),
x2 - tabular.getAdditionalWidth(cell),
y + tabular.getDescentOfRow(row),
- on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? onoffcol : col,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
}
-InsetBase * InsetTabular::editXY(LCursor & cur, int x, int y) const
-{
- //lyxerr << "InsetTabular::editXY: " << this << endl;
- cur.selection() = false;
- cur.push(const_cast<InsetTabular&>(*this));
- return setPos(cur, x, y);
- //int xx = cursorx_ - xo() + tabular.getBeginningOfTextInCell(cur.idx());
-}
-
-
void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
{
- lyxerr << "# InsetTabular::dispatch: cmd: " << cmd << endl;
- //lyxerr << " cur:\n" << cur << endl;
+ lyxerr[Debug::DEBUG] << "# InsetTabular::doDispatch: cmd: " << cmd
+ << "\n cur:" << cur << endl;
CursorSlice sl = cur.top();
LCursor & bvcur = cur.bv().cursor();
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
+ //lyxerr << "# InsetTabular::MousePress\n" << cur.bv().cursor() << endl;
if (cmd.button() == mouse_button::button1) {
cur.selection() = false;
- setPos(cur, cmd.x, cmd.y);
+ setCursorFromCoordinates(cur, cmd.x, cmd.y);
cur.resetAnchor();
bvcur = cur;
break;
}
- //if (cmd.button() == mouse_button::button2)
- // dispatch(cur, FuncRequest(LFUN_PASTESELECTION, "paragraph"));
+ if (cmd.button() == mouse_button::button2) {
+ // FIXME: pasting multiple cells (with insettabular's own
+ // LFUN_PASTESELECTION still does not work! (jspitzm)
+ cmd = FuncRequest(LFUN_PASTESELECTION, "paragraph");
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
+ }
// we'll pop up the table dialog on release
if (cmd.button() == mouse_button::button3)
break;
case LFUN_MOUSE_MOTION:
- lyxerr << "# InsetTabular::MouseMotion\n" << bvcur << endl;
+ //lyxerr << "# InsetTabular::MouseMotion\n" << bvcur << endl;
if (cmd.button() == mouse_button::button1) {
// only accept motions to places not deeper nested than the real anchor
if (bvcur.anchor_.hasPart(cur)) {
- setPos(cur, cmd.x, cmd.y);
+ setCursorFromCoordinates(cur, cmd.x, cmd.y);
bvcur.setCursor(cur);
bvcur.selection() = true;
} else
break;
case LFUN_MOUSE_RELEASE:
- lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
+ //lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
if (cmd.button() == mouse_button::button3)
InsetTabularMailer(*this).showDialog(&cur.bv());
break;
cur.selection() = false;
break;
- case LFUN_SCROLL_INSET:
- if (cmd.argument.empty())
- break;
- if (cmd.argument.find('.') != cmd.argument.npos)
- scroll(cur.bv(), static_cast<float>(strToDbl(cmd.argument)));
- else
- scroll(cur.bv(), strToInt(cmd.argument));
- break;
-
case LFUN_RIGHTSEL:
case LFUN_RIGHT:
cell(cur.idx())->dispatch(cur, cmd);
- cur.dispatched(); // override the cell's decision
- if (sl == cur.top())
+ if (!cur.result().dispatched()) {
isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
- if (sl == cur.top()) {
- cmd = FuncRequest(LFUN_FINISHED_RIGHT);
- cur.undispatched();
- resetPos(cur);
+ if (sl == cur.top())
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ else
+ cur.dispatched();
}
break;
case LFUN_LEFTSEL:
case LFUN_LEFT:
cell(cur.idx())->dispatch(cur, cmd);
- cur.dispatched(); // override the cell's decision
- if (sl == cur.top())
+ if (!cur.result().dispatched()) {
isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
- if (sl == cur.top()) {
- cmd = FuncRequest(LFUN_FINISHED_LEFT);
- cur.undispatched();
- resetPos(cur);
+ if (sl == cur.top())
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ else
+ cur.dispatched();
}
break;
cell(cur.idx())->dispatch(cur, cmd);
cur.dispatched(); // override the cell's decision
if (sl == cur.top())
+ // if our LyXText didn't do anything to the cursor
+ // then we try to put the cursor into the cell below
+ // setting also the right targetX.
if (tabular.row_of_cell(cur.idx()) != tabular.rows() - 1) {
cur.idx() = tabular.getCellBelow(cur.idx());
cur.pit() = 0;
- cur.pos() = 0;
- resetPos(cur);
+ cur.pos() = cell(cur.idx())->getText(0)->x2pos(
+ cur.pit(), 0, cur.targetX());
}
if (sl == cur.top()) {
- cmd = FuncRequest(LFUN_FINISHED_DOWN);
+ // we trick it to go to the RIGHT after leaving the
+ // tabular.
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
cur.undispatched();
- resetPos(cur);
}
break;
cell(cur.idx())->dispatch(cur, cmd);
cur.dispatched(); // override the cell's decision
if (sl == cur.top())
+ // if our LyXText didn't do anything to the cursor
+ // then we try to put the cursor into the cell above
+ // setting also the right targetX.
if (tabular.row_of_cell(cur.idx()) != 0) {
cur.idx() = tabular.getCellAbove(cur.idx());
cur.pit() = cur.lastpit();
- cur.pos() = cur.lastpos();
- resetPos(cur);
+ LyXText const * text = cell(cur.idx())->getText(0);
+ cur.pos() = text->x2pos(
+ cur.pit(),
+ text->paragraphs().back().rows().size()-1,
+ cur.targetX());
}
if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_UP);
cur.undispatched();
- resetPos(cur);
}
break;
// }
// cur.par() = 0;
// cur.pos() = 0;
-// resetPos(cur);
// break;
// }
//
// }
// cur.par() = cur.lastpar();
// cur.pos() = cur.lastpos();
-// resetPos(cur);
// break;
// }
}
case LFUN_CUT:
- if (copySelection(cur)) {
- recordUndo(cur, Undo::DELETE);
- cutSelection(cur);
+ if (tablemode(cur)) {
+ if (copySelection(cur)) {
+ recordUndoInset(cur, Undo::DELETE);
+ cutSelection(cur);
+ }
}
+ else
+ cell(cur.idx())->dispatch(cur, cmd);
break;
case LFUN_BACKSPACE:
case LFUN_DELETE:
- recordUndo(cur, Undo::DELETE);
- if (tablemode(cur))
+ if (tablemode(cur)) {
+ recordUndoInset(cur, Undo::DELETE);
cutSelection(cur);
+ }
else
cell(cur.idx())->dispatch(cur, cmd);
break;
case LFUN_COPY:
if (!cur.selection())
break;
- finishUndo();
- copySelection(cur);
+ if (tablemode(cur)) {
+ finishUndo();
+ copySelection(cur);
+ } else
+ cell(cur.idx())->dispatch(cur, cmd);
break;
case LFUN_PASTESELECTION: {
}
case LFUN_PASTE:
- if (hasPasteBuffer()) {
- recordUndo(cur, Undo::INSERT);
+ if (hasPasteBuffer() && tabularStackDirty()) {
+ recordUndoInset(cur, Undo::INSERT);
pasteSelection(cur);
break;
}
cell(cur.idx())->dispatch(cur, cmd);
break;
+ case LFUN_EMPH:
+ case LFUN_BOLD:
+ case LFUN_ROMAN:
+ case LFUN_NOUN:
+ case LFUN_ITAL:
+ case LFUN_FRAK:
+ case LFUN_CODE:
+ case LFUN_SANS:
+ case LFUN_FREEFONT_APPLY:
+ case LFUN_FREEFONT_UPDATE:
+ case LFUN_FONT_SIZE:
+ case LFUN_UNDERLINE:
+ case LFUN_LANGUAGE:
+ case LFUN_CAPITALIZE_WORD:
+ case LFUN_UPCASE_WORD:
+ case LFUN_LOWCASE_WORD:
+ case LFUN_TRANSPOSE_CHARS:
+ if (tablemode(cur)) {
+ row_type rs, re;
+ col_type cs, ce;
+ getSelection(cur, rs, re, cs, ce);
+ for (row_type i = rs; i <= re; ++i) {
+ for (col_type j = cs; j <= ce; ++j) {
+ // cursor follows cell:
+ cur.idx() = tabular.getCellNumber(i, j);
+ // select this cell only:
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.pos() = cur.top().lastpos();
+ cur.setCursor(cur);
+ cur.setSelection();
+ cell(cur.idx())->dispatch(cur, cmd);
+ }
+ }
+ // Restore original selection
+ cur.idx() = tabular.getCellNumber(rs, cs);
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.idx() = tabular.getCellNumber(re, ce);
+ cur.pos() = cur.top().lastpos();
+ cur.setCursor(cur);
+ cur.setSelection();
+ break;
+ } else {
+ cell(cur.idx())->dispatch(cur, cmd);
+ break;
+ }
default:
// we try to handle this event in the insets dispatch function.
cell(cur.idx())->dispatch(cur, cmd);
break;
}
+ resetPos(cur);
InsetTabularMailer(*this).updateDialog(&cur.bv());
}
break;
case LyXTabular::SET_USEBOX:
- status.setOnOff(strToInt(argument) == tabular.getUsebox(cur.idx()));
+ status.setOnOff(convert<int>(argument) == tabular.getUsebox(cur.idx()));
break;
case LyXTabular::SET_LTFIRSTHEAD:
status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTFIRSTHEAD:
+ status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTHEAD:
status.setOnOff(tabular.getRowOfLTHead(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTHEAD:
+ status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTFOOT:
status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTFOOT:
+ status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTLASTFOOT:
status.setOnOff(tabular.getRowOfLTFoot(sel_row_start, dummyltt));
break;
+ case LyXTabular::UNSET_LTLASTFOOT:
+ status.setOnOff(!tabular.getRowOfLTFoot(sel_row_start, dummyltt));
+ break;
+
case LyXTabular::SET_LTNEWPAGE:
status.setOnOff(tabular.getLTNewPage(sel_row_start));
break;
return true;
}
+ // These are only enabled inside tabular
+ case LFUN_CELL_BACKWARD:
+ case LFUN_CELL_FORWARD:
+ status.enabled(true);
+ return true;
+
+ // disable these with multiple cells selected
+ case LFUN_INSET_INSERT:
+ case LFUN_TABULAR_INSERT:
+ case LFUN_INSERT_CHARSTYLE:
+ case LFUN_INSET_FLOAT:
+ case LFUN_INSET_WIDE_FLOAT:
+ case LFUN_INSET_FOOTNOTE:
+ case LFUN_INSET_MARGINAL:
+ case LFUN_INSERT_MATH:
+ case LFUN_MATH_MODE:
+ case LFUN_MATH_MUTATE:
+ case LFUN_MATH_DISPLAY:
+ case LFUN_INSERT_NOTE:
+ case LFUN_INSET_OPTARG:
+ case LFUN_INSERT_BOX:
+ case LFUN_INSERT_BRANCH:
+ case LFUN_INSET_WRAP:
+ case LFUN_INSET_ERT: {
+ if (tablemode(cur)) {
+ status.enabled(false);
+ return true;
+ } else
+ return cell(cur.idx())->getStatus(cur, cmd, status);
+ }
+
+ // disable in non-fixed-width cells
+ case LFUN_BREAKLINE:
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+ case LFUN_BREAKPARAGRAPH_SKIP: {
+ if (tabular.getPWidth(cur.idx()).zero()) {
+ status.enabled(false);
+ return true;
+ } else
+ return cell(cur.idx())->getStatus(cur, cmd, status);
+ }
+
+ case LFUN_INSET_MODIFY:
+ if (translate(cmd.getArg(0)) == TABULAR_CODE) {
+ status.enabled(true);
+ return true;
+ }
+ // Fall through
+
default:
// we try to handle this event in the insets dispatch function.
return cell(cur.idx())->getStatus(cur, cmd, status);
}
-void InsetTabular::getCursorPos(CursorSlice const & sl, int & x, int & y) const
+void InsetTabular::cursorPos
+ (CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- cell(sl.idx())->getCursorPos(sl, x, y);
+ cell(sl.idx())->cursorPos(sl, boundary, x, y);
// y offset correction
int const row = tabular.row_of_cell(sl.idx());
}
x += tabular.getBeginningOfTextInCell(idx);
x += ADD_TO_TABULAR_WIDTH;
- x += scroll();
+ x += scx_;
}
-namespace {
-
-
-// Manhattan distance to nearest corner
-int dist(InsetOld const & inset, int x, int y)
+int InsetTabular::dist(idx_type const cell, int x, int y) const
{
int xx = 0;
int yy = 0;
- Point o = theCoords.insets_.xy(&inset);
- int const xo = o.x_;
- int const yo = o.y_;
-
- if (x < xo)
- xx = xo - x;
- else if (x > xo + inset.width())
- xx = x - xo - inset.width();
-
- if (y < yo - inset.ascent())
- yy = yo - inset.ascent() - y;
- else if (y > yo + inset.descent())
- yy = y - yo - inset.descent();
-
- lyxerr << " xo_=" << xo << " yo_=" << yo
- << " width_=" << inset.width() << " ascent=" << inset.ascent()
- << " descent=" << inset.descent()
- << " dist=" << xx + yy << endl;
+ InsetBase const & inset = *tabular.getCellInset(cell);
+ Point o = theCoords.getInsets().xy(&inset);
+ int const xbeg = o.x_ - tabular.getBeginningOfTextInCell(cell);
+ int const xend = xbeg + tabular.getWidthOfColumn(cell);
+ int const ybeg = o.y_ - inset.ascent();
+ row_type const row = tabular.row_of_cell(cell);
+ int const rowheight = tabular.getAscentOfRow(row)
+ + tabular.getDescentOfRow(row)
+ + tabular.getAdditionalHeight(row);
+ int const yend = ybeg + rowheight;
+
+ if (x < xbeg)
+ xx = xbeg - x;
+ else if (x > xend)
+ xx = x - xend;
+
+ if (y < ybeg)
+ yy = ybeg - y;
+ else if (y > yend)
+ yy = y - yend;
+
+ //lyxerr << " xbeg=" << xbeg << " xend=" << xend
+ // << " ybeg=" << ybeg << " yend=" << yend
+ // << " xx=" << xx << " yy=" << yy
+ // << " dist=" << xx + yy << endl;
return xx + yy;
}
-} //namespace anon
+InsetBase * InsetTabular::editXY(LCursor & cur, int x, int y)
+{
+ //lyxerr << "InsetTabular::editXY: " << this << endl;
+ cur.selection() = false;
+ cur.push(*this);
+ cur.idx() = getNearestCell(x, y);
+ resetPos(cur);
+ return cell(cur.idx())->text_.editXY(cur, x, y);
+}
-InsetBase * InsetTabular::setPos(LCursor & cur, int x, int y) const
+void InsetTabular::setCursorFromCoordinates(LCursor & cur, int x, int y) const
+{
+ cur.idx() = getNearestCell(x, y);
+ cell(cur.idx())->text_.setCursorFromCoordinates(cur, x, y);
+}
+
+
+InsetTabular::idx_type InsetTabular::getNearestCell(int x, int y) const
{
- lyxerr << "# InsetTabular::setPos() x=" << x << " y=" << y << endl;
idx_type idx_min = 0;
int dist_min = std::numeric_limits<int>::max();
- for (idx_type i = 0; i < nargs(); ++i) {
- if (theCoords.insets_.has(tabular.getCellInset(i).get())) {
- int d = dist(*tabular.getCellInset(i), x, y);
+ for (idx_type i = 0, n = nargs(); i != n; ++i) {
+ if (theCoords.getInsets().has(tabular.getCellInset(i).get())) {
+ int const d = dist(i, x, y);
if (d < dist_min) {
dist_min = d;
idx_min = i;
}
}
}
- cur.idx() = idx_min;
- //lyxerr << "# InsetTabular::setPos()\n" << cur << endl;
- resetPos(cur);
- return cell(cur.idx())->text_.editXY(cur, x, y);
+ return idx_min;
}
void InsetTabular::resetPos(LCursor & cur) const
{
BufferView & bv = cur.bv();
-// col_type const actcol = tabular.column_of_cell(cur.idx());
-// int const offset = ADD_TO_TABULAR_WIDTH + 2;
-// int const new_x = getCellXPos(cur.idx()) + offset;
-// int const old_x = cursorx_;
-// int const col_width = tabular.getWidthOfColumn(cur.idx());
-// cursorx_ = new_x;
-// cursor.x(getCellXPos(cur.idx()) + offset);
-// if (actcol < tabular.columns() - 1 && scroll(false) &&
-// tabular.getWidthOfTabular() < bv.workWidth()-20)
-// {
-// scroll(bv, 0.0F);
-// } else if (cursorx_ - offset > 20 &&
-// cursorx_ - offset + col_width > bv.workWidth() - 20) {
-// scroll(bv, - col_width - 20);
-// } else if (cursorx_ - offset < 20) {
-// scroll(bv, 20 - cursorx_ + offset);
-// } else if (scroll() && xo() > 20 &&
-// xo() + tabular.getWidthOfTabular() > bv.workWidth() - 20) {
-// scroll(bv, old_x - cursorx_);
-// }
+ int const maxwidth = bv.workWidth();
if (&cur.inset() != this) {
- scroll(bv, 0.0F);
+ scx_ = 0;
} else {
int const X1 = 0;
- int const X2 = bv.workWidth();
+ int const X2 = maxwidth;
int const offset = ADD_TO_TABULAR_WIDTH + 2;
- int const x1 = xo() + scroll() + getCellXPos(cur.idx()) + offset;
+ int const x1 = xo() + getCellXPos(cur.idx()) + offset;
int const x2 = x1 + tabular.getWidthOfColumn(cur.idx());
if (x1 < X1)
- scroll(bv, X1 + 20 - x1);
+ scx_ = X1 + 20 - x1;
else if (x2 > X2)
- scroll(bv, X2 - 20 - x2);
+ scx_ = X2 - 20 - x2;
+ else
+ scx_ = 0;
}
cur.needsUpdate();
void InsetTabular::moveNextCell(LCursor & cur)
{
- lyxerr << "InsetTabular::moveNextCell 1 cur: " << cur.top() << endl;
if (isRightToLeft(cur)) {
- lyxerr << "InsetTabular::moveNextCell A cur: " << endl;
if (tabular.isFirstCellInRow(cur.idx())) {
row_type const row = tabular.row_of_cell(cur.idx());
if (row == tabular.rows() - 1)
--cur.idx();
}
} else {
- lyxerr << "InsetTabular::moveNextCell B cur: " << endl;
if (tabular.isLastCell(cur.idx()))
return;
++cur.idx();
}
cur.pit() = 0;
cur.pos() = 0;
- lyxerr << "InsetTabular::moveNextCell 2 cur: " << cur.top() << endl;
resetPos(cur);
}
return;
--cur.idx();
}
- cur.pit() = 0;
- cur.pos() = 0;
+ cur.pit() = cur.lastpit();
+ cur.pos() = cur.lastpos();
resetPos(cur);
}
break;
}
- recordUndo(cur, Undo::ATOMIC);
+ recordUndoInset(cur, Undo::ATOMIC);
getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
row_type const row = tabular.row_of_cell(cur.idx());
case LyXTabular::SET_PWIDTH: {
LyXLength const len(value);
- tabular.setColumnPWidth(cur.idx(), len);
+ tabular.setColumnPWidth(cur, cur.idx(), len);
if (len.zero()
&& tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
tabularFeatures(cur, LyXTabular::ALIGN_CENTER, string());
- else if (!len.zero()
- && tabular.getAlignment(cur.idx(), true) != LYX_ALIGN_BLOCK)
- tabularFeatures(cur, LyXTabular::ALIGN_BLOCK, string());
break;
}
case LyXTabular::SET_MPWIDTH:
- tabular.setMColumnPWidth(cur.idx(), LyXLength(value));
+ tabular.setMColumnPWidth(cur, cur.idx(), LyXLength(value));
break;
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
tabular.appendColumn(bv.buffer()->params(), cur.idx());
+ cur.idx() = tabular.getCellNumber(row, column);
break;
case LyXTabular::DELETE_ROW:
break;
case LyXTabular::SET_USEBOX: {
- LyXTabular::BoxType val = LyXTabular::BoxType(strToInt(value));
+ LyXTabular::BoxType val = LyXTabular::BoxType(convert<int>(value));
if (val == tabular.getUsebox(cur.idx()))
val = LyXTabular::BOX_NONE;
for (row_type i = sel_row_start; i <= sel_row_end; ++i)
OutputParams const runparams;
paste_tabular->plaintext(cur.buffer(), os, runparams, 0, true, '\t');
cur.bv().stuffClipboard(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);
+
return true;
}
--c1;
continue;
}
- shared_ptr<InsetText> inset = tabular.getCellInset(r2, c2);
- inset = paste_tabular->getCellInset(r1, c1);
+ shared_ptr<InsetText> inset(
+ new InsetText(*paste_tabular->getCellInset(r1, c1)));
+ tabular.setCellInset(r2, c2, inset);
inset->markNew();
+ cur.pos() = 0;
}
}
return true;
if (!cur.selection())
return;
- bool const track = cur.buffer().params().tracking_changes;
row_type rs, re;
col_type cs, ce;
getSelection(cur, rs, re, cs, ce);
- for (row_type i = rs; i <= re; ++i)
- for (col_type j = cs; j <= ce; ++j)
- cell(tabular.getCellNumber(i, j))->clear(track);
+ for (row_type i = rs; i <= re; ++i) {
+ for (col_type j = cs; j <= ce; ++j) {
+ shared_ptr<InsetText> t
+ = cell(tabular.getCellNumber(i, j));
+ if (cur.buffer().params().tracking_changes)
+ t->markErased(true);
+ else
+ t->clear();
+ }
+ }
// cursor position might be invalid now
cur.pos() = cur.lastpos();
bool InsetTabular::isRightToLeft(LCursor & cur) const
{
- BOOST_ASSERT(cur.size() > 1);
- Paragraph const & parentpar = cur[cur.size() - 2].paragraph();
- LCursor::pos_type const parentpos = cur[cur.size() - 2].pos();
+ BOOST_ASSERT(cur.depth() > 1);
+ Paragraph const & parentpar = cur[cur.depth() - 2].paragraph();
+ LCursor::pos_type const parentpos = cur[cur.depth() - 2].pos();
return parentpar.getFontSettings(cur.bv().buffer()->params(),
parentpos).language()->RightToLeft();
}
}
-size_t InsetTabular::nargs() const
-{
- return tabular.getNumberOfCells();
-}
-
-
LyXText * InsetTabular::getText(int idx) const
{
return size_t(idx) < nargs() ? cell(idx)->getText(0) : 0;
}
-void InsetTabular::markErased()
+void InsetTabular::markErased(bool erased)
{
for (idx_type idx = 0; idx < nargs(); ++idx)
- cell(idx)->markErased();
+ cell(idx)->markErased(erased);
}
-bool InsetTabular::forceDefaultParagraphs(InsetBase const *) const
+bool InsetTabular::forceDefaultParagraphs(idx_type cell) const
{
-#if 0
- idx_type const cell = tabular.getCellFromInset(in);
- // FIXME: getCellFromInset() returns now always a valid cell, so
- // the stuff below can be deleted, and instead we have:
return tabular.getPWidth(cell).zero();
-
- if (cell != npos)
- return tabular.getPWidth(cell).zero();
-
- // this is a workaround for a crash (New, Insert->Tabular,
- // Insert->FootNote)
- if (!owner())
- return false;
-
- // well we didn't obviously find it so maybe our owner knows more
- BOOST_ASSERT(owner());
- return owner()->forceDefaultParagraphs(in);
-#endif
- return false;
}
projects / lyx.git / blobdiff