#include "insettabular.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
+#include "cursor.h"
#include "debug.h"
+#include "dispatchresult.h"
#include "funcrequest.h"
#include "FuncStatus.h"
#include "gettext.h"
#include "language.h"
+#include "LColor.h"
#include "lyx_cb.h"
#include "lyxlex.h"
#include "metricsinfo.h"
+#include "outputparams.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
-#include "undo_funcs.h"
-#include "WordLangTuple.h"
+#include "undo.h"
#include "frontends/Alert.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
-#include "support/LAssert.h"
-
#include "support/std_sstream.h"
-using namespace lyx::support;
-using namespace lyx::graphics;
+#include <iostream>
+
+using lyx::graphics::PreviewLoader;
+using lyx::support::ltrim;
+using lyx::support::strToInt;
+using lyx::support::strToDbl;
+
+using std::auto_ptr;
using std::endl;
using std::max;
-using std::swap;
-using std::auto_ptr;
-using std::ifstream;
+using std::string;
using std::istringstream;
using std::ostream;
using std::ostringstream;
+using std::swap;
using std::vector;
int const ADD_TO_TABULAR_WIDTH = 2;
///
-LyXTabular * paste_tabular = 0;
+boost::scoped_ptr<LyXTabular> paste_tabular;
struct TabularFeature {
{ LyXTabular::LAST_ACTION, "" }
};
-struct FindFeature {
- FindFeature(LyXTabular::Feature feature) : feature_(feature) {}
- bool operator()(TabularFeature & tf)
- {
+
+class FeatureEqual : public std::unary_function<TabularFeature, bool> {
+public:
+ FeatureEqual(LyXTabular::Feature feature)
+ : feature_(feature) {}
+ bool operator()(TabularFeature const & tf) const {
return tf.action == feature_;
}
private:
string const featureAsString(LyXTabular::Feature feature)
{
- TabularFeature * it = tabularFeature;
- TabularFeature * end = it +
+ TabularFeature * end = tabularFeature +
sizeof(tabularFeature) / sizeof(TabularFeature);
- it = std::find_if(it, end, FindFeature(feature));
+ TabularFeature * it = std::find_if(tabularFeature, end,
+ FeatureEqual(feature));
return (it == end) ? string() : it->feature;
}
bool InsetTabular::hasPasteBuffer() const
{
- return (paste_tabular != 0);
+ return (paste_tabular.get() != 0);
}
InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
- : tabular(buf.params, this, max(rows, 1), max(columns, 1)),
- buffer_(&buf), cursorx_(0), cursory_(0)
-{
- // for now make it always display as display() inset
- // just for test!!!
- the_locking_inset = 0;
- old_locking_inset = 0;
- locked = false;
- oldcell = -1;
- actrow = actcell = 0;
+ : tabular(buf.params(), max(rows, 1), max(columns, 1)),
+ buffer_(&buf), cursorx_(0), cursory_(0), tablemode(false)
+{
+ tabular.setOwner(this);
clearSelection();
in_reset_pos = 0;
- inset_x = 0;
- inset_y = 0;
}
InsetTabular::InsetTabular(InsetTabular const & tab)
- : UpdatableInset(tab),
- tabular(tab.buffer_->params, this, tab.tabular),
- buffer_(tab.buffer_), cursorx_(0), cursory_(0)
-{
- the_locking_inset = 0;
- old_locking_inset = 0;
- locked = false;
- oldcell = -1;
- actrow = actcell = 0;
+ : UpdatableInset(tab), tabular(tab.tabular),
+ buffer_(tab.buffer_), cursorx_(0), cursory_(0), tablemode(false)
+{
+ tabular.setOwner(this);
clearSelection();
in_reset_pos = 0;
- inset_x = 0;
- inset_y = 0;
}
}
-BufferView * InsetTabular::view() const
-{
- Assert(false);
- return 0;
-}
-
-
void InsetTabular::buffer(Buffer * b)
{
buffer_ = b;
// mi.base.textwidth << "\n";
if (!mi.base.bv) {
lyxerr << "InsetTabular::metrics: need bv" << endl;
- Assert(0);
+ BOOST_ASSERT(false);
}
calculate_dimensions_of_cells(mi);
BufferView * bv = pi.base.bv;
-#if 0
- UpdatableInset::draw(pi, x, y);
-#else
if (!owner())
x += scroll();
-#endif
- top_x = x;
- top_baseline = y;
+ xo_ = x;
+ yo_ = y;
x += ADD_TO_TABULAR_WIDTH;
int cell = 0;
break;
if (tabular.isPartOfMultiColumn(i, j))
continue;
- int cx = nx + tabular.getBeginningOfTextInCell(cell);
if (first_visible_cell < 0)
first_visible_cell = cell;
- if (hasSelection()) {
+ if (hasSelection())
drawCellSelection(pi.pain, nx, y, i, j, cell);
- }
+ int const cx = nx + tabular.getBeginningOfTextInCell(cell);
tabular.getCellInset(cell).draw(pi, cx, y);
drawCellLines(pi.pain, nx, y, i, cell);
nx += tabular.getWidthOfColumn(cell);
int row, int cell) const
{
int x2 = x + tabular.getWidthOfColumn(cell);
- bool on_off;
+ bool on_off = false;
if (!tabular.topAlreadyDrawn(cell)) {
on_off = !tabular.topLine(cell);
void InsetTabular::drawCellSelection(Painter & pain, int x, int y,
int row, int column, int cell) const
{
- Assert(hasSelection());
+ if (!tablemode)
+ return;
+
+ BOOST_ASSERT(hasSelection());
int cs = tabular.column_of_cell(sel_cell_start);
int ce = tabular.column_of_cell(sel_cell_end);
if (cs > ce) {
if (rs > re)
swap(rs, re);
- if ((column >= cs) && (column <= ce) && (row >= rs) && (row <= re)) {
+ if (column >= cs && column <= ce && row >= rs && row <= re) {
int w = tabular.getWidthOfColumn(cell);
int h = tabular.getAscentOfRow(row) + tabular.getDescentOfRow(row)-1;
pain.fillRectangle(x, y - tabular.getAscentOfRow(row) + 1,
}
-void InsetTabular::insetUnlock(BufferView * bv)
+void InsetTabular::updateLocal(LCursor & cur) const
{
- if (the_locking_inset) {
- the_locking_inset->insetUnlock(bv);
- updateLocal(bv);
- the_locking_inset = 0;
- }
- actcell = 0;
- oldcell = -1;
- locked = false;
- if (scroll(false) || hasSelection()) {
- clearSelection();
- if (scroll(false))
- scroll(bv, 0.0F);
- updateLocal(bv);
- }
+ cur.bv().update();
+ resetPos(cur);
}
-void InsetTabular::updateLocal(BufferView * bv) const
-{
- bv->updateInset(this);
- if (locked)
- resetPos(bv);
-}
+extern CursorBase theTempCursor;
-bool InsetTabular::lockInsetInInset(BufferView * bv, UpdatableInset * inset)
+void InsetTabular::lfunMousePress(LCursor & cur, FuncRequest const & cmd)
{
- lyxerr[Debug::INSETTEXT] << "InsetTabular::LockInsetInInset("
- << inset << "): ";
- if (!inset)
- return false;
- oldcell = -1;
- if (inset == &tabular.getCellInset(actcell)) {
- lyxerr[Debug::INSETTEXT] << "OK" << endl;
- the_locking_inset = &tabular.getCellInset(actcell);
- resetPos(bv);
- return true;
- } else if (!the_locking_inset) {
- int const n = tabular.getNumberOfCells();
- int const id = inset->id();
- for (int i = 0; i < n; ++i) {
- InsetText * in = &tabular.getCellInset(i);
- if (inset == in) {
- actcell = i;
- the_locking_inset = in;
- locked = true;
- resetPos(bv);
- return true;
- }
- if (in->getInsetFromID(id)) {
- actcell = i;
- in->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
- return the_locking_inset->lockInsetInInset(bv, inset);
- }
- }
- } else if (the_locking_inset && (the_locking_inset == inset)) {
- lyxerr[Debug::INSETTEXT] << "OK" << endl;
- resetPos(bv);
- } else if (the_locking_inset) {
- lyxerr[Debug::INSETTEXT] << "MAYBE" << endl;
- return the_locking_inset->lockInsetInInset(bv, inset);
+ if (hasSelection() && cmd.button() == mouse_button::button3)
+ return;
+
+ int cell = getCell(cmd.x + xo_, cmd.y + yo_);
+ clearSelection();
+
+ lyxerr << "# InsetTabular::lfunMousePress cell: " << cell << endl;
+ if (cell == -1) {
+ tablemode = true;
+ cur.cursor_ = theTempCursor;
+ cur.push(this);
+ cur.idx() = cell;
+ } else {
+ tablemode = false;
+ setPos(cur.bv(), cmd.x, cmd.y);
+ cur.cursor_ = theTempCursor;
+ cur.idx() = cell;
}
- lyxerr[Debug::INSETTEXT] << "NOT OK" << endl;
- return false;
+ cur.resetAnchor();
+ lyxerr << cur << endl;
+
+ if (cmd.button() == mouse_button::button2)
+ dispatch(cur, FuncRequest(LFUN_PASTESELECTION, "paragraph"));
}
-bool InsetTabular::unlockInsetInInset(BufferView * bv, UpdatableInset * inset,
- bool lr)
+void InsetTabular::lfunMouseMotion(LCursor & cur, FuncRequest const & cmd)
{
- if (!the_locking_inset)
- return false;
- if (the_locking_inset == inset) {
- the_locking_inset->insetUnlock(bv);
-#ifdef WITH_WARNINGS
-#warning fix scrolling when cellinset has requested a scroll (Jug)!!!
-#endif
-#if 0
- if (scroll(false))
- scroll(bv, 0.0F);
-#endif
- updateLocal(bv);
- // this has to be here otherwise we don't redraw the cell!
- the_locking_inset = 0;
- return true;
- }
- if (the_locking_inset->unlockInsetInInset(bv, inset, lr)) {
- if (inset->lyxCode() == TABULAR_CODE &&
- !the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE)) {
- InsetTabularMailer(*this).updateDialog(bv);
- oldcell = actcell;
- }
- return true;
+ int const actcell = getCell(cmd.x + xo_, cmd.y + yo_);
+ lyxerr << "# InsetTabular::lfunMouseMotion cell: " << actcell << endl;
+
+ setPos(cur.bv(), cmd.x, cmd.y);
+ if (!hasSelection()) {
+ setSelection(actcell, actcell);
+ cur.setSelection();
+ } else {
+ cur.idx() = actcell;
+ setSelection(sel_cell_start, actcell);
+ tablemode = (sel_cell_start != actcell);
}
- return false;
}
-int InsetTabular::insetInInsetY() const
+void InsetTabular::lfunMouseRelease(LCursor & cur, FuncRequest const & cmd)
{
- if (!the_locking_inset)
- return 0;
- return inset_y + the_locking_inset->insetInInsetY();
+ int const actcell = getCell(cmd.x + xo_, cmd.y + yo_);
+ lyxerr << "# InsetTabular::lfunMouseRelease cell: " << actcell << endl;
+ if (cmd.button() == mouse_button::button3)
+ InsetTabularMailer(*this).showDialog(&cur.bv());
}
-UpdatableInset * InsetTabular::getLockingInset() const
+void InsetTabular::edit(LCursor & cur, bool left)
{
- return the_locking_inset ? the_locking_inset->getLockingInset() :
- const_cast<InsetTabular *>(this);
+ lyxerr << "InsetTabular::edit: " << this << endl;
+ finishUndo();
+ //tablemode = false;
+ int cell;
+ if (left) {
+ if (isRightToLeft(cur))
+ cell = tabular.getLastCellInRow(0);
+ else
+ cell = 0;
+ } else {
+ if (isRightToLeft(cur))
+ cell = tabular.getFirstCellInRow(tabular.rows()-1);
+ else
+ cell = tabular.getNumberOfCells() - 1;
+ }
+ clearSelection();
+ resetPos(cur);
+ cur.bv().fitCursor();
+ cur.push(this);
+ cur.idx() = cell;
}
-UpdatableInset * InsetTabular::getFirstLockingInsetOfType(InsetOld::Code c)
+void InsetTabular::edit(LCursor & cur, int x, int y)
{
- if (c == lyxCode())
- return this;
- if (the_locking_inset)
- return the_locking_inset->getFirstLockingInsetOfType(c);
- return 0;
+ lyxerr << "InsetTabular::edit: " << this << " first cell "
+ << &tabular.cell_info[0][0].inset << endl;
+
+ finishUndo();
+ setPos(cur.bv(), x, y);
+ clearSelection();
+ finishUndo();
+ //int xx = cursorx_ - xo_ + tabular.getBeginningOfTextInCell(actcell);
+ cur.push(this);
+ //if (x > xx)
+ // activateCellInset(bv, cell, x - xx, y - cursory_);
}
-bool InsetTabular::insertInset(BufferView * bv, InsetOld * inset)
+DispatchResult
+InsetTabular::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
{
- if (the_locking_inset)
- return the_locking_inset->insertInset(bv, inset);
- return false;
-}
+ lyxerr << "# InsetTabular::dispatch: " << cmd
+ << " tablemode: " << tablemode << endl;
+ DispatchResult result(true, true);
+ switch (cmd.action) {
-void InsetTabular::lfunMousePress(FuncRequest const & cmd)
-{
- if (hasSelection() && cmd.button() == mouse_button::button3)
- return;
+ case LFUN_MOUSE_PRESS:
+ lfunMousePress(cur, cmd);
+ return DispatchResult(true, true);
- if (hasSelection()) {
- clearSelection();
- updateLocal(cmd.view());
- }
+ case LFUN_MOUSE_MOTION:
+ lfunMouseMotion(cur, cmd);
+ return DispatchResult(true, true);
- int const ocell = actcell;
- BufferView * bv = cmd.view();
+ case LFUN_MOUSE_RELEASE:
+ lfunMouseRelease(cur, cmd);
+ return DispatchResult(true, true);
- if (!locked) {
- locked = true;
- the_locking_inset = 0;
- inset_x = 0;
- inset_y = 0;
+ default:
+ break;
}
- setPos(bv, cmd.x, cmd.y);
- clearSelection();
- bool const inset_hit = insetHit(bv, cmd.x, cmd.y);
+ if (!tablemode) {
- if ((ocell == actcell) && the_locking_inset && inset_hit) {
- resetPos(bv);
- FuncRequest cmd1 = cmd;
- cmd1.x -= inset_x;
- cmd1.y -= inset_y;
- the_locking_inset->localDispatch(cmd1);
- return;
- }
+ int cell = cur.idx();
+ lyxerr << "# InsetTabular::dispatch: A " << cur << endl;
+ result = tabular.getCellInset(cell).dispatch(cur, cmd);
- if (the_locking_inset) {
- the_locking_inset->insetUnlock(bv);
- updateLocal(bv);
- the_locking_inset = 0;
- }
+ switch (result.val()) {
+ case FINISHED:
+ if (movePrevCell(cur))
+ result = DispatchResult(true, true);
+ else
+ result = DispatchResult(false, FINISHED);
+ break;
- if (cmd.button() == mouse_button::button2) {
- localDispatch(FuncRequest(bv, LFUN_PASTESELECTION, "paragraph"));
- return;
- }
+ case FINISHED_RIGHT:
+ if (moveNextCell(cur))
+ result = DispatchResult(true, true);
+ else
+ result = DispatchResult(false, FINISHED_RIGHT);
+ break;
- if (inset_hit && bv->theLockingInset()) {
- if (!bv->lockInset(&tabular.getCellInset(actcell))) {
- lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
- return;
- }
- FuncRequest cmd1 = cmd;
- cmd1.x -= inset_x;
- cmd1.y -= inset_y;
- the_locking_inset->localDispatch(cmd1);
- }
-}
+ case FINISHED_UP:
+ if (moveUpLock(cur))
+ result = DispatchResult(true, true);
+ else
+ result = DispatchResult(false, FINISHED_UP);
+ break;
+ case FINISHED_DOWN:
+ if (moveDownLock(cur))
+ result = DispatchResult(true, true);
+ else
+ result = DispatchResult(false, FINISHED_UP);
+ break;
-bool InsetTabular::lfunMouseRelease(FuncRequest const & cmd)
-{
- bool ret = false;
- if (the_locking_inset) {
- FuncRequest cmd1 = cmd;
- cmd1.x -= inset_x;
- cmd1.y -= inset_y;
- ret = the_locking_inset->localDispatch(cmd1);
- }
- if (cmd.button() == mouse_button::button3 && !ret) {
- InsetTabularMailer(*this).showDialog(cmd.view());
- return true;
- }
- return ret;
-}
+ default:
+ lyxerr << "# don't handle dispatch" << endl;
+ break;
+ }
+ lyxerr << "# InsetTabular::dispatch: B " << cur << endl;
+ } else {
-void InsetTabular::lfunMouseMotion(FuncRequest const & cmd)
-{
- if (the_locking_inset) {
- FuncRequest cmd1 = cmd;
- cmd1.x -= inset_x;
- cmd1.y -= inset_y;
- the_locking_inset->localDispatch(cmd1);
- return;
- }
+ lyxerr << "# InsetTabular::dispatch 3: " << cmd << endl;
+ switch (cmd.action) {
- BufferView * bv = cmd.view();
- int const old_cell = actcell;
+ case LFUN_CELL_BACKWARD:
+ case LFUN_CELL_FORWARD:
+ if (cmd.action == LFUN_CELL_FORWARD)
+ moveNextCell(cur);
+ else
+ movePrevCell(cur);
+ clearSelection();
+ return result;
- setPos(bv, cmd.x, cmd.y);
- if (!hasSelection()) {
- setSelection(actcell, actcell);
- updateLocal(bv);
- } else if (old_cell != actcell) {
- setSelection(sel_cell_start, actcell);
- updateLocal(bv);
- }
-}
+ case LFUN_SCROLL_INSET:
+ if (!cmd.argument.empty()) {
+ if (cmd.argument.find('.') != cmd.argument.npos)
+ scroll(cur.bv(), static_cast<float>(strToDbl(cmd.argument)));
+ else
+ scroll(cur.bv(), strToInt(cmd.argument));
+ cur.bv().update();
+ return DispatchResult(true, true);
+ }
+ case LFUN_RIGHTSEL: {
+ int const start = hasSelection() ? sel_cell_start : cur.idx();
+ if (tabular.isLastCellInRow(cur.idx())) {
+ setSelection(start, cur.idx());
+ break;
+ }
-InsetOld::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
-{
- // We need to save the value of the_locking_inset as the call to
- // the_locking_inset->localDispatch might unlock it.
- old_locking_inset = the_locking_inset;
- RESULT result = UpdatableInset::localDispatch(cmd);
- BufferView * bv = cmd.view();
+ int end = cur.idx();
+ // if we are starting a selection, only select
+ // the current cell at the beginning
+ if (hasSelection()) {
+ moveRight(cur);
+ end = cur.idx();
+ }
+ setSelection(start, end);
+ break;
+ }
- if (cmd.action == LFUN_INSET_EDIT) {
+ case LFUN_RIGHT:
+ if (!moveRightLock(cur))
+ result = DispatchResult(false, FINISHED_RIGHT);
+ clearSelection();
+ break;
- if (!bv->lockInset(this)) {
- lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl;
- return DISPATCHED;
+ case LFUN_LEFTSEL: {
+ int const start = hasSelection() ? sel_cell_start : cur.idx();
+ if (tabular.isFirstCellInRow(cur.idx())) {
+ setSelection(start, cur.idx());
+ break;
+ }
+
+ int end = cur.idx();
+ // if we are starting a selection, only select
+ // the current cell at the beginning
+ if (hasSelection()) {
+ moveLeft(cur);
+ end = cur.idx();
+ }
+ setSelection(start, end);
+ break;
}
- finishUndo();
- locked = true;
- the_locking_inset = 0;
- inset_x = 0;
- inset_y = 0;
+ case LFUN_LEFT:
+ if (!moveLeftLock(cur))
+ result = DispatchResult(false, FINISHED);
+ clearSelection();
+ break;
- if (cmd.argument.size()) {
- if (cmd.argument == "left") {
- if (isRightToLeft(bv))
- actcell = tabular.getLastCellInRow(0);
+ case LFUN_DOWNSEL: {
+ int const start = hasSelection() ? sel_cell_start : cur.idx();
+ int const ocell = cur.idx();
+ // if we are starting a selection, only select
+ // the current cell at the beginning
+ if (hasSelection()) {
+ moveDown(cur);
+ if (ocell == sel_cell_end ||
+ tabular.column_of_cell(ocell) >
+tabular.column_of_cell(cur.idx()))
+ setSelection(start, tabular.getCellBelow(sel_cell_end));
else
- actcell = 0;
+ setSelection(start, tabular.getLastCellBelow(sel_cell_end));
} else {
- if (isRightToLeft(bv))
- actcell = tabular.getFirstCellInRow(tabular.rows()-1);
- else
- actcell = tabular.getNumberOfCells() - 1;
+ setSelection(start, start);
}
- clearSelection();
- resetPos(bv);
- bv->fitCursor();
+ break;
}
- else {
- setPos(bv, cmd.x, cmd.y);
+ case LFUN_DOWN:
+ if (!moveDown(cur))
+ result = DispatchResult(false, FINISHED_DOWN);
clearSelection();
- finishUndo();
- if (insetHit(bv, cmd.x, cmd.y) && cmd.button() != mouse_button::button3) {
- activateCellInsetAbs(bv, cmd.x, cmd.y, cmd.button());
+ break;
+
+ case LFUN_UPSEL: {
+ int const start = hasSelection() ? sel_cell_start : cur.idx();
+ int const ocell = cur.idx();
+ // if we are starting a selection, only select
+ // the current cell at the beginning
+ if (hasSelection()) {
+ moveUp(cur);
+ if (ocell == sel_cell_end ||
+ tabular.column_of_cell(ocell) >
+tabular.column_of_cell(cur.idx()))
+ setSelection(start, tabular.getCellAbove(sel_cell_end));
+ else
+ setSelection(start, tabular.getLastCellAbove(sel_cell_end));
+ } else {
+ setSelection(start, start);
}
+ break;
}
- return DISPATCHED;
- }
- if (result == DISPATCHED || result == DISPATCHED_NOUPDATE) {
- resetPos(bv);
- return result;
- }
-
- if (cmd.action < 0 && cmd.argument.empty())
- return FINISHED;
+ case LFUN_UP:
+ if (!moveUp(cur))
+ result = DispatchResult(false, FINISHED_DOWN);
+ clearSelection();
+ break;
- bool hs = hasSelection();
+ case LFUN_NEXT: {
+ if (hasSelection())
+ clearSelection();
+ int actcell = cur.idx();
+ int actcol = tabular.column_of_cell(actcell);
+ int column = actcol;
+ if (cur.bv().top_y() + cur.bv().painter().paperHeight()
+ < yo_ + tabular.getHeightOfTabular())
+ {
+ cur.bv().scrollDocView(
+ cur.bv().top_y() + cur.bv().painter().paperHeight());
+ cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
+ } else {
+ cur.idx() = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
+ }
+ resetPos(cur);
+ break;
+ }
- result = DISPATCHED;
- // this one have priority over the locked InsetText, if we're not already
- // inside another tabular then that one get's priority!
- if (getFirstLockingInsetOfType(InsetOld::TABULAR_CODE) == this) {
- switch (cmd.action) {
- case LFUN_MOUSE_PRESS:
- lfunMousePress(cmd);
- return DISPATCHED;
+ case LFUN_PRIOR: {
+ if (hasSelection())
+ clearSelection();
+ int column = tabular.column_of_cell(cur.idx());
+ if (yo_ < 0) {
+ cur.bv().scrollDocView(
+ cur.bv().top_y() - cur.bv().painter().paperHeight());
+ if (yo_ > 0)
+ cur.idx() = column;
+ else
+ cur.idx() = tabular.getCellBelow(first_visible_cell) + column;
+ } else {
+ cur.idx() = column;
+ }
+ resetPos(cur);
+ break;
+ }
- case LFUN_MOUSE_MOTION:
- lfunMouseMotion(cmd);
- return DISPATCHED;
+ // none of these make sense for insettabular,
+ // but we must catch them to prevent any
+ // selection from being confused
+ case LFUN_PRIORSEL:
+ case LFUN_NEXTSEL:
+ case LFUN_WORDLEFT:
+ case LFUN_WORDLEFTSEL:
+ case LFUN_WORDRIGHT:
+ case LFUN_WORDRIGHTSEL:
+ case LFUN_WORDSEL:
+ case LFUN_DOWN_PARAGRAPH:
+ case LFUN_DOWN_PARAGRAPHSEL:
+ case LFUN_UP_PARAGRAPH:
+ case LFUN_UP_PARAGRAPHSEL:
+ case LFUN_BACKSPACE:
+ case LFUN_HOME:
+ case LFUN_HOMESEL:
+ case LFUN_END:
+ case LFUN_ENDSEL:
+ case LFUN_BEGINNINGBUF:
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_ENDBUF:
+ case LFUN_ENDBUFSEL:
+ break;
- case LFUN_MOUSE_RELEASE:
- return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
+ case LFUN_LAYOUT_TABULAR:
+ InsetTabularMailer(*this).showDialog(&cur.bv());
+ break;
- case LFUN_CELL_BACKWARD:
- case LFUN_CELL_FORWARD:
- unlockInsetInInset(bv, the_locking_inset);
- if (cmd.action == LFUN_CELL_FORWARD)
- moveNextCell(bv, old_locking_inset != 0);
- else
- movePrevCell(bv, old_locking_inset != 0);
- clearSelection();
- if (hs)
- updateLocal(bv);
- if (!the_locking_inset)
- return DISPATCHED_NOUPDATE;
- return result;
- // this to avoid compiler warnings.
- default:
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetTabularMailer(*this).updateDialog(&cur.bv());
break;
- }
- }
- kb_action action = cmd.action;
- string arg = cmd.argument;
- if (the_locking_inset) {
- result = the_locking_inset->localDispatch(cmd);
- if (result == DISPATCHED_NOUPDATE) {
- int sc = scroll();
- resetPos(bv);
- if (sc != scroll()) { // inset has been scrolled
- updateLocal(bv);
- }
- return result;
- } else if (result == DISPATCHED) {
- updateLocal(bv);
- return result;
- } else if (result == FINISHED_UP) {
- action = LFUN_UP;
- // Make sure to reset status message after
- // exiting, e.g. math inset
- bv->owner()->clearMessage();
- } else if (result == FINISHED_DOWN) {
- action = LFUN_DOWN;
- bv->owner()->clearMessage();
- } else if (result == FINISHED_RIGHT) {
- action = LFUN_RIGHT;
- bv->owner()->clearMessage();
- } else if (result == FINISHED) {
- bv->owner()->clearMessage();
- }
- }
+ case LFUN_TABULAR_FEATURE:
+ if (!tabularFeatures(cur, cmd.argument))
+ result = DispatchResult(false);
+ break;
- result = DISPATCHED;
- switch (action) {
- // --- Cursor Movements ----------------------------------
- case LFUN_RIGHTSEL: {
- int const start = hasSelection() ? sel_cell_start : actcell;
- if (tabular.isLastCellInRow(actcell)) {
- setSelection(start, actcell);
+ // insert file functions
+ case LFUN_FILE_INSERT_ASCII_PARA:
+ case LFUN_FILE_INSERT_ASCII: {
+ string tmpstr = getContentsOfAsciiFile(&cur.bv(), cmd.argument, false);
+ if (!tmpstr.empty() && !insertAsciiString(cur.bv(), tmpstr, false))
+ result = DispatchResult(false);
break;
}
- int end = actcell;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveRight(bv, false);
- end = actcell;
- }
- setSelection(start, end);
- updateLocal(bv);
- break;
- }
- case LFUN_RIGHT:
- result = moveRight(bv);
- clearSelection();
- if (hs)
- updateLocal(bv);
- break;
- case LFUN_LEFTSEL: {
- int const start = hasSelection() ? sel_cell_start : actcell;
- if (tabular.isFirstCellInRow(actcell)) {
- setSelection(start, actcell);
+ case LFUN_LANGUAGE:
+ case LFUN_EMPH:
+ case LFUN_BOLD:
+ case LFUN_NOUN:
+ case LFUN_CODE:
+ case LFUN_SANS:
+ case LFUN_ROMAN:
+ case LFUN_DEFAULT:
+ case LFUN_UNDERLINE:
+ case LFUN_FONT_SIZE:
+ lyxerr << "font changes not re-implemented for tables after LOCK" << endl;
break;
- }
- int end = actcell;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveLeft(bv, false);
- end = actcell;
- }
- setSelection(start, end);
- updateLocal(bv);
- break;
- }
- case LFUN_LEFT:
- result = moveLeft(bv);
- clearSelection();
- if (hs)
- updateLocal(bv);
- break;
- case LFUN_DOWNSEL: {
- int const start = hasSelection() ? sel_cell_start : actcell;
- int const ocell = actcell;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveDown(bv, false);
- if (ocell == sel_cell_end ||
- tabular.column_of_cell(ocell) > tabular.column_of_cell(actcell))
- setSelection(start, tabular.getCellBelow(sel_cell_end));
- else
- setSelection(start, tabular.getLastCellBelow(sel_cell_end));
- } else {
- setSelection(start, start);
- }
- updateLocal(bv);
- }
- break;
- case LFUN_DOWN:
- result = moveDown(bv, old_locking_inset != 0);
- clearSelection();
- if (hs)
- updateLocal(bv);
- break;
- case LFUN_UPSEL: {
- int const start = hasSelection() ? sel_cell_start : actcell;
- int const ocell = actcell;
- // if we are starting a selection, only select
- // the current cell at the beginning
- if (hasSelection()) {
- moveUp(bv, false);
- if ((ocell == sel_cell_end) ||
- (tabular.column_of_cell(ocell)>tabular.column_of_cell(actcell)))
- setSelection(start, tabular.getCellAbove(sel_cell_end));
- else
- setSelection(start, tabular.getLastCellAbove(sel_cell_end));
- } else {
- setSelection(start, start);
- }
- updateLocal(bv);
- }
- break;
- case LFUN_UP:
- result = moveUp(bv, old_locking_inset != 0);
- clearSelection();
- if (hs)
- updateLocal(bv);
- break;
- case LFUN_NEXT: {
- if (hs)
- clearSelection();
- int column = actcol;
- unlockInsetInInset(bv, the_locking_inset);
- if (bv->top_y() + bv->painter().paperHeight() <
- top_baseline + tabular.getHeightOfTabular())
- {
- bv->scrollDocView(bv->top_y() + bv->painter().paperHeight());
- actcell = tabular.getCellBelow(first_visible_cell) + column;
- } else {
- actcell = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
+ case LFUN_CUT:
+ if (copySelection(cur.bv())) {
+ recordUndo(cur, Undo::DELETE);
+ cutSelection(cur.bv().buffer()->params());
}
- resetPos(bv);
- updateLocal(bv);
- break;
- }
- case LFUN_PRIOR: {
- if (hs)
- clearSelection();
- int column = actcol;
- unlockInsetInInset(bv, the_locking_inset);
- if (top_baseline < 0) {
- bv->scrollDocView(bv->top_y() - bv->painter().paperHeight());
- if (top_baseline > 0)
- actcell = column;
- else
- actcell = tabular.getCellBelow(first_visible_cell) + column;
- } else {
- actcell = column;
- }
- resetPos(bv);
- updateLocal(bv);
- break;
- }
- // none of these make sense for insettabular,
- // but we must catch them to prevent any
- // selection from being confused
- case LFUN_PRIORSEL:
- case LFUN_NEXTSEL:
- case LFUN_WORDLEFT:
- case LFUN_WORDLEFTSEL:
- case LFUN_WORDRIGHT:
- case LFUN_WORDRIGHTSEL:
- case LFUN_WORDSEL:
- case LFUN_DOWN_PARAGRAPH:
- case LFUN_DOWN_PARAGRAPHSEL:
- case LFUN_UP_PARAGRAPH:
- case LFUN_UP_PARAGRAPHSEL:
- case LFUN_BACKSPACE:
- case LFUN_HOME:
- case LFUN_HOMESEL:
- case LFUN_END:
- case LFUN_ENDSEL:
- case LFUN_BEGINNINGBUF:
- case LFUN_BEGINNINGBUFSEL:
- case LFUN_ENDBUF:
- case LFUN_ENDBUFSEL:
- break;
- case LFUN_LAYOUT_TABULAR: {
- InsetTabularMailer(*this).showDialog(bv);
- break;
- }
- case LFUN_INSET_DIALOG_UPDATE: {
- InsetTabularMailer(*this).updateDialog(bv);
- break;
- }
- case LFUN_TABULAR_FEATURE:
- if (!tabularFeatures(bv, arg))
- result = UNDISPATCHED;
- break;
- // insert file functions
- case LFUN_FILE_INSERT_ASCII_PARA:
- case LFUN_FILE_INSERT_ASCII:
- {
- string tmpstr = getContentsOfAsciiFile(bv, arg, false);
- if (tmpstr.empty())
break;
- if (insertAsciiString(bv, tmpstr, false))
- updateLocal(bv);
- else
- result = UNDISPATCHED;
- break;
- }
- // cut and paste functions
- case LFUN_CUT:
- if (!copySelection(bv))
+
+ case LFUN_DELETE:
+ recordUndo(cur, Undo::DELETE);
+ cutSelection(cur.bv().buffer()->params());
break;
- // no break here!
- case LFUN_DELETE:
- recordUndo(bv, Undo::DELETE);
- cutSelection(bv->buffer()->params);
- updateLocal(bv);
- break;
- case LFUN_COPY:
- if (!hasSelection())
+
+ case LFUN_COPY:
+ if (!hasSelection())
+ break;
+ finishUndo();
+ copySelection(cur.bv());
break;
- finishUndo();
- copySelection(bv);
- break;
- case LFUN_PASTESELECTION:
- {
- string const clip(bv->getClipboard());
+
+ case LFUN_PASTESELECTION: {
+ string const clip = cur.bv().getClipboard();
if (clip.empty())
- break;
-#if 0
- if (clip.find('\t') != string::npos) {
- int cols = 1;
- int rows = 1;
- int maxCols = 1;
- string::size_type len = clip.length();
- string::size_type p = 0;
-
- while (p < len &&
- ((p = clip.find_first_of("\t\n", p)) != string::npos)) {
- switch (clip[p]) {
- case '\t':
- ++cols;
- break;
- case '\n':
- if ((p+1) < len)
- ++rows;
- maxCols = max(cols, maxCols);
- cols = 1;
- break;
+ break;
+ if (clip.find('\t') != string::npos) {
+ int cols = 1;
+ int rows = 1;
+ int maxCols = 1;
+ string::size_type len = clip.length();
+ string::size_type p = 0;
+
+ while (p < len &&
+ (p = clip.find_first_of("\t\n", p)) != string::npos) {
+ switch (clip[p]) {
+ case '\t':
+ ++cols;
+ break;
+ case '\n':
+ if (p + 1 < len)
+ ++rows;
+ maxCols = max(cols, maxCols);
+ cols = 1;
+ break;
+ }
+ ++p;
}
- ++p;
- }
- maxCols = max(cols, maxCols);
- delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params,
- this, rows, maxCols);
- string::size_type op = 0;
- int cell = 0;
- int cells = paste_tabular->getNumberOfCells();
- p = cols = 0;
- while ((cell < cells) && (p < len) &&
- (p = clip.find_first_of("\t\n", p)) != string::npos) {
- if (p >= len)
- break;
- switch (clip[p]) {
- case '\t':
- paste_tabular->getCellInset(cell)->setText(clip.substr(op, p-op));
- ++cols;
- ++cell;
- break;
- case '\n':
- paste_tabular->getCellInset(cell)->setText(clip.substr(op, p-op));
- while (cols++ < maxCols)
+ maxCols = max(cols, maxCols);
+
+ paste_tabular.reset(
+ new LyXTabular(cur.bv().buffer()->params(), rows, maxCols));
+
+ string::size_type op = 0;
+ int cell = 0;
+ int cells = paste_tabular->getNumberOfCells();
+ p = 0;
+ cols = 0;
+ LyXFont font;
+ while (cell < cells && p < len &&
+ (p = clip.find_first_of("\t\n", p)) != string::npos) {
+ if (p >= len)
+ break;
+ switch (clip[p]) {
+ case '\t':
+ paste_tabular->getCellInset(cell).
+ setText(clip.substr(op, p-op), font);
+ ++cols;
++cell;
- cols = 0;
- break;
+ break;
+ case '\n':
+ paste_tabular->getCellInset(cell).
+ setText(clip.substr(op, p-op), font);
+ while (cols++ < maxCols)
+ ++cell;
+ cols = 0;
+ break;
+ }
+ ++p;
+ op = p;
}
- ++p;
- op = p;
+ // check for the last cell if there is no trailing '\n'
+ if (cell < cells && op < len)
+ paste_tabular->getCellInset(cell).
+ setText(clip.substr(op, len-op), font);
+ } else if (!insertAsciiString(cur.bv(), clip, true))
+ {
+ // so that the clipboard is used and it goes on
+ // to default
+ // and executes LFUN_PASTESELECTION in insettext!
+ paste_tabular.reset();
}
- // check for the last cell if there is no trailing '\n'
- if ((cell < cells) && (op < len))
- paste_tabular->getCellInset(cell)->setText(clip.substr(op, len-op));
- } else
-#else
- if (!insertAsciiString(bv, clip, true))
-#endif
- {
- // so that the clipboard is used and it goes on
- // to default
- // and executes LFUN_PASTESELECTION in insettext!
- delete paste_tabular;
- paste_tabular = 0;
- }
- }
- case LFUN_PASTE:
- if (hasPasteBuffer()) {
- recordUndo(bv, Undo::INSERT);
- pasteSelection(bv);
- updateLocal(bv);
- break;
+ // fall through
}
- // ATTENTION: the function above has to be PASTE and PASTESELECTION!!!
- default:
- // handle font changing stuff on selection before we lock the inset
- // in the default part!
- result = UNDISPATCHED;
- if (hs) {
- switch(action) {
- case LFUN_LANGUAGE:
- case LFUN_EMPH:
- case LFUN_BOLD:
- case LFUN_NOUN:
- case LFUN_CODE:
- case LFUN_SANS:
- case LFUN_ROMAN:
- case LFUN_DEFAULT:
- case LFUN_UNDERLINE:
- case LFUN_FONT_SIZE:
- if (bv->dispatch(FuncRequest(bv, action, arg)))
- result = DISPATCHED;
- break;
- default:
+
+ case LFUN_PASTE:
+ if (hasPasteBuffer()) {
+ recordUndo(cur, Undo::INSERT);
+ pasteSelection(cur.bv());
break;
}
- }
- // we try to activate the actual inset and put this event down to
- // the insets dispatch function.
- if (result == DISPATCHED || the_locking_inset)
+ // fall through
+
+ // ATTENTION: the function above has to be PASTE and PASTESELECTION!!!
+
+ default:
+ // handle font changing stuff on selection before we lock the inset
+ // in the default part!
+ result = DispatchResult(false);
+ // we try to activate the actual inset and put this event down to
+ // the insets dispatch function.
break;
- if (activateCellInset(bv)) {
- result = the_locking_inset->localDispatch(FuncRequest(bv, action, arg));
- if (result == UNDISPATCHED || result >= FINISHED) {
- unlockInsetInInset(bv, the_locking_inset);
- // we need to update if this was requested before
- updateLocal(bv);
- return UNDISPATCHED;
- }
- if (hs)
- clearSelection();
- updateLocal(bv);
- return result;
}
- break;
+
+ updateLocal(cur);
+ InsetTabularMailer(*this).updateDialog(&cur.bv());
+ }
+
+ if (cmd.action == LFUN_INSET_TOGGLE) {
+ tablemode = !tablemode;
+ result = DispatchResult(true, true);
}
- if (result < FINISHED) {
- if (!the_locking_inset && bv->fitCursor())
- updateLocal(bv);
- } else
- bv->unlockInset(this);
+
return result;
}
int InsetTabular::latex(Buffer const & buf, ostream & os,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
return tabular.latex(buf, os, runparams);
}
-int InsetTabular::ascii(Buffer const & buf, ostream & os, int ll) const
+int InsetTabular::plaintext(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
- if (ll > 0)
- return tabular.ascii(buf, os, ownerPar(buf, this).params().depth(),
- false, 0);
- return tabular.ascii(buf, os, 0, false, 0);
+ int dp = runparams.linelen ? ownerPar(buf, this).params().depth() : 0;
+ return tabular.plaintext(buf, os, runparams, dp, false, 0);
}
-int InsetTabular::linuxdoc(Buffer const & buf, ostream & os) const
+int InsetTabular::linuxdoc(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
- return tabular.linuxdoc(buf,os);
+ return tabular.linuxdoc(buf,os, runparams);
}
-int InsetTabular::docbook(Buffer const & buf, ostream & os, bool mixcont) const
+int InsetTabular::docbook(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
int ret = 0;
InsetOld * master;
// if the table is inside a float it doesn't need the informaltable
// wrapper. Search for it.
- for (master = owner();
- master && master->lyxCode() != InsetOld::FLOAT_CODE;
- master = master->owner());
+ for (master = owner(); master; master = master->owner())
+ if (master->lyxCode() == InsetOld::FLOAT_CODE)
+ break;
if (!master) {
os << "<informaltable>";
- if (mixcont)
+ if (runparams.mixed_content)
os << endl;
++ret;
}
- ret += tabular.docbook(buf, os, mixcont);
+ ret += tabular.docbook(buf, os, runparams);
if (!master) {
os << "</informaltable>";
- if (mixcont)
+ if (runparams.mixed_content)
os << endl;
++ret;
}
void InsetTabular::calculate_dimensions_of_cells(MetricsInfo & mi) const
{
-#if 1
- // if we have a locking_inset we should have to check only this cell for
- // change so I'll try this to have a boost, but who knows ;) (Jug?)
- // This is _really_ important (André)
- if (the_locking_inset == &tabular.getCellInset(actcell)) {
- int maxAsc = 0;
- int maxDesc = 0;
- for (int j = 0; j < tabular.columns(); ++j) {
- Dimension dim;
- MetricsInfo m = mi;
- m.base.textwidth =
- tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
- tabular.getCellInset(actrow, j).metrics(m, dim);
- maxAsc = max(dim.asc, maxAsc);
- maxDesc = max(dim.des, maxDesc);
- }
- tabular.setWidthOfCell(actcell, the_locking_inset->width());
- tabular.setAscentOfRow(actrow, maxAsc + ADD_TO_HEIGHT);
- tabular.setDescentOfRow(actrow, maxDesc + ADD_TO_HEIGHT);
- return;
- }
-#endif
-
- int cell = -1;
- for (int i = 0; i < tabular.rows(); ++i) {
+ for (int i = 0, cell = -1; i < tabular.rows(); ++i) {
int maxAsc = 0;
int maxDesc = 0;
for (int j = 0; j < tabular.columns(); ++j) {
}
-void InsetTabular::getCursor(BufferView & bv, int & x, int & y) const
+void InsetTabular::getCursorPos(int cell, int & x, int & y) const
{
- if (the_locking_inset) {
- the_locking_inset->getCursor(bv, x, y);
- return;
- }
-
- x = cursorx_;
- y = cursory_ + InsetTabular::y();
-
- // Fun stuff
- int desc = tabular.getDescentOfRow(actrow);
- y += desc;
- int ascdesc = tabular.getAscentOfRow(actrow) + desc;
- y -= ascdesc / 2;
- y += ADD_TO_HEIGHT * 2;
- y += TEXT_TO_INSET_OFFSET;
+ InsetText const & inset = tabular.getCellInset(cell);
+ inset.getCursorPos(cell, x, y);
+ x += inset.x() - xo_;
+ y += inset.y() - yo_;
}
-void InsetTabular::getCursorPos(BufferView * bv, int & x, int & y) const
-{
- if (the_locking_inset) {
- the_locking_inset->getCursorPos(bv, x, y);
- return;
- }
- x = cursorx_ - top_x;
- y = cursory_;
-}
-
-
-void InsetTabular::fitInsetCursor(BufferView * bv) const
-{
- if (the_locking_inset) {
- the_locking_inset->fitInsetCursor(bv);
- return;
- }
-
- LyXFont font;
- int const asc = font_metrics::maxAscent(font);
- int const desc = font_metrics::maxDescent(font);
- resetPos(bv);
-
- bv->fitLockedInsetCursor(cursorx_, cursory_, asc, desc);
-}
-
-
-void InsetTabular::setPos(BufferView * bv, int x, int y) const
+void InsetTabular::setPos(BufferView & bv, int x, int y) const
{
+ int const cell = getCell(x + xo_, y + yo_);
+ lyxerr << "# InsetTabular::setPos() cell: " << cell << endl;
+ InsetText const & inset = tabular.getCellInset(cell);
+ inset.text_.setCursorFromCoordinates(x, y);
+#if 0
cursory_ = 0;
- actcell = actrow = actcol = 0;
+ int actcell = 0;
+ int actrow = 0;
+ int actcol = 0;
int ly = tabular.getDescentOfRow(actrow);
// first search the right row
lx += tabular.getWidthOfColumn(actcell + 1)
+ tabular.getAdditionalWidth(actcell);
- cursorx_ = lx - tabular.getWidthOfColumn(actcell) + top_x + 2;
- resetPos(bv);
+ cursorx_ = lx - tabular.getWidthOfColumn(actcell) + xo_ + 2;
+#endif
+ resetPos(bv.cursor());
}
for (; c < cell; ++c)
lx += tabular.getWidthOfColumn(c);
- return (lx - tabular.getWidthOfColumn(cell) + top_x);
+ return lx - tabular.getWidthOfColumn(cell) + xo_;
}
-void InsetTabular::resetPos(BufferView * bv) const
+void InsetTabular::resetPos(LCursor &) const
{
+#if 0
#ifdef WITH_WARNINGS
#warning This should be fixed in the right manner (20011128 Jug)
#endif
if (in_reset_pos > 0)
return;
+ BufferView & bv = cur.bv();
int cell = 0;
- actcol = tabular.column_of_cell(actcell);
- actrow = 0;
+ int actcell = cur.cell();
+ int actcol = tabular.column_of_cell(actcell);
+ int actrow = 0;
cursory_ = 0;
for (; cell < actcell && !tabular.isLastRow(cell); ++cell) {
if (tabular.isLastCellInRow(cell)) {
++actrow;
}
}
- if (!locked) {
- if (the_locking_inset)
- inset_y = cursory_;
- return;
- }
+
// we need this only from here on!!!
++in_reset_pos;
- static int const offset = ADD_TO_TABULAR_WIDTH + 2;
- int new_x = getCellXPos(actcell);
+ int const offset = ADD_TO_TABULAR_WIDTH + 2;
+ int new_x = getCellXPos(actcell) + offset;
int old_x = cursorx_;
- new_x += offset;
cursorx_ = new_x;
// cursor.x(getCellXPos(actcell) + offset);
if (actcol < tabular.columns() - 1 && scroll(false) &&
tabular.getWidthOfTabular() < bv->workWidth()-20)
{
scroll(bv, 0.0F);
- updateLocal(bv);
- } else if (the_locking_inset &&
- tabular.getWidthOfColumn(actcell) > bv->workWidth() - 20)
- {
- int xx = cursorx_ - offset + bv->text->getRealCursorX();
- if (xx > bv->workWidth()-20) {
- scroll(bv, -(xx - bv->workWidth() + 60));
- updateLocal(bv);
- } else if (xx < 20) {
- if (xx < 0)
- xx = -xx + 60;
- else
- xx = 60;
- scroll(bv, xx);
- updateLocal(bv);
- }
+ updateLocal(cur);
} else if (cursorx_ - offset > 20 &&
cursorx_ - offset + tabular.getWidthOfColumn(actcell)
- > bv->workWidth() - 20) {
- scroll(bv, -tabular.getWidthOfColumn(actcell) - 20);
- updateLocal(bv);
+ > bv.workWidth() - 20) {
+ scroll(&bv, - tabular.getWidthOfColumn(actcell) - 20);
+ updateLocal(cur);
} else if (cursorx_ - offset < 20) {
- scroll(bv, 20 - cursorx_ + offset);
- updateLocal(bv);
- } else if (scroll() && top_x > 20 &&
- (top_x + tabular.getWidthOfTabular()) > bv->workWidth() - 20) {
- scroll(bv, old_x - cursorx_);
- updateLocal(bv);
- }
- if (the_locking_inset) {
- inset_x = cursorx_ - top_x + tabular.getBeginningOfTextInCell(actcell);
- inset_y = cursory_;
- }
- if ((!the_locking_inset ||
- !the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE)) &&
- actcell != oldcell) {
- InsetTabularMailer(*this).updateDialog(bv);
- oldcell = actcell;
+ scroll(&bv, 20 - cursorx_ + offset);
+ updateLocal(cur);
+ } else if (scroll() && xo_ > 20 &&
+ xo_ + tabular.getWidthOfTabular() > bv->workWidth() - 20) {
+ scroll(&bv, old_x - cursorx_);
+ updateLocal(cur);
}
+ InsetTabularMailer(*this).updateDialog(bv);
in_reset_pos = 0;
+#endif
}
-InsetOld::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
+bool InsetTabular::moveRight(LCursor & cur)
{
- if (lock && !old_locking_inset) {
- if (activateCellInset(bv))
- return DISPATCHED;
- } else {
- bool moved = isRightToLeft(bv)
- ? movePrevCell(bv) : moveNextCell(bv);
- if (!moved)
- return FINISHED_RIGHT;
- if (lock && activateCellInset(bv))
- return DISPATCHED;
- }
- resetPos(bv);
- return DISPATCHED_NOUPDATE;
+ bool moved = isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
+ if (!moved)
+ return false;
+ resetPos(cur);
+ return true;
}
-InsetOld::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
+bool InsetTabular::moveRightLock(LCursor & cur)
{
- bool moved = isRightToLeft(bv) ? moveNextCell(bv) : movePrevCell(bv);
+ bool moved = isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
if (!moved)
- return FINISHED;
- if (lock) { // behind the inset
- if (activateCellInset(bv, 0, 0, mouse_button::none, true))
- return DISPATCHED;
- }
- resetPos(bv);
- return DISPATCHED_NOUPDATE;
+ return false;
+ activateCellInset(cur, cur.idx(), false);
+ return true;
}
-InsetOld::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
+bool InsetTabular::moveLeft(LCursor & cur)
{
- int const ocell = actcell;
- actcell = tabular.getCellAbove(actcell);
- if (actcell == ocell) // we moved out of the inset
- return FINISHED_UP;
- resetPos(bv);
- if (lock) {
- int x = 0;
- int y = 0;
- if (old_locking_inset) {
- old_locking_inset->getCursorPos(bv, x, y);
- x -= cursorx_ + tabular.getBeginningOfTextInCell(actcell);
- }
- if (activateCellInset(bv, x, 0))
- return DISPATCHED;
- }
- return DISPATCHED_NOUPDATE;
+ bool moved = isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
+ if (!moved)
+ return false;
+ resetPos(cur);
+ return true;
}
-InsetOld::RESULT InsetTabular::moveDown(BufferView * bv, bool lock)
+bool InsetTabular::moveLeftLock(LCursor & cur)
{
- int const ocell = actcell;
- actcell = tabular.getCellBelow(actcell);
- if (actcell == ocell) // we moved out of the inset
- return FINISHED_DOWN;
- resetPos(bv);
- if (lock) {
- int x = 0;
- int y = 0;
- if (old_locking_inset) {
- old_locking_inset->getCursorPos(bv, x, y);
- x -= cursorx_ + tabular.getBeginningOfTextInCell(actcell);
- }
- if (activateCellInset(bv, x, 0))
- return DISPATCHED;
- }
- return DISPATCHED_NOUPDATE;
+ bool moved = isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
+ if (!moved)
+ return false;
+ activateCellInset(cur, cur.idx(), true);
+ return true;
+}
+
+
+bool InsetTabular::moveUp(LCursor & cur)
+{
+ if (tabular.row_of_cell(cur.idx()) == 0)
+ return false;
+ cur.idx() = tabular.getCellAbove(cur.idx());
+ resetPos(cur);
+ return true;
+}
+
+
+bool InsetTabular::moveUpLock(LCursor & cur)
+{
+ if (tabular.row_of_cell(cur.idx()) == 0)
+ return false;
+ cur.idx() = tabular.getCellAbove(cur.idx());
+ resetPos(cur);
+ activateCellInset(cur, cur.idx(), cur.x_target(), 0);
+ return true;
+}
+
+
+bool InsetTabular::moveDown(LCursor & cur)
+{
+ if (tabular.row_of_cell(cur.idx()) == tabular.rows() - 1)
+ return false;
+ cur.idx() = tabular.getCellBelow(cur.idx());
+ resetPos(cur);
+ return true;
+}
+
+
+bool InsetTabular::moveDownLock(LCursor & cur)
+{
+ if (tabular.row_of_cell(cur.idx()) == tabular.rows() - 1)
+ return false;
+ cur.idx() = tabular.getCellBelow(cur.idx());
+ resetPos(cur);
+ activateCellInset(cur, cur.idx(), cur.x_target());
+ return true;
}
-bool InsetTabular::moveNextCell(BufferView * bv, bool lock)
+bool InsetTabular::moveNextCell(LCursor & cur)
{
- if (isRightToLeft(bv)) {
- if (tabular.isFirstCellInRow(actcell)) {
- int row = tabular.row_of_cell(actcell);
+ lyxerr << "InsetTabular::moveNextCell 1 cur: " << cur << endl;
+ if (isRightToLeft(cur)) {
+ if (tabular.isFirstCellInRow(cur.idx())) {
+ int row = tabular.row_of_cell(cur.idx());
if (row == tabular.rows() - 1)
return false;
- actcell = tabular.getLastCellInRow(row);
- actcell = tabular.getCellBelow(actcell);
+ cur.idx() = tabular.getLastCellInRow(row);
+ cur.idx() = tabular.getCellBelow(cur.idx());
} else {
- if (!actcell)
+ if (cur.idx() == 0)
return false;
- --actcell;
+ --cur.idx();
}
} else {
- if (tabular.isLastCell(actcell))
+ if (tabular.isLastCell(cur.idx()))
return false;
- ++actcell;
+ ++cur.idx();
}
- if (lock) {
- bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
- isRightToLeftPar(bv->buffer()->params);
- activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
- }
- resetPos(bv);
+ cur.par() = 0;
+ cur.pos() = 0;
+ lyxerr << "InsetTabular::moveNextCell 2 cur: " << cur << endl;
+ resetPos(cur);
return true;
}
-bool InsetTabular::movePrevCell(BufferView * bv, bool lock)
+bool InsetTabular::movePrevCell(LCursor & cur)
{
- if (isRightToLeft(bv)) {
- if (tabular.isLastCellInRow(actcell)) {
- int row = tabular.row_of_cell(actcell);
+ if (isRightToLeft(cur)) {
+ if (tabular.isLastCellInRow(cur.idx())) {
+ int row = tabular.row_of_cell(cur.idx());
if (row == 0)
return false;
- actcell = tabular.getFirstCellInRow(row);
- actcell = tabular.getCellAbove(actcell);
+ cur.idx() = tabular.getFirstCellInRow(row);
+ cur.idx() = tabular.getCellAbove(cur.idx());
} else {
- if (tabular.isLastCell(actcell))
+ if (tabular.isLastCell(cur.idx()))
return false;
- ++actcell;
+ ++cur.idx();
}
} else {
- if (!actcell) // first cell
+ if (cur.idx() == 0) // first cell
return false;
- --actcell;
- }
- if (lock) {
- bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
- isRightToLeftPar(bv->buffer()->params);
- activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
+ --cur.idx();
}
- resetPos(bv);
+ cur.par() = 0;
+ cur.pos() = 0;
+ resetPos(cur);
return true;
}
-void InsetTabular::setFont(BufferView * bv, LyXFont const & font, bool tall,
- bool selectall)
-{
- if (selectall) {
- setSelection(0, tabular.getNumberOfCells() - 1);
- }
- if (hasSelection()) {
- recordUndo(bv, Undo::ATOMIC);
- bool const frozen = undo_frozen;
- if (!frozen)
- freezeUndo();
- // apply the fontchange on the whole selection
- int sel_row_start;
- int sel_row_end;
- int sel_col_start;
- int sel_col_end;
- getSelection(sel_row_start, sel_row_end, sel_col_start, sel_col_end);
- for(int i = sel_row_start; i <= sel_row_end; ++i)
- for(int j = sel_col_start; j <= sel_col_end; ++j)
- tabular.getCellInset(i, j).setFont(bv, font, tall, true);
-
- if (!frozen)
- unFreezeUndo();
- if (selectall)
- clearSelection();
- updateLocal(bv);
- }
- if (the_locking_inset)
- the_locking_inset->setFont(bv, font, tall);
-}
-
-
-bool InsetTabular::tabularFeatures(BufferView * bv, string const & what)
+bool InsetTabular::tabularFeatures(LCursor & cur, string const & what)
{
LyXTabular::Feature action = LyXTabular::LAST_ACTION;
string const val =
ltrim(what.substr(tabularFeature[i].feature.length()));
- tabularFeatures(bv, action, val);
+ tabularFeatures(cur, action, val);
return true;
}
+
namespace {
void checkLongtableSpecial(LyXTabular::ltType & ltt,
}
}
-}
+} // anon namespace
-void InsetTabular::tabularFeatures(BufferView * bv,
- LyXTabular::Feature feature,
- string const & value)
+void InsetTabular::tabularFeatures(LCursor & cur,
+ LyXTabular::Feature feature, string const & value)
{
+ BufferView & bv = cur.bv();
+ int actcell = cur.idx();
int sel_col_start;
int sel_col_end;
int sel_row_start;
}
if (hasSelection()) {
- getSelection(sel_row_start, sel_row_end, sel_col_start, sel_col_end);
+ getSelection(actcell, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
} else {
sel_col_start = sel_col_end = tabular.column_of_cell(actcell);
sel_row_start = sel_row_end = tabular.row_of_cell(actcell);
}
- recordUndo(bv, Undo::ATOMIC);
+ recordUndo(cur, Undo::ATOMIC);
int row = tabular.row_of_cell(actcell);
int column = tabular.column_of_cell(actcell);
switch (feature) {
- case LyXTabular::SET_PWIDTH:
- {
- LyXLength const vallen(value);
- LyXLength const & tmplen = tabular.getColumnPWidth(actcell);
-
- bool const update = (tmplen != vallen);
- tabular.setColumnPWidth(actcell, vallen);
- if (update) {
- // We need this otherwise we won't resize
- // the insettext of the active cell (if any)
- // until later (see InsetText::do_resize)
- unlockInsetInInset(bv, the_locking_inset);
- bv->update();
- }
-
- if (vallen.zero()
+ case LyXTabular::SET_PWIDTH: {
+ LyXLength const len(value);
+ tabular.setColumnPWidth(actcell, len);
+ if (len.zero()
&& tabular.getAlignment(actcell, true) == LYX_ALIGN_BLOCK)
- tabularFeatures(bv, LyXTabular::ALIGN_CENTER, string());
- else if (!vallen.zero()
+ tabularFeatures(cur, LyXTabular::ALIGN_CENTER, string());
+ else if (!len.zero()
&& tabular.getAlignment(actcell, true) != LYX_ALIGN_BLOCK)
- tabularFeatures(bv, LyXTabular::ALIGN_BLOCK, string());
+ tabularFeatures(cur, LyXTabular::ALIGN_BLOCK, string());
break;
}
case LyXTabular::SET_MPWIDTH:
- {
- LyXLength const vallen(value);
- LyXLength const & tmplen = tabular.getPWidth(actcell);
-
- bool const update = (tmplen != vallen);
- tabular.setMColumnPWidth(actcell, vallen);
- if (update) {
- // We need this otherwise we won't resize
- // the insettext of the active cell (if any)
- // until later (see InsetText::do_resize)
- unlockInsetInInset(bv, the_locking_inset);
- updateLocal(bv);
- }
- }
- break;
+ tabular.setMColumnPWidth(actcell, LyXLength(value));
+ break;
+
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
tabular.setAlignSpecial(actcell,value,feature);
- updateLocal(bv);
break;
+
case LyXTabular::APPEND_ROW:
// append the row into the tabular
- unlockInsetInInset(bv, the_locking_inset);
- tabular.appendRow(bv->buffer()->params, actcell);
- updateLocal(bv);
+ tabular.appendRow(bv.buffer()->params(), actcell);
+ tabular.setOwner(this);
break;
+
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
- unlockInsetInInset(bv, the_locking_inset);
- tabular.appendColumn(bv->buffer()->params, actcell);
+ tabular.appendColumn(bv.buffer()->params(), actcell);
+ tabular.setOwner(this);
actcell = tabular.getCellNumber(row, column);
- updateLocal(bv);
break;
+
case LyXTabular::DELETE_ROW:
- unlockInsetInInset(bv, the_locking_inset);
- for(int i = sel_row_start; i <= sel_row_end; ++i) {
+ for (int i = sel_row_start; i <= sel_row_end; ++i)
tabular.deleteRow(sel_row_start);
- }
if (sel_row_start >= tabular.rows())
--sel_row_start;
actcell = tabular.getCellNumber(sel_row_start, column);
clearSelection();
- updateLocal(bv);
break;
+
case LyXTabular::DELETE_COLUMN:
- unlockInsetInInset(bv, the_locking_inset);
- for(int i = sel_col_start; i <= sel_col_end; ++i) {
+ for (int i = sel_col_start; i <= sel_col_end; ++i)
tabular.deleteColumn(sel_col_start);
- }
if (sel_col_start >= tabular.columns())
--sel_col_start;
actcell = tabular.getCellNumber(row, sel_col_start);
clearSelection();
- updateLocal(bv);
break;
+
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
- case LyXTabular::TOGGLE_LINE_TOP:
- {
+ case LyXTabular::TOGGLE_LINE_TOP: {
bool lineSet = !tabular.topLine(actcell, flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setTopLine(
tabular.getCellNumber(i, j),
lineSet, flag);
- updateLocal(bv);
break;
}
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
- case LyXTabular::TOGGLE_LINE_BOTTOM:
- {
+ case LyXTabular::TOGGLE_LINE_BOTTOM: {
bool lineSet = !tabular.bottomLine(actcell, flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.getCellNumber(i, j),
lineSet,
flag);
- updateLocal(bv);
break;
}
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
- case LyXTabular::TOGGLE_LINE_LEFT:
- {
+ case LyXTabular::TOGGLE_LINE_LEFT: {
bool lineSet = !tabular.leftLine(actcell, flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.getCellNumber(i,j),
lineSet,
flag);
- updateLocal(bv);
break;
}
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
- case LyXTabular::TOGGLE_LINE_RIGHT:
- {
+ case LyXTabular::TOGGLE_LINE_RIGHT: {
bool lineSet = !tabular.rightLine(actcell, flag);
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.getCellNumber(i,j),
lineSet,
flag);
- updateLocal(bv);
break;
}
tabular.getCellNumber(i, j),
setAlign,
flag);
- updateLocal(bv);
break;
case LyXTabular::M_VALIGN_TOP:
tabular.setVAlignment(
tabular.getCellNumber(i, j),
setVAlign, flag);
- updateLocal(bv);
break;
case LyXTabular::MULTICOLUMN: {
if (tabular.isMultiColumn(actcell))
tabular.unsetMultiColumn(actcell);
else
- tabular.setMultiColumn(bv->buffer(), actcell, 1);
- updateLocal(bv);
+ tabular.setMultiColumn(bv.buffer(), actcell, 1);
break;
}
// we have a selection so this means we just add all this
s_start = sel_cell_start;
s_end = sel_cell_end;
}
- tabular.setMultiColumn(bv->buffer(), s_start, s_end - s_start + 1);
+ tabular.setMultiColumn(bv.buffer(), s_start, s_end - s_start + 1);
actcell = s_start;
clearSelection();
- updateLocal(bv);
break;
}
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setAllLines(
tabular.getCellNumber(i,j), setLines);
- updateLocal(bv);
break;
case LyXTabular::SET_LONGTABULAR:
tabular.setLongTabular(true);
- updateLocal(bv); // because this toggles displayed
break;
case LyXTabular::UNSET_LONGTABULAR:
tabular.setLongTabular(false);
- updateLocal(bv); // because this toggles displayed
break;
case LyXTabular::SET_ROTATE_TABULAR:
case LyXTabular::SET_ROTATE_CELL:
for (int i = sel_row_start; i <= sel_row_end; ++i)
- for (int j = sel_col_start; j<=sel_col_end; ++j)
+ for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setRotateCell(
tabular.getCellNumber(i, j), true);
break;
tabular.setLTFoot(row, flag, ltt, true);
break;
- case LyXTabular::SET_LTNEWPAGE: {
- bool what = !tabular.getLTNewPage(row);
- tabular.setLTNewPage(row, what);
+ case LyXTabular::SET_LTNEWPAGE:
+ tabular.setLTNewPage(row, !tabular.getLTNewPage(row));
break;
- }
// dummy stuff just to avoid warnings
case LyXTabular::LAST_ACTION:
break;
}
- InsetTabularMailer(*this).updateDialog(bv);
-}
-
-
-bool InsetTabular::activateCellInset(BufferView * bv, int x, int y,
- mouse_button::state button, bool behind)
-{
- UpdatableInset & inset = tabular.getCellInset(actcell);
- if (behind) {
-#warning metrics?
- x = inset.x() + inset.width();
- y = inset.descent();
- }
- //inset_x = cursorx_ - top_x + tabular.getBeginningOfTextInCell(actcell);
- //inset_y = cursory_;
- inset.localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, x, y, button));
- if (!the_locking_inset)
- return false;
- updateLocal(bv);
- return the_locking_inset;
-}
-
-
-bool InsetTabular::activateCellInsetAbs(BufferView * bv, int x, int y,
- mouse_button::state button)
-{
- inset_x = cursorx_ - top_x + tabular.getBeginningOfTextInCell(actcell);
- inset_y = cursory_;
- return activateCellInset(bv, x - inset_x, y - inset_y, button);
-}
-
-
-bool InsetTabular::insetHit(BufferView *, int x, int) const
-{
- return x + top_x > cursorx_ + tabular.getBeginningOfTextInCell(actcell);
+ updateLocal(cur);
+ InsetTabularMailer(*this).updateDialog(&bv);
}
-void InsetTabular::deleteLyXText(BufferView * /*bv*/, bool /*recursive*/) const
+void InsetTabular::activateCellInset(LCursor & cur, int cell, int x, int y)
{
- //resizeLyXText(bv, recursive);
+ tabular.getCellInset(cell).edit(cur, x, y);
+ cur.idx() = cell;
+ updateLocal(cur);
}
-LyXText * InsetTabular::getLyXText(BufferView const * bv,
- bool const recursive) const
+void InsetTabular::activateCellInset(LCursor & cur, int cell, bool behind)
{
- if (the_locking_inset)
- return the_locking_inset->getLyXText(bv, recursive);
- return InsetOld::getLyXText(bv, recursive);
+ tabular.getCellInset(cell).edit(cur, behind);
+ cur.idx() = cell;
+ updateLocal(cur);
}
bool InsetTabular::showInsetDialog(BufferView * bv) const
{
- if (!the_locking_inset || !the_locking_inset->showInsetDialog(bv))
- InsetTabularMailer(*this).showDialog(bv);
+ InsetTabularMailer(*this).showDialog(bv);
return true;
}
void InsetTabular::openLayoutDialog(BufferView * bv) const
{
- if (the_locking_inset) {
- InsetTabular * inset = static_cast<InsetTabular *>
- (the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE));
- if (inset) {
- inset->openLayoutDialog(bv);
- return;
- }
- }
InsetTabularMailer(*this).showDialog(bv);
}
// function returns an object as defined in func_status.h:
// states OK, Unknown, Disabled, On, Off.
//
-FuncStatus InsetTabular::getStatus(string const & what) const
+FuncStatus InsetTabular::getStatus(string const & what, int actcell) const
{
- int action = LyXTabular::LAST_ACTION;
FuncStatus status;
+ int action = LyXTabular::LAST_ACTION;
int i = 0;
for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
string const tmp = tabularFeature[i].feature;
if (tmp == what.substr(0, tmp.length())) {
//if (!compare(tabularFeatures[i].feature.c_str(), what.c_str(),
- // tabularFeatures[i].feature.length())) {
+ // tabularFeatures[i].feature.length()))
action = tabularFeature[i].action;
break;
}
}
if (action == LyXTabular::LAST_ACTION) {
status.clear();
- return status.unknown(true);
+ status.unknown(true);
+ return status;
}
string const argument
bool flag = true;
if (hasSelection())
- getSelection(sel_row_start, sel_row_end, dummy, dummy);
+ getSelection(actcell, sel_row_start, sel_row_end, dummy, dummy);
else
sel_row_start = sel_row_end = tabular.row_of_cell(actcell);
case LyXTabular::DELETE_COLUMN:
case LyXTabular::SET_ALL_LINES:
case LyXTabular::UNSET_ALL_LINES:
- return status.clear();
+ status.clear();
+ return status;
case LyXTabular::MULTICOLUMN:
status.setOnOff(tabular.isMultiColumn(actcell));
case LyXTabular::M_VALIGN_TOP:
flag = false;
case LyXTabular::VALIGN_TOP:
- status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP);
+ status.setOnOff(
+ tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP);
break;
case LyXTabular::M_VALIGN_BOTTOM:
flag = false;
case LyXTabular::VALIGN_BOTTOM:
- status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
+ status.setOnOff(
+ tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
break;
case LyXTabular::M_VALIGN_MIDDLE:
flag = false;
case LyXTabular::VALIGN_MIDDLE:
- status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
+ status.setOnOff(
+ tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
break;
case LyXTabular::SET_LONGTABULAR:
}
-void InsetTabular::getLabelList(std::vector<string> & list) const
+void InsetTabular::getLabelList(Buffer const & buffer,
+ vector<string> & list) const
{
- tabular.getLabelList(list);
+ tabular.getLabelList(buffer, list);
}
-bool InsetTabular::copySelection(BufferView * bv)
+bool InsetTabular::copySelection(BufferView & bv)
{
if (!hasSelection())
return false;
if (sel_row_start > sel_row_end)
swap(sel_row_start, sel_row_end);
- delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params, this, tabular);
+ paste_tabular.reset(new LyXTabular(tabular));
+ paste_tabular->setOwner(this);
for (int i = 0; i < sel_row_start; ++i)
paste_tabular->deleteRow(0);
true, true);
ostringstream os;
- paste_tabular->ascii(*bv->buffer(), os,
- ownerPar(*bv->buffer(), this).params().depth(), true, '\t');
- bv->stuffClipboard(STRCONV(os.str()));
+ OutputParams const runparams;
+ paste_tabular->plaintext(*bv.buffer(), os, runparams,
+ ownerPar(*bv.buffer(), this).params().depth(), true, '\t');
+ bv.stuffClipboard(os.str());
return true;
}
-bool InsetTabular::pasteSelection(BufferView * bv)
+bool InsetTabular::pasteSelection(BufferView & bv)
{
if (!paste_tabular)
return false;
-
+ int actcell = bv.cursor().idx();
+ int actcol = tabular.column_of_cell(actcell);
+ int actrow = tabular.row_of_cell(actcell);
for (int r1 = 0, r2 = actrow;
r1 < paste_tabular->rows() && r2 < tabular.rows();
++r1, ++r2) {
InsetText & inset = tabular.getCellInset(r2, c2);
inset = paste_tabular->getCellInset(r1, c1);
inset.setOwner(this);
- inset.deleteLyXText(bv);
inset.markNew();
}
}
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
- tabular.getCellInset(tabular.getCellNumber(i, j)).clear(bp.tracking_changes);
+ tabular.getCellInset(tabular.getCellNumber(i, j))
+ .clear(bp.tracking_changes);
return true;
}
-bool InsetTabular::isRightToLeft(BufferView * bv)
-{
- return bv->getParentLanguage(this)->RightToLeft();
-}
-
-
-int InsetTabular::scroll(bool recursive) const
+bool InsetTabular::isRightToLeft(LCursor & cur)
{
- int sx = UpdatableInset::scroll(false);
-
- if (recursive && the_locking_inset)
- sx += the_locking_inset->scroll(recursive);
-
- return sx;
+ return cur.bv().getParentLanguage(this)->RightToLeft();
}
-void InsetTabular::getSelection(int & srow, int & erow,
- int & scol, int & ecol) const
+void InsetTabular::getSelection(int actcell,
+ int & srow, int & erow, int & scol, int & ecol) const
{
int const start = hasSelection() ? sel_cell_start : actcell;
int const end = hasSelection() ? sel_cell_end : actcell;
}
-ParagraphList * InsetTabular::getParagraphs(int i) const
+int InsetTabular::numParagraphs() const
{
- return (i < tabular.getNumberOfCells())
- ? tabular.getCellInset(i).getParagraphs(0)
- : 0;
-}
-
-
-LyXCursor const & InsetTabular::cursor(BufferView * bv) const
-{
- if (the_locking_inset)
- return the_locking_inset->cursor(bv);
- return InsetOld::cursor(bv);
+ return tabular.getNumberOfCells();
}
-InsetOld * InsetTabular::getInsetFromID(int id_arg) const
+LyXText * InsetTabular::getText(int i) const
{
- if (id_arg == id())
- return const_cast<InsetTabular *>(this);
-
- for (int i = 0; i < tabular.rows(); ++i) {
- for (int j = 0; j < tabular.columns(); ++j) {
- InsetOld * inset = tabular.getCellInset(i, j).getInsetFromID(id_arg);
- if (inset)
- return inset;
- }
- }
- return 0;
-}
-
-
-WordLangTuple const
-InsetTabular::selectNextWordToSpellcheck(BufferView * bv, float & value) const
-{
- if (the_locking_inset) {
- WordLangTuple word(the_locking_inset->selectNextWordToSpellcheck(bv, value));
- if (!word.word().empty())
- return word;
- if (tabular.isLastCell(actcell)) {
- bv->unlockInset(const_cast<InsetTabular *>(this));
- return WordLangTuple();
- }
- ++actcell;
- }
- // otherwise we have to lock the next inset and ask for it's selecttion
- tabular.getCellInset(actcell)
- .localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
- WordLangTuple word(selectNextWordInt(bv, value));
- if (!word.word().empty())
- resetPos(bv);
- return word;
-}
-
-
-WordLangTuple InsetTabular::selectNextWordInt(BufferView * bv, float & value) const
-{
- // when entering this function the inset should be ALWAYS locked!
- Assert(the_locking_inset);
-
- WordLangTuple word(the_locking_inset->selectNextWordToSpellcheck(bv, value));
- if (!word.word().empty())
- return word;
-
- if (tabular.isLastCell(actcell)) {
- bv->unlockInset(const_cast<InsetTabular *>(this));
- return WordLangTuple();
- }
-
- // otherwise we have to lock the next inset and ask for it's selecttion
- ++actcell;
- tabular.getCellInset(actcell)
- .localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
- return selectNextWordInt(bv, value);
-}
-
-
-void InsetTabular::selectSelectedWord(BufferView * bv)
-{
- if (the_locking_inset)
- the_locking_inset->selectSelectedWord(bv);
+ return i < tabular.getNumberOfCells()
+ ? tabular.getCellInset(i).getText(0)
+ : 0;
}
}
-bool InsetTabular::nextChange(BufferView * bv, lyx::pos_type & length)
-{
- if (the_locking_inset) {
- if (the_locking_inset->nextChange(bv, length)) {
- updateLocal(bv);
- return true;
- }
- if (tabular.isLastCell(actcell))
- return false;
- ++actcell;
- }
- InsetText & inset = tabular.getCellInset(actcell);
- if (inset.nextChange(bv, length)) {
- updateLocal(bv);
- return true;
- }
- while (!tabular.isLastCell(actcell)) {
- ++actcell;
- InsetText & inset = tabular.getCellInset(actcell);
- if (inset.nextChange(bv, length)) {
- updateLocal(bv);
- return true;
- }
- }
- return false;
-}
-
-
-bool InsetTabular::searchForward(BufferView * bv, string const & str,
- bool cs, bool mw)
-{
- int cell = 0;
- if (the_locking_inset) {
- if (the_locking_inset->searchForward(bv, str, cs, mw)) {
- updateLocal(bv);
- return true;
- }
- if (tabular.isLastCell(actcell))
- return false;
- cell = actcell + 1;
- }
- InsetText & inset = tabular.getCellInset(cell);
- if (inset.searchForward(bv, str, cs, mw)) {
- updateLocal(bv);
- return true;
- }
- while (!tabular.isLastCell(cell)) {
- ++cell;
- InsetText & inset = tabular.getCellInset(cell);
- if (inset.searchForward(bv, str, cs, mw)) {
- updateLocal(bv);
- return true;
- }
- }
- return false;
-}
-
-
-bool InsetTabular::searchBackward(BufferView * bv, string const & str,
- bool cs, bool mw)
-{
- int cell = tabular.getNumberOfCells();
- if (the_locking_inset) {
- if (the_locking_inset->searchBackward(bv, str, cs, mw)) {
- updateLocal(bv);
- return true;
- }
- cell = actcell;
- }
-
- while (cell) {
- --cell;
- InsetText & inset = tabular.getCellInset(cell);
- if (inset.searchBackward(bv, str, cs, mw)) {
- updateLocal(bv);
- return true;
- }
- }
- return false;
-}
-
-
-bool InsetTabular::insetAllowed(InsetOld::Code code) const
+bool InsetTabular::forceDefaultParagraphs(InsetBase const * in) const
{
- if (the_locking_inset)
- return the_locking_inset->insetAllowed(code);
- // we return true here because if the inset is not locked someone
- // wants to insert something in one of our insettexts and we generally
- // allow to do so.
- return true;
-}
-
-
-bool InsetTabular::forceDefaultParagraphs(InsetOld const * in) const
-{
- const int cell = tabular.getCellFromInset(in, actcell);
+ const int cell = tabular.getCellFromInset(in);
if (cell != -1)
return tabular.getPWidth(cell).zero();
- // well we didn't obviously find it so maybe our owner knows more
- if (owner())
- return owner()->forceDefaultParagraphs(in);
+ // this is a workaround for a crash (New, Insert->Tabular,
+ // Insert->FootNote)
+ if (!owner())
+ return false;
- lyxerr << "If we're here there is really something strange going on!"
- << endl;
- return false;
+ // well we didn't obviously find it so maybe our owner knows more
+ BOOST_ASSERT(owner());
+ return owner()->forceDefaultParagraphs(in);
}
-bool InsetTabular::insertAsciiString(BufferView * bv, string const & buf,
+bool InsetTabular::insertAsciiString(BufferView & bv, string const & buf,
bool usePaste)
{
if (buf.length() <= 0)
string::size_type len = buf.length();
string::size_type p = 0;
+ int actcell = bv.cursor().idx();
+ int actcol = tabular.column_of_cell(actcell);
+ int actrow = tabular.row_of_cell(actcell);
+
while (p < len && (p = buf.find_first_of("\t\n", p)) != string::npos) {
switch (buf[p]) {
case '\t':
++cols;
break;
case '\n':
- if ((p+1) < len)
+ if (p + 1 < len)
++rows;
maxCols = max(cols, maxCols);
cols = 1;
int ocol = 0;
int row = 0;
if (usePaste) {
- delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params,
- this, rows, maxCols);
- loctab = paste_tabular;
+ paste_tabular.reset(
+ new LyXTabular(bv.buffer()->params(), rows, maxCols));
+ paste_tabular->setOwner(this);
+ loctab = paste_tabular.get();
cols = 0;
} else {
loctab = &tabular;
// we can only set this if we are not too far right
if (cols < columns) {
InsetText & inset = loctab->getCellInset(cell);
- LyXFont const font = inset.getLyXText(bv)->
- getFont(inset.paragraphs.begin(), 0);
+ LyXFont const font = inset.text_.
+ getFont(inset.paragraphs().begin(), 0);
inset.setText(buf.substr(op, p - op), font);
++cols;
++cell;
// we can only set this if we are not too far right
if (cols < columns) {
InsetText & inset = tabular.getCellInset(cell);
- LyXFont const font = inset.getLyXText(bv)->
- getFont(inset.paragraphs.begin(), 0);
+ LyXFont const font = inset.text_.
+ getFont(inset.paragraphs().begin(), 0);
inset.setText(buf.substr(op, p - op), font);
}
cols = ocol;
// check for the last cell if there is no trailing '\n'
if (cell < cells && op < len) {
InsetText & inset = loctab->getCellInset(cell);
- LyXFont const font = inset.getLyXText(bv)->
- getFont(inset.paragraphs.begin(), 0);
+ LyXFont const font = inset.text_.getFont(inset.paragraphs().begin(), 0);
inset.setText(buf.substr(op, len - op), font);
}
-
return true;
}
{
int const rows = tabular.rows();
int const columns = tabular.columns();
- for (int i = 0; i < rows; ++i)
+ for (int i = 0; i < rows; ++i) {
for (int j = 0; j < columns; ++j)
tabular.getCellInset(i, j).addPreview(loader);
+ }
+}
+
+
+
+void InsetTabular::clearSelection() const
+{
+ sel_cell_start = 0;
+ sel_cell_end = 0;
+ has_selection = false;
+}
+
+
+void InsetTabular::setSelection(int start, int end) const
+{
+ sel_cell_start = start;
+ sel_cell_end = end;
+ has_selection = true;
}
int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
{
- istringstream data(STRCONV(in));
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
string const InsetTabularMailer::params2string(InsetTabular const & inset)
{
- Buffer const & buffer = inset.buffer();
-
ostringstream data;
- data << name_ << " \\active_cell " << inset.getActCell() << '\n';
- inset.write(buffer, data);
+#warning wrong!
+ //data << name_ << " \\active_cell " << inset.getActCell() << '\n';
+ data << name_ << " \\active_cell " << 0 << '\n';
+ inset.write(inset.buffer(), data);
data << "\\end_inset\n";
- return STRCONV(data.str());
+ return data.str();
}
projects / lyx.git / blobdiff