*
* \author Jürgen Vigna
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "insettabular.h"
-#include "insettext.h"
#include "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "lfuns.h"
+#include "cursor.h"
#include "debug.h"
-#include "dimension.h"
+#include "dispatchresult.h"
#include "funcrequest.h"
+#include "FuncStatus.h"
#include "gettext.h"
#include "language.h"
-#include "LaTeXFeatures.h"
-#include "Lsstream.h"
+#include "LColor.h"
#include "lyx_cb.h"
-#include "lyxfunc.h"
-#include "lyxlength.h"
#include "lyxlex.h"
-#include "lyxtext.h"
-#include "ParagraphParameters.h"
-#include "undo_funcs.h"
-#include "WordLangTuple.h"
#include "metricsinfo.h"
+#include "outputparams.h"
+#include "paragraph.h"
+#include "paragraph_funcs.h"
+#include "ParagraphParameters.h"
+#include "undo.h"
#include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
#include "frontends/font_metrics.h"
#include "frontends/LyXView.h"
#include "frontends/Painter.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
-
-#include <fstream>
-#include <algorithm>
-#include <cstdlib>
-#include <map>
-//#include <signal.h>
+#include "support/std_sstream.h"
+#include <iostream>
+using lyx::graphics::PreviewLoader;
-using namespace lyx::support;
+using lyx::support::ltrim;
+using lyx::support::strToInt;
+using lyx::support::strToDbl;
-using std::vector;
-using std::ostream;
-using std::ifstream;
-using std::max;
using std::endl;
-using std::swap;
using std::max;
+using std::swap;
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
-namespace grfx = lyx::graphics;
namespace {
int const ADD_TO_TABULAR_WIDTH = 2;
///
-LyXTabular * paste_tabular = 0;
+boost::scoped_ptr<LyXTabular> paste_tabular;
struct TabularFeature {
{ LyXTabular::ALIGN_BLOCK, "align-block" },
{ LyXTabular::VALIGN_TOP, "valign-top" },
{ LyXTabular::VALIGN_BOTTOM, "valign-bottom" },
- { LyXTabular::VALIGN_CENTER, "valign-center" },
+ { LyXTabular::VALIGN_MIDDLE, "valign-middle" },
{ LyXTabular::M_TOGGLE_LINE_TOP, "m-toggle-line-top" },
{ LyXTabular::M_TOGGLE_LINE_BOTTOM, "m-toggle-line-bottom" },
{ LyXTabular::M_TOGGLE_LINE_LEFT, "m-toggle-line-left" },
{ LyXTabular::M_ALIGN_CENTER, "m-align-center" },
{ LyXTabular::M_VALIGN_TOP, "m-valign-top" },
{ LyXTabular::M_VALIGN_BOTTOM, "m-valign-bottom" },
- { LyXTabular::M_VALIGN_CENTER, "m-valign-center" },
+ { LyXTabular::M_VALIGN_MIDDLE, "m-valign-middle" },
{ LyXTabular::MULTICOLUMN, "multicolumn" },
{ LyXTabular::SET_ALL_LINES, "set-all-lines" },
{ LyXTabular::UNSET_ALL_LINES, "unset-all-lines" },
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)
+ : tabular(buf.params(), max(rows, 1), max(columns, 1)),
+ buffer_(&buf), cursorx_(0), cursory_(0)
{
- // for now make it always display as display() inset
- // just for test!!!
+ tabular.setOwner(this);
the_locking_inset = 0;
- old_locking_inset = 0;
- locked = false;
- oldcell = -1;
- actrow = actcell = 0;
+ actrow = 0;
+ actcell = 0;
clearSelection();
- need_update = INIT;
- in_update = false;
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_)
+ : UpdatableInset(tab), tabular(tab.tabular),
+ buffer_(tab.buffer_), cursorx_(0), cursory_(0)
{
+ tabular.setOwner(this);
the_locking_inset = 0;
- old_locking_inset = 0;
- locked = false;
- oldcell = -1;
- actrow = actcell = 0;
+ actrow = 0;
+ actcell = 0;
clearSelection();
- need_update = INIT;
- in_update = false;
in_reset_pos = 0;
- inset_x = 0;
- inset_y = 0;
}
InsetTabular::~InsetTabular()
{
- InsetTabularMailer mailer(*this);
- mailer.hideDialog();
+ InsetTabularMailer(*this).hideDialog();
}
-InsetBase * InsetTabular::clone() const
+auto_ptr<InsetBase> InsetTabular::clone() const
{
- return new InsetTabular(*this);
+ return auto_ptr<InsetBase>(new InsetTabular(*this));
}
-BufferView * InsetTabular::view() const
+Buffer const & InsetTabular::buffer() const
{
- return buffer_->getUser();
+ return *buffer_;
}
}
-void InsetTabular::write(Buffer const * buf, ostream & os) const
+void InsetTabular::write(Buffer const & buf, ostream & os) const
{
- os << " Tabular" << endl;
+ os << "Tabular" << endl;
tabular.write(buf, os);
}
-void InsetTabular::read(Buffer const * buf, LyXLex & lex)
+void InsetTabular::read(Buffer const & buf, LyXLex & lex)
{
bool const old_format = (lex.getString() == "\\LyXTable");
tabular.read(buf, lex);
- need_update = INIT;
-
if (old_format)
return;
}
-void InsetTabular::metrics(MetricsInfo &,
- Dimension & dim) const
+void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ //lyxerr << "InsetTabular::metrics: " << mi.base.bv << " width: " <<
+ // mi.base.textwidth << "\n";
+ if (!mi.base.bv) {
+ lyxerr << "InsetTabular::metrics: need bv" << endl;
+ BOOST_ASSERT(false);
+ }
+
+ calculate_dimensions_of_cells(mi);
+
dim.asc = tabular.getAscentOfRow(0);
dim.des = tabular.getHeightOfTabular() - tabular.getAscentOfRow(0) + 1;
dim.wid = tabular.getWidthOfTabular() + 2 * ADD_TO_TABULAR_WIDTH;
+ dim_ = dim;
}
void InsetTabular::draw(PainterInfo & pi, int x, int y) const
{
- if (nodraw()) {
- need_update = FULL;
- return;
- }
+ //lyxerr << "InsetTabular::draw: " << x << " " << y << endl;
BufferView * bv = pi.base.bv;
- int i;
- int j;
- int nx;
-#if 0
- UpdatableInset::draw(pi, x, y);
-#else
if (!owner())
x += scroll();
-#endif
top_x = x;
top_baseline = y;
x += ADD_TO_TABULAR_WIDTH;
int cell = 0;
- int cx;
first_visible_cell = -1;
- for (i = 0; i < tabular.rows(); ++i) {
- nx = x;
+ for (int i = 0; i < tabular.rows(); ++i) {
+ int nx = x;
cell = tabular.getCellNumber(i, 0);
- if (!((y + tabular.getDescentOfRow(i)) > 0) &&
- (y - tabular.getAscentOfRow(i)) < pi.pain.paperHeight())
+ if (y + tabular.getDescentOfRow(i) <= 0 &&
+ y - tabular.getAscentOfRow(i) < pi.pain.paperHeight())
{
- y += tabular.getDescentOfRow(i) +
- tabular.getAscentOfRow(i + 1) +
- tabular.getAdditionalHeight(i + 1);
+ y += tabular.getDescentOfRow(i) +
+ tabular.getAscentOfRow(i + 1) +
+ tabular.getAdditionalHeight(i + 1);
continue;
}
- for (j = 0; j < tabular.columns(); ++j) {
+ for (int j = 0; j < tabular.columns(); ++j) {
if (nx > bv->workWidth())
break;
if (tabular.isPartOfMultiColumn(i, j))
continue;
- cx = nx + tabular.getBeginningOfTextInCell(cell);
+ int cx = nx + tabular.getBeginningOfTextInCell(cell);
if (first_visible_cell < 0)
first_visible_cell = cell;
if (hasSelection()) {
drawCellSelection(pi.pain, nx, y, i, j, cell);
}
- tabular.getCellInset(cell)->draw(pi, cx, y);
+ tabular.getCellInset(cell).draw(pi, cx, y);
drawCellLines(pi.pain, nx, y, i, cell);
nx += tabular.getWidthOfColumn(cell);
++cell;
tabular.getAscentOfRow(i + 1) +
tabular.getAdditionalHeight(i + 1);
}
-
- need_update = NONE;
}
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());
+ BOOST_ASSERT(hasSelection());
int cs = tabular.column_of_cell(sel_cell_start);
int ce = tabular.column_of_cell(sel_cell_end);
if (cs > ce) {
}
-void InsetTabular::update(BufferView * bv, bool reinit)
-{
- if (in_update) {
- if (reinit) {
- resetPos(bv);
- if (owner())
- owner()->update(bv, true);
- }
- return;
- }
- in_update = true;
- if (reinit) {
- need_update = INIT;
- if (calculate_dimensions_of_cells(bv, true))
- resetPos(bv);
- if (owner())
- owner()->update(bv, true);
- in_update = false;
- return;
- }
- if (the_locking_inset)
- the_locking_inset->update(bv, reinit);
- if (need_update < FULL &&
- bv->text->refreshStatus() == LyXText::REFRESH_AREA)
- {
- need_update = FULL;
- }
-
- switch (need_update) {
- case INIT:
- case FULL:
- case CELL:
- if (calculate_dimensions_of_cells(bv, false)) {
- need_update = INIT;
- resetPos(bv);
- }
- break;
- case SELECTION:
- need_update = FULL;
- break;
- default:
- break;
- }
- in_update = false;
-}
-
-
string const InsetTabular::editMessage() const
{
return _("Opened table");
}
-void InsetTabular::insetUnlock(BufferView * bv)
-{
- if (the_locking_inset) {
- the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL);
- the_locking_inset = 0;
- }
- actcell = 0;
- oldcell = -1;
- locked = false;
- if (scroll(false) || hasSelection()) {
- clearSelection();
- if (scroll(false)) {
- scroll(bv, 0.0F);
- }
- updateLocal(bv, FULL);
- }
-}
-
-
-void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what) const
-{
- if (what == INIT) {
- calculate_dimensions_of_cells(bv, true);
- }
- if (!locked && what == CELL)
- what = FULL;
- if (need_update < what) // only set this if it has greater update
- need_update = what;
- // Dirty Cast! (Lgb)
- if (need_update != NONE) {
- bv->updateInset(const_cast<InsetTabular *>(this));
- if (locked)
- resetPos(bv);
- }
-}
-
-
-bool InsetTabular::lockInsetInInset(BufferView * bv, UpdatableInset * inset)
-{
- 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);
- }
- lyxerr[Debug::INSETTEXT] << "NOT OK" << endl;
- return false;
-}
-
-
-bool InsetTabular::unlockInsetInInset(BufferView * bv, UpdatableInset * inset,
- bool lr)
-{
- 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, CELL);
- // 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 mailer(*this);
- mailer.updateDialog(bv);
- oldcell = actcell;
- }
- return true;
- }
- return false;
-}
-
-
-bool InsetTabular::updateInsetInInset(BufferView * bv, Inset * inset)
+void InsetTabular::updateLocal(BufferView * bv) const
{
- Inset * tl_inset = inset;
- // look if this inset is really inside myself!
- while(tl_inset->owner() && tl_inset->owner() != this)
- tl_inset = tl_inset->owner();
- // if we enter here it's not ower inset
- if (!tl_inset->owner())
- return false;
- // we only have to do this if this is a subinset of our cells
- if (tl_inset != inset) {
- if (!static_cast<InsetText *>(tl_inset)->updateInsetInInset(bv, inset))
- return false;
- }
- updateLocal(bv, CELL);
- return true;
+ bv->update();
+ resetPos(bv);
}
int InsetTabular::insetInInsetY() const
{
- if (!the_locking_inset)
- return 0;
- return inset_y + the_locking_inset->insetInInsetY();
-}
-
-
-UpdatableInset * InsetTabular::getLockingInset() const
-{
- return the_locking_inset ? the_locking_inset->getLockingInset() :
- const_cast<InsetTabular *>(this);
-}
-
-
-UpdatableInset * InsetTabular::getFirstLockingInsetOfType(Inset::Code c)
-{
- if (c == lyxCode())
- return this;
if (the_locking_inset)
- return the_locking_inset->getFirstLockingInsetOfType(c);
+ return cursory_ + the_locking_inset->insetInInsetY();
return 0;
}
-bool InsetTabular::insertInset(BufferView * bv, Inset * inset)
+bool InsetTabular::insertInset(BufferView * bv, InsetOld * inset)
{
- if (the_locking_inset)
- return the_locking_inset->insertInset(bv, inset);
- return false;
+ return the_locking_inset && the_locking_inset->insertInset(bv, inset);
}
if (hasSelection() && cmd.button() == mouse_button::button3)
return;
- if (hasSelection()) {
+ if (hasSelection())
clearSelection();
- updateLocal(cmd.view(), SELECTION);
- }
- int const ocell = actcell;
- int const orow = actrow;
BufferView * bv = cmd.view();
- if (!locked) {
- locked = true;
- the_locking_inset = 0;
- inset_x = 0;
- inset_y = 0;
- }
+ the_locking_inset = 0;
setPos(bv, cmd.x, cmd.y);
- if (actrow != orow)
- updateLocal(bv, NONE);
clearSelection();
-#if 0
- if (cmd.button() == mouse_button::button3) {
- if ((ocell != actcell) && the_locking_inset) {
- the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL);
- the_locking_inset = 0;
- }
- return;
- }
-#endif
-
- bool const inset_hit = insetHit(bv, cmd.x, cmd.y);
-
- 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;
- }
-
- if (the_locking_inset) {
- the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL);
- the_locking_inset = 0;
- }
-
- if (cmd.button() == mouse_button::button2) {
- localDispatch(FuncRequest(bv, LFUN_PASTESELECTION, "paragraph"));
- return;
- }
+ the_locking_inset = 0;
- if (inset_hit && bv->theLockingInset()) {
- if (!bv->lockInset(static_cast<UpdatableInset*>
- (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);
- return;
- }
+ if (cmd.button() == mouse_button::button2)
+ dispatch(FuncRequest(bv, LFUN_PASTESELECTION, "paragraph"));
}
-bool InsetTabular::lfunMouseRelease(FuncRequest const & cmd)
+void 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) {
+ if (cmd.button() == mouse_button::button3)
InsetTabularMailer(*this).showDialog(cmd.view());
- return true;
- }
- return ret;
}
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;
- }
-
BufferView * bv = cmd.view();
int const old_cell = actcell;
setPos(bv, cmd.x, cmd.y);
- if (!hasSelection()) {
+ if (!hasSelection())
setSelection(actcell, actcell);
- updateLocal(bv, SELECTION);
- } else if (old_cell != actcell) {
+ else if (old_cell != actcell)
setSelection(sel_cell_start, actcell);
- updateLocal(bv, SELECTION);
+}
+
+
+void InsetTabular::edit(BufferView * bv, bool left)
+{
+ lyxerr << "InsetTabular::edit: " << this
+ << " first text: " << tabular.cell_info[0][0].inset.getText(0)
+ << " first cell: " << &tabular.cell_info[0][0].inset << endl;
+
+ finishUndo();
+ the_locking_inset = 0;
+
+ if (left) {
+ if (isRightToLeft(bv))
+ actcell = tabular.getLastCellInRow(0);
+ else
+ actcell = 0;
+ } else {
+ if (isRightToLeft(bv))
+ actcell = tabular.getFirstCellInRow(tabular.rows()-1);
+ else
+ actcell = tabular.getNumberOfCells() - 1;
}
+ clearSelection();
+ resetPos(bv);
+ bv->fitCursor();
+ bv->cursor().push(this);
}
-Inset::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
+void InsetTabular::edit(BufferView * bv, int x, int y)
{
+ lyxerr << "InsetTabular::edit: " << this << " first cell "
+ << &tabular.cell_info[0][0].inset << endl;
+
+ finishUndo();
+ the_locking_inset = 0;
+ setPos(bv, x, y);
+ clearSelection();
+ finishUndo();
+ int xx = cursorx_ - top_x + tabular.getBeginningOfTextInCell(actcell);
+ bv->cursor().push(this);
+ if (x > xx)
+ activateCellInset(bv, x - xx, y - cursory_);
+}
+
+
+DispatchResult
+InsetTabular::priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &)
+{
+ lyxerr << "InsetTabular::dispatch: " << cmd << endl;
// 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();
+ DispatchResult result(true, true);
+ BufferView * bv = cmd.view();
+ bool hs = hasSelection();
- if (cmd.action == LFUN_INSET_EDIT) {
+ switch (cmd.action) {
- if (!bv->lockInset(this)) {
- lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl;
- return DISPATCHED;
- }
+ case LFUN_MOUSE_PRESS:
+ lfunMousePress(cmd);
+ return DispatchResult(true, true);
- finishUndo();
- locked = true;
- the_locking_inset = 0;
- inset_x = 0;
- inset_y = 0;
-
- if (cmd.argument.size()) {
- if (cmd.argument == "left") {
- if (isRightToLeft(bv))
- actcell = tabular.getLastCellInRow(0);
- else
- actcell = 0;
- } else {
- if (isRightToLeft(bv))
- actcell = tabular.getFirstCellInRow(tabular.rows()-1);
- else
- actcell = tabular.getNumberOfCells() - 1;
- }
- clearSelection();
- resetPos(bv);
- bv->fitCursor();
- }
+ case LFUN_MOUSE_MOTION:
+ lfunMouseMotion(cmd);
+ return DispatchResult(true, true);
- else {
- setPos(bv, cmd.x, cmd.y);
- clearSelection();
- finishUndo();
- if (insetHit(bv, cmd.x, cmd.y) && cmd.button() != mouse_button::button3) {
- activateCellInsetAbs(bv, cmd.x, cmd.y, cmd.button());
- }
- }
- return DISPATCHED;
- }
+ case LFUN_MOUSE_RELEASE:
+ lfunMouseRelease(cmd);
+ return DispatchResult(true, true);
- if (result == DISPATCHED || result == DISPATCHED_NOUPDATE) {
- resetPos(bv);
+ case LFUN_CELL_BACKWARD:
+ case LFUN_CELL_FORWARD:
+ if (cmd.action == LFUN_CELL_FORWARD)
+ moveNextCell(bv, the_locking_inset != 0);
+ else
+ movePrevCell(bv, the_locking_inset != 0);
+ clearSelection();
+ if (!the_locking_inset)
+ return DispatchResult(true);
return result;
- }
-
- if (cmd.action < 0 && cmd.argument.empty())
- return FINISHED;
-
- bool hs = hasSelection();
- 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(Inset::TABULAR_CODE) == this) {
- switch (cmd.action) {
- case LFUN_MOUSE_PRESS:
- lfunMousePress(cmd);
- return DISPATCHED;
-
- case LFUN_MOUSE_MOTION:
- lfunMouseMotion(cmd);
- return DISPATCHED;
-
- case LFUN_MOUSE_RELEASE:
- return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
-
- 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);
+ case LFUN_SCROLL_INSET:
+ if (!cmd.argument.empty()) {
+ if (cmd.argument.find('.') != cmd.argument.npos)
+ scroll(cmd.view(), static_cast<float>(strToDbl(cmd.argument)));
else
- movePrevCell(bv, old_locking_inset != 0);
- clearSelection();
- if (hs)
- updateLocal(bv, SELECTION);
- if (!the_locking_inset) {
- return DISPATCHED_NOUPDATE;
- }
- return result;
- // this to avoid compiler warnings.
- default:
- break;
+ scroll(cmd.view(), strToInt(cmd.argument));
+ cmd.view()->update();
+ return DispatchResult(true, true);
}
- }
- 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, FULL);
- }
- return result;
- } else if (result == DISPATCHED) {
- updateLocal(bv, CELL);
- 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();
- }
- }
-
- result = DISPATCHED;
- switch (action) {
- // --- Cursor Movements ----------------------------------
case LFUN_RIGHTSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
if (tabular.isLastCellInRow(actcell)) {
end = actcell;
}
setSelection(start, end);
- updateLocal(bv, SELECTION);
break;
}
+
case LFUN_RIGHT:
- result = moveRight(bv);
+ result = moveRight(bv, true);
clearSelection();
- if (hs)
- updateLocal(bv, SELECTION);
break;
+
case LFUN_LEFTSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
if (tabular.isFirstCellInRow(actcell)) {
end = actcell;
}
setSelection(start, end);
- updateLocal(bv, SELECTION);
break;
}
+
case LFUN_LEFT:
- result = moveLeft(bv);
+ result = moveLeft(bv, true);
clearSelection();
- if (hs)
- updateLocal(bv, SELECTION);
break;
+
case LFUN_DOWNSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
int const ocell = actcell;
// 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)))
+ 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, SELECTION);
+ break;
}
- break;
+
case LFUN_DOWN:
- result = moveDown(bv, old_locking_inset != 0);
+ result = moveDown(bv, the_locking_inset != 0);
clearSelection();
- if (hs) {
- updateLocal(bv, SELECTION);
- }
break;
+
case LFUN_UPSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
int const ocell = actcell;
// 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)))
+ 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, SELECTION);
+ break;
}
- break;
+
case LFUN_UP:
- result = moveUp(bv, old_locking_inset != 0);
+ result = moveUp(bv, the_locking_inset != 0);
clearSelection();
- if (hs)
- updateLocal(bv, SELECTION);
break;
+
case LFUN_NEXT: {
- UpdateCodes code = CURSOR;
- if (hs) {
+ if (hs)
clearSelection();
- code = SELECTION;
- }
int column = actcol;
- unlockInsetInInset(bv, the_locking_inset);
- if (bv->text->top_y() + bv->painter().paperHeight() <
- (top_baseline + tabular.getHeightOfTabular()))
- {
- bv->scrollDocView(bv->text->top_y() + bv->painter().paperHeight());
- code = FULL;
- actcell = tabular.getCellBelow(first_visible_cell) + column;
- } else {
- actcell = tabular.getFirstCellInRow(tabular.rows() - 1) + column;
- }
+ 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;
+ }
resetPos(bv);
- updateLocal(bv, code);
break;
}
+
case LFUN_PRIOR: {
- UpdateCodes code = CURSOR;
- if (hs) {
+ if (hs)
clearSelection();
- code = SELECTION;
- }
int column = actcol;
- unlockInsetInInset(bv, the_locking_inset);
if (top_baseline < 0) {
- bv->scrollDocView(bv->text->top_y() - bv->painter().paperHeight());
- code = FULL;
+ bv->scrollDocView(bv->top_y() - bv->painter().paperHeight());
if (top_baseline > 0)
actcell = column;
else
actcell = column;
}
resetPos(bv);
- updateLocal(bv, code);
break;
}
+
// none of these make sense for insettabular,
// but we must catch them to prevent any
// selection from being confused
case LFUN_ENDBUF:
case LFUN_ENDBUFSEL:
break;
- case LFUN_LAYOUT_TABULAR: {
- InsetTabularMailer mailer(*this);
- mailer.showDialog(bv);
+
+ case LFUN_LAYOUT_TABULAR:
+ InsetTabularMailer(*this).showDialog(bv);
break;
- }
- case LFUN_INSET_DIALOG_UPDATE: {
- InsetTabularMailer mailer(*this);
- mailer.updateDialog(bv);
+
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetTabularMailer(*this).updateDialog(bv);
break;
- }
+
case LFUN_TABULAR_FEATURE:
- if (!tabularFeatures(bv, arg))
- result = UNDISPATCHED;
+ if (!tabularFeatures(bv, cmd.argument))
+ result = DispatchResult(false);
break;
- // insert file functions
+
+ // 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, INIT);
- else
- result = UNDISPATCHED;
+ case LFUN_FILE_INSERT_ASCII: {
+ string tmpstr = getContentsOfAsciiFile(bv, cmd.argument, false);
+ if (!tmpstr.empty() && !insertAsciiString(bv, tmpstr, false))
+ result = DispatchResult(false);
break;
}
- // cut and paste functions
+
+ 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;
+
+ case LFUN_FINISHED_LEFT:
+ lyxerr << "swallow LFUN_FINISHED_LEFT, act: " << actcell << endl;
+ if (!movePrevCell(bv, false))
+ result = DispatchResult(FINISHED);
+ break;
+
+ case LFUN_FINISHED_RIGHT:
+ lyxerr << "swallow LFUN_FINISHED_RIGHT, act: " << actcell << endl;
+ if (!moveNextCell(bv, false))
+ result = DispatchResult(FINISHED_RIGHT);
+ break;
+
+ case LFUN_FINISHED_UP:
+ lyxerr << "swallow LFUN_FINISHED_UP, act: " << actcell << endl;
+ result = moveUp(bv, true);
+ break;
+
+ case LFUN_FINISHED_DOWN:
+ lyxerr << "swallow LFUN_FINISHED_DOWN, act: " << actcell << endl;
+ result = moveDown(bv, true);
+ break;
+
case LFUN_CUT:
- if (!copySelection(bv))
- break;
- // no break here!
+ if (copySelection(bv)) {
+ recordUndo(bv, Undo::DELETE);
+ cutSelection(bv->buffer()->params());
+ }
+ break;
+
case LFUN_DELETE:
- setUndo(bv, Undo::DELETE);
- cutSelection(bv->buffer()->params);
- updateLocal(bv, INIT);
+ recordUndo(bv, Undo::DELETE);
+ cutSelection(bv->buffer()->params());
break;
+
case LFUN_COPY:
if (!hasSelection())
break;
finishUndo();
copySelection(bv);
break;
- case LFUN_PASTESELECTION:
- {
- string const clip(bv->getClipboard());
- if (clip.empty())
+
+ case LFUN_PASTESELECTION: {
+ string const clip = bv->getClipboard();
+ if (clip.empty())
break;
#if 0
if (clip.find('\t') != string::npos) {
++p;
}
maxCols = max(cols, maxCols);
- delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params,
- this, rows, maxCols);
+
+ paste_tabular.reset(
+ new LyXTabular(bv->buffer()->params(),
+ this, rows, maxCols)
+ );
+
string::size_type op = 0;
int cell = 0;
int cells = paste_tabular->getNumberOfCells();
// so that the clipboard is used and it goes on
// to default
// and executes LFUN_PASTESELECTION in insettext!
- delete paste_tabular;
- paste_tabular = 0;
+ paste_tabular.reset();
}
+ // fall through
}
+
case LFUN_PASTE:
if (hasPasteBuffer()) {
- setUndo(bv, Undo::INSERT);
+ recordUndo(bv, Undo::INSERT);
pasteSelection(bv);
- updateLocal(bv, INIT);
break;
}
- // ATTENTION: the function above has to be PASTE and PASTESELECTION!!!
+ // 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:
- break;
- }
- }
+ result = DispatchResult(false);
// we try to activate the actual inset and put this event down to
// the insets dispatch function.
- if ((result == DISPATCHED) || the_locking_inset)
- break;
- nodraw(true);
- if (activateCellInset(bv)) {
- // reset need_update setted in above function!
- need_update = NONE;
- result = the_locking_inset->localDispatch(FuncRequest(bv, action, arg));
- if ((result == UNDISPATCHED) || (result >= FINISHED)) {
- unlockInsetInInset(bv, the_locking_inset);
- nodraw(false);
+ if (!the_locking_inset && activateCellInset(bv)) {
+ result = the_locking_inset->dispatch(cmd);
+ if (!result.dispatched()) {
// we need to update if this was requested before
- updateLocal(bv, NONE);
- return UNDISPATCHED;
- } else if (hs) {
- clearSelection();
- // so the below CELL is not set because this is higher
- // priority and we get a full redraw
- need_update = SELECTION;
+ result = DispatchResult(false);
+ break;
}
- nodraw(false);
- updateLocal(bv, CELL);
- return result;
+ if (hs)
+ clearSelection();
}
break;
}
- if (result < FINISHED) {
- if (!the_locking_inset) {
- if (bv->fitCursor())
- updateLocal(bv, FULL);
- }
- } else
- bv->unlockInset(this);
+
+ updateLocal(bv);
+ InsetTabularMailer(*this).updateDialog(bv);
return result;
}
-int InsetTabular::latex(Buffer const * buf, ostream & os,
- LatexRunParams const & runparams) const
+int InsetTabular::latex(Buffer const & buf, ostream & os,
+ 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, (int)parOwner()->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
{
- os << "<![CDATA[";
- int const ret = tabular.ascii(buf,os,
- (int)parOwner()->params().depth(),
- false, 0);
- os << "]]>";
- return ret;
+ 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;
- Inset * master;
+ 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() != Inset::FLOAT_CODE;
- master = master->owner());
+ for (master = owner();
+ master && master->lyxCode() != InsetOld::FLOAT_CODE;
+ master = master->owner());
if (!master) {
os << "<informaltable>";
- if (mixcont)
+ if (runparams.mixed_content)
os << endl;
- ret++;
+ ++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++;
+ ++ret;
}
return ret;
}
}
-bool InsetTabular::calculate_dimensions_of_cells(BufferView * bv, bool reinit) const
+void InsetTabular::calculate_dimensions_of_cells(MetricsInfo & mi) const
{
- int cell = -1;
- int maxAsc = 0;
- int maxDesc = 0;
- InsetText * inset;
- bool changed = false;
-
- // FIXME: since InsetText ignores this anyway, it doesn't
- // matter what we pass it. Ugly
- LyXFont font;
-
+#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 ;)
- if ((need_update != INIT) &&
- (the_locking_inset == tabular.getCellInset(actcell))) {
- for(int i = 0; i < tabular.columns(); ++i) {
- maxAsc = max(tabular.getCellInset(actrow, i)->ascent(bv, font),
- maxAsc);
- maxDesc = max(tabular.getCellInset(actrow, i)->descent(bv, font),
- maxDesc);
+ // 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);
}
- changed = tabular.setWidthOfCell(actcell, the_locking_inset->width(bv, font));
- changed = tabular.setAscentOfRow(actrow, maxAsc + ADD_TO_HEIGHT) || changed;
- changed = tabular.setDescentOfRow(actrow, maxDesc + ADD_TO_HEIGHT) || changed;
- return changed;
+ 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) {
- maxAsc = 0;
- maxDesc = 0;
+ int maxAsc = 0;
+ int maxDesc = 0;
for (int j = 0; j < tabular.columns(); ++j) {
- if (tabular.isPartOfMultiColumn(i,j))
+ if (tabular.isPartOfMultiColumn(i, j))
continue;
++cell;
- inset = tabular.getCellInset(cell);
- if (!reinit && !tabular.getPWidth(cell).zero())
- inset->update(bv, false);
- maxAsc = max(maxAsc, inset->ascent(bv, font));
- maxDesc = max(maxDesc, inset->descent(bv, font));
- changed = tabular.setWidthOfCell(cell, inset->width(bv, font)) || changed;
+ Dimension dim;
+ MetricsInfo m = mi;
+ m.base.textwidth =
+ tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
+ tabular.getCellInset(cell).metrics(m, dim);
+ maxAsc = max(maxAsc, dim.asc);
+ maxDesc = max(maxDesc, dim.des);
+ tabular.setWidthOfCell(cell, dim.wid);
}
- changed = tabular.setAscentOfRow(i, maxAsc + ADD_TO_HEIGHT) || changed;
- changed = tabular.setDescentOfRow(i, maxDesc + ADD_TO_HEIGHT) || changed;
+ tabular.setAscentOfRow(i, maxAsc + ADD_TO_HEIGHT);
+ tabular.setDescentOfRow(i, maxDesc + ADD_TO_HEIGHT);
}
- if (changed)
- tabular.reinit();
- return changed;
}
-void InsetTabular::getCursor(BufferView & bv, int & x, int & y) const
+void InsetTabular::getCursorPos(BufferView *, int & x, int & y) const
{
- if (the_locking_inset) {
- the_locking_inset->getCursor(bv, x, y);
- return;
- }
-
- x = cursor_.x();
- y = cursor_.y() + 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;
-}
-
-
-void InsetTabular::getCursorPos(BufferView * bv, int & x, int & y) const
-{
- if (the_locking_inset) {
- the_locking_inset->getCursorPos(bv, x, y);
- return;
- }
- x = cursor_.x() - top_x;
- y = cursor_.y();
+ x = TEXT_TO_INSET_OFFSET + cursorx_ - top_x;
+ y = TEXT_TO_INSET_OFFSET + cursory_;
}
void InsetTabular::fitInsetCursor(BufferView * bv) const
{
if (the_locking_inset) {
- int old_top_y = bv->text->top_y();
the_locking_inset->fitInsetCursor(bv);
- if (old_top_y != bv->text->top_y())
- need_update = FULL;
return;
}
- LyXFont font;
+ LyXFont font;
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
resetPos(bv);
- if (bv->fitLockedInsetCursor(cursor_.x(), cursor_.y(), asc, desc))
- need_update = FULL;
+ bv->fitLockedInsetCursor(cursorx_, cursory_, asc, desc);
}
void InsetTabular::setPos(BufferView * bv, int x, int y) const
{
- cursor_.y(0);
-
- actcell = actrow = actcol = 0;
+ cursory_ = 0;
+ actcell = 0;
+ actrow = 0;
+ actcol = 0;
int ly = tabular.getDescentOfRow(actrow);
// first search the right row
- while ((ly < y) && ((actrow+1) < tabular.rows())) {
- cursor_.y(cursor_.y() + tabular.getDescentOfRow(actrow) +
+ while (ly < y && actrow + 1 < tabular.rows()) {
+ cursory_ += tabular.getDescentOfRow(actrow) +
tabular.getAscentOfRow(actrow + 1) +
- tabular.getAdditionalHeight(actrow + 1));
+ tabular.getAdditionalHeight(actrow + 1);
++actrow;
- ly = cursor_.y() + tabular.getDescentOfRow(actrow);
+ ly = cursory_ + tabular.getDescentOfRow(actrow);
}
actcell = tabular.getCellNumber(actrow, actcol);
// now search the right column
int lx = tabular.getWidthOfColumn(actcell) -
tabular.getAdditionalWidth(actcell);
- for (; !tabular.isLastCellInRow(actcell) && lx < x; ++actcell) {
+
+ for (; !tabular.isLastCellInRow(actcell) && lx < x; ++actcell)
lx += tabular.getWidthOfColumn(actcell + 1)
+ tabular.getAdditionalWidth(actcell);
- }
- cursor_.x(lx - tabular.getWidthOfColumn(actcell) + top_x + 2);
+
+ cursorx_ = lx - tabular.getWidthOfColumn(actcell) + top_x + 2;
resetPos(bv);
}
for (; !tabular.isFirstCellInRow(c); --c)
;
int lx = tabular.getWidthOfColumn(cell);
- for (; c < cell; ++c) {
+ for (; c < cell; ++c)
lx += tabular.getWidthOfColumn(c);
- }
- return (lx - tabular.getWidthOfColumn(cell) + top_x);
+
+ return lx - tabular.getWidthOfColumn(cell) + top_x;
}
int cell = 0;
actcol = tabular.column_of_cell(actcell);
actrow = 0;
- cursor_.y(0);
- for (; (cell < actcell) && !tabular.isLastRow(cell); ++cell) {
+ cursory_ = 0;
+ for (; cell < actcell && !tabular.isLastRow(cell); ++cell) {
if (tabular.isLastCellInRow(cell)) {
- cursor_.y(cursor_.y() + tabular.getDescentOfRow(actrow) +
+ cursory_ += tabular.getDescentOfRow(actrow) +
tabular.getAscentOfRow(actrow + 1) +
- tabular.getAdditionalHeight(actrow + 1));
+ tabular.getAdditionalHeight(actrow + 1);
++actrow;
}
}
- if (!locked || nodraw()) {
- if (the_locking_inset)
- inset_y = cursor_.y();
- 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 old_x = cursor_.x();
- new_x += offset;
- cursor_.x(new_x);
+ int const offset = ADD_TO_TABULAR_WIDTH + 2;
+ int new_x = getCellXPos(actcell) + offset;
+ int old_x = cursorx_;
+ cursorx_ = new_x;
// cursor.x(getCellXPos(actcell) + offset);
- if ((actcol < tabular.columns() - 1) && scroll(false) &&
- (tabular.getWidthOfTabular() < bv->workWidth()-20))
+ if (actcol < tabular.columns() - 1 && scroll(false) &&
+ tabular.getWidthOfTabular() < bv->workWidth()-20)
{
scroll(bv, 0.0F);
- updateLocal(bv, FULL);
+ updateLocal(bv);
} else if (the_locking_inset &&
- (tabular.getWidthOfColumn(actcell) > bv->workWidth()-20))
+ tabular.getWidthOfColumn(actcell) > bv->workWidth() - 20)
{
- int xx = cursor_.x() - offset + bv->text->getRealCursorX();
- if (xx > (bv->workWidth()-20)) {
- scroll(bv, -(xx - bv->workWidth() + 60));
- updateLocal(bv, FULL);
+ int xx = cursorx_ - offset;
+ 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, FULL);
+ updateLocal(bv);
}
- } else if ((cursor_.x() - offset) > 20 &&
- (cursor_.x() - offset + tabular.getWidthOfColumn(actcell))
- > (bv->workWidth() - 20)) {
- scroll(bv, -tabular.getWidthOfColumn(actcell) - 20);
- updateLocal(bv, FULL);
- } else if ((cursor_.x() - offset) < 20) {
- scroll(bv, 20 - cursor_.x() + offset);
- updateLocal(bv, FULL);
+ } else if (cursorx_ - offset > 20 &&
+ cursorx_ - offset + tabular.getWidthOfColumn(actcell)
+ > bv->workWidth() - 20) {
+ scroll(bv, - tabular.getWidthOfColumn(actcell) - 20);
+ updateLocal(bv);
+ } 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 - cursor_.x());
- updateLocal(bv, FULL);
- }
- if (the_locking_inset) {
- inset_x = cursor_.x() - top_x + tabular.getBeginningOfTextInCell(actcell);
- inset_y = cursor_.y();
- }
- if ((!the_locking_inset ||
- !the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE)) &&
- actcell != oldcell) {
- InsetTabular * inset = const_cast<InsetTabular *>(this);
- InsetTabularMailer mailer(*inset);
- mailer.updateDialog(bv);
- oldcell = actcell;
+ top_x + tabular.getWidthOfTabular() > bv->workWidth() - 20) {
+ scroll(bv, old_x - cursorx_);
+ updateLocal(bv);
}
+ InsetTabularMailer(*this).updateDialog(bv);
in_reset_pos = 0;
}
-Inset::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
+DispatchResult InsetTabular::moveRight(BufferView * bv, bool lock)
{
- if (lock && !old_locking_inset) {
+ if (lock) {
if (activateCellInset(bv))
- return DISPATCHED;
+ return DispatchResult(true, true);
} else {
bool moved = isRightToLeft(bv)
? movePrevCell(bv) : moveNextCell(bv);
if (!moved)
- return FINISHED_RIGHT;
+ return DispatchResult(false, FINISHED_RIGHT);
if (lock && activateCellInset(bv))
- return DISPATCHED;
+ return DispatchResult(true, true);
}
resetPos(bv);
- return DISPATCHED_NOUPDATE;
+ return DispatchResult(true);
}
-Inset::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
+DispatchResult InsetTabular::moveLeft(BufferView * bv, bool lock)
{
bool moved = isRightToLeft(bv) ? moveNextCell(bv) : movePrevCell(bv);
if (!moved)
- return FINISHED;
- if (lock) { // behind the inset
- if (activateCellInset(bv, 0, 0, mouse_button::none, true))
- return DISPATCHED;
- }
+ return DispatchResult(false, FINISHED);
+ // behind the inset
+ if (lock && activateCellInset(bv, 0, 0, true))
+ return DispatchResult(true, true);
resetPos(bv);
- return DISPATCHED_NOUPDATE;
+ return DispatchResult(true);
}
-Inset::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
+DispatchResult InsetTabular::moveUp(BufferView * bv, bool lock)
{
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 -= cursor_.x() + tabular.getBeginningOfTextInCell(actcell);
- }
- if (activateCellInset(bv, x, 0))
- return DISPATCHED;
+ if (actcell == ocell) { // we moved out of the inset
+ return DispatchResult(false, FINISHED_UP);
}
- return DISPATCHED_NOUPDATE;
+ resetPos(bv);
+ if (lock)
+ activateCellInset(bv, bv->x_target(), 0);
+ return DispatchResult(true, true);
}
-Inset::RESULT InsetTabular::moveDown(BufferView * bv, bool lock)
+DispatchResult InsetTabular::moveDown(BufferView * bv, bool lock)
{
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 -= cursor_.x() + tabular.getBeginningOfTextInCell(actcell);
- }
- if (activateCellInset(bv, x, 0))
- return DISPATCHED;
+ if (actcell == ocell) { // we moved out of the inset
+ return DispatchResult(false, FINISHED_DOWN);
}
- return DISPATCHED_NOUPDATE;
+ resetPos(bv);
+ if (lock)
+ activateCellInset(bv, bv->x_target(), 0);
+ return DispatchResult(true, true);
}
++actcell;
}
if (lock) {
- bool rtl = tabular.getCellInset(actcell)->paragraphs.begin()->
- isRightToLeftPar(bv->buffer()->params);
- activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
+ bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
+ isRightToLeftPar(bv->buffer()->params());
+ activateCellInset(bv, 0, 0, !rtl);
}
resetPos(bv);
return true;
bool InsetTabular::movePrevCell(BufferView * bv, bool lock)
{
+ lyxerr << "move prevcell 1" << endl;
if (isRightToLeft(bv)) {
+ lyxerr << "move prevcell a" << endl;
if (tabular.isLastCellInRow(actcell)) {
int row = tabular.row_of_cell(actcell);
if (row == 0)
++actcell;
}
} else {
- if (!actcell) // first cell
+ lyxerr << "move prevcell b" << endl;
+ if (actcell == 0) // first cell
return false;
--actcell;
}
+ lyxerr << "move prevcell 2" << endl;
if (lock) {
- bool rtl = tabular.getCellInset(actcell)->paragraphs.begin()->
- isRightToLeftPar(bv->buffer()->params);
- activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
+ bool rtl = tabular.getCellInset(actcell).paragraphs.begin()->
+ isRightToLeftPar(bv->buffer()->params());
+ activateCellInset(bv, 0, 0, !rtl);
}
+ lyxerr << "move prevcell 3" << endl;
resetPos(bv);
+ lyxerr << "move prevcell 4" << endl;
return true;
}
setSelection(0, tabular.getNumberOfCells() - 1);
}
if (hasSelection()) {
- setUndo(bv, Undo::EDIT);
+ recordUndo(bv, Undo::ATOMIC);
bool const frozen = undo_frozen;
if (!frozen)
freezeUndo();
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);
- }
- }
+ 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, INIT);
+ updateLocal(bv);
}
if (the_locking_inset)
the_locking_inset->setFont(bv, font, tall);
}
}
-}
+} // anon namespace
void InsetTabular::tabularFeatures(BufferView * bv,
- LyXTabular::Feature feature,
- string const & value)
+ LyXTabular::Feature feature, string const & value)
{
int sel_col_start;
int sel_col_end;
LyXTabular::VAlignment setVAlign = LyXTabular::LYX_VALIGN_TOP;
switch (feature) {
+
case LyXTabular::M_ALIGN_LEFT:
case LyXTabular::ALIGN_LEFT:
setAlign = LYX_ALIGN_LEFT;
break;
+
case LyXTabular::M_ALIGN_RIGHT:
case LyXTabular::ALIGN_RIGHT:
setAlign = LYX_ALIGN_RIGHT;
break;
+
case LyXTabular::M_ALIGN_CENTER:
case LyXTabular::ALIGN_CENTER:
setAlign = LYX_ALIGN_CENTER;
break;
+
case LyXTabular::ALIGN_BLOCK:
setAlign = LYX_ALIGN_BLOCK;
break;
+
case LyXTabular::M_VALIGN_TOP:
case LyXTabular::VALIGN_TOP:
setVAlign = LyXTabular::LYX_VALIGN_TOP;
break;
+
case LyXTabular::M_VALIGN_BOTTOM:
case LyXTabular::VALIGN_BOTTOM:
setVAlign = LyXTabular::LYX_VALIGN_BOTTOM;
break;
- case LyXTabular::M_VALIGN_CENTER:
- case LyXTabular::VALIGN_CENTER:
- setVAlign = LyXTabular::LYX_VALIGN_CENTER;
+
+ case LyXTabular::M_VALIGN_MIDDLE:
+ case LyXTabular::VALIGN_MIDDLE:
+ setVAlign = LyXTabular::LYX_VALIGN_MIDDLE;
break;
+
default:
break;
}
+
if (hasSelection()) {
getSelection(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);
}
- setUndo(bv, Undo::FINISH);
+ recordUndo(bv, Undo::ATOMIC);
int row = tabular.row_of_cell(actcell);
int column = tabular.column_of_cell(actcell);
LyXTabular::ltType ltt;
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);
-
- int cell;
- for (int i = 0; i < tabular.rows(); ++i) {
- cell = tabular.getCellNumber(i,column);
- tabular.getCellInset(cell)->resizeLyXText(bv);
- }
- updateLocal(bv, INIT);
- }
- 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()
+ else if (!len.zero()
&& tabular.getAlignment(actcell, true) != LYX_ALIGN_BLOCK)
tabularFeatures(bv, LyXTabular::ALIGN_BLOCK, string());
+ break;
}
- 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);
-
- for (int i = 0; i < tabular.rows(); ++i) {
- tabular.getCellInset(tabular.getCellNumber(i, column))->
- resizeLyXText(bv);
- }
- updateLocal(bv, INIT);
- }
- }
- break;
+ tabular.setMColumnPWidth(actcell, LyXLength(value));
+ break;
+
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
tabular.setAlignSpecial(actcell,value,feature);
- updateLocal(bv, FULL);
break;
+
case LyXTabular::APPEND_ROW:
// append the row into the tabular
- unlockInsetInInset(bv, the_locking_inset);
- tabular.appendRow(bv->buffer()->params, actcell);
- updateLocal(bv, INIT);
+ 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, INIT);
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, INIT);
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, INIT);
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, INIT);
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, INIT);
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, INIT);
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, INIT);
break;
}
tabular.getCellNumber(i, j),
setAlign,
flag);
- updateLocal(bv, INIT);
break;
+
case LyXTabular::M_VALIGN_TOP:
case LyXTabular::M_VALIGN_BOTTOM:
- case LyXTabular::M_VALIGN_CENTER:
+ case LyXTabular::M_VALIGN_MIDDLE:
flag = false;
case LyXTabular::VALIGN_TOP:
case LyXTabular::VALIGN_BOTTOM:
- case LyXTabular::VALIGN_CENTER:
+ case LyXTabular::VALIGN_MIDDLE:
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setVAlignment(
tabular.getCellNumber(i, j),
setVAlign, flag);
- updateLocal(bv, INIT);
break;
- case LyXTabular::MULTICOLUMN:
- {
+
+ case LyXTabular::MULTICOLUMN: {
if (sel_row_start != sel_row_end) {
#ifdef WITH_WARNINGS
#warning Need I say it ? This is horrible.
// just multicol for one Single Cell
if (!hasSelection()) {
// check wether we are completly in a multicol
- if (tabular.isMultiColumn(actcell)) {
+ if (tabular.isMultiColumn(actcell))
tabular.unsetMultiColumn(actcell);
- updateLocal(bv, INIT);
- } else {
+ else
tabular.setMultiColumn(bv->buffer(), actcell, 1);
- updateLocal(bv, CELL);
- }
break;
}
// we have a selection so this means we just add all this
tabular.setMultiColumn(bv->buffer(), s_start, s_end - s_start + 1);
actcell = s_start;
clearSelection();
- updateLocal(bv, INIT);
break;
}
+
case LyXTabular::SET_ALL_LINES:
setLines = true;
case LyXTabular::UNSET_ALL_LINES:
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setAllLines(
tabular.getCellNumber(i,j), setLines);
- updateLocal(bv, INIT);
break;
+
case LyXTabular::SET_LONGTABULAR:
tabular.setLongTabular(true);
- updateLocal(bv, INIT); // because this toggles displayed
break;
+
case LyXTabular::UNSET_LONGTABULAR:
tabular.setLongTabular(false);
- updateLocal(bv, INIT); // because this toggles displayed
break;
+
case LyXTabular::SET_ROTATE_TABULAR:
tabular.setRotateTabular(true);
break;
+
case LyXTabular::UNSET_ROTATE_TABULAR:
tabular.setRotateTabular(false);
break;
+
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);
+ tabular.getCellNumber(i, j), true);
break;
+
case LyXTabular::UNSET_ROTATE_CELL:
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular.setRotateCell(
tabular.getCellNumber(i, j), false);
break;
- case LyXTabular::SET_USEBOX:
- {
+
+ case LyXTabular::SET_USEBOX: {
LyXTabular::BoxType val = LyXTabular::BoxType(strToInt(value));
if (val == tabular.getUsebox(actcell))
val = LyXTabular::BOX_NONE;
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
- tabular.setUsebox(
- tabular.getCellNumber(i, j), val);
+ tabular.setUsebox(tabular.getCellNumber(i, j), val);
break;
}
+
case LyXTabular::UNSET_LTFIRSTHEAD:
flag = false;
case LyXTabular::SET_LTFIRSTHEAD:
- (void)tabular.getRowOfLTFirstHead(row, ltt);
+ tabular.getRowOfLTFirstHead(row, ltt);
checkLongtableSpecial(ltt, value, flag);
tabular.setLTHead(row, flag, ltt, true);
break;
+
case LyXTabular::UNSET_LTHEAD:
flag = false;
case LyXTabular::SET_LTHEAD:
- (void)tabular.getRowOfLTHead(row, ltt);
+ tabular.getRowOfLTHead(row, ltt);
checkLongtableSpecial(ltt, value, flag);
tabular.setLTHead(row, flag, ltt, false);
break;
+
case LyXTabular::UNSET_LTFOOT:
flag = false;
case LyXTabular::SET_LTFOOT:
- (void)tabular.getRowOfLTFoot(row, ltt);
+ tabular.getRowOfLTFoot(row, ltt);
checkLongtableSpecial(ltt, value, flag);
tabular.setLTFoot(row, flag, ltt, false);
break;
+
case LyXTabular::UNSET_LTLASTFOOT:
flag = false;
case LyXTabular::SET_LTLASTFOOT:
- (void)tabular.getRowOfLTLastFoot(row, ltt);
+ tabular.getRowOfLTLastFoot(row, ltt);
checkLongtableSpecial(ltt, value, flag);
tabular.setLTFoot(row, flag, ltt, true);
break;
+
case LyXTabular::SET_LTNEWPAGE:
- {
- bool what = !tabular.getLTNewPage(row);
- tabular.setLTNewPage(row, what);
+ tabular.setLTNewPage(row, !tabular.getLTNewPage(row));
break;
- }
+
// dummy stuff just to avoid warnings
case LyXTabular::LAST_ACTION:
break;
}
- InsetTabularMailer mailer(*this);
- mailer.updateDialog(bv);
+ updateLocal(bv);
+ InsetTabularMailer(*this).updateDialog(bv);
}
-bool InsetTabular::activateCellInset(BufferView * bv, int x, int y, mouse_button::state button,
- bool behind)
+bool InsetTabular::activateCellInset(BufferView * bv, int x, int y, bool behind)
{
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular.getCellInset(actcell));
- LyXFont font(LyXFont::ALL_SANE);
+ UpdatableInset & inset = tabular.getCellInset(actcell);
if (behind) {
- x = inset->x() + inset->width(bv, font);
- y = inset->descent(bv, font);
+#warning metrics?
+ x = inset.x() + inset.width();
+ y = inset.descent();
}
- //inset_x = cursor.x() - top_x + tabular.getBeginningOfTextInCell(actcell);
- //inset_y = cursor.y();
- inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, x, y, button));
+ inset.edit(bv, x, y);
+ bv->cursor().push(&inset);
if (!the_locking_inset)
return false;
- updateLocal(bv, CELL);
- return (the_locking_inset != 0);
-}
-
-
-bool InsetTabular::activateCellInsetAbs(BufferView * bv, int x, int y,
- mouse_button::state button)
-{
- inset_x = cursor_.x()
- - top_x + tabular.getBeginningOfTextInCell(actcell);
- inset_y = cursor_.y();
- return activateCellInset(bv, x - inset_x, y - inset_y, button);
-}
-
-
-bool InsetTabular::insetHit(BufferView *, int x, int) const
-{
- return (x + top_x)
- > (cursor_.x() + tabular.getBeginningOfTextInCell(actcell));
-}
-
-
-// This returns paperWidth() if the cell-width is unlimited or the width
-// in pixels if we have a pwidth for this cell.
-int InsetTabular::getMaxWidthOfCell(BufferView * bv, int cell) const
-{
- LyXLength const len = tabular.getPWidth(cell);
-
- if (len.zero())
- return -1;
- return len.inPixels(latexTextWidth(bv));
-}
-
-
-int InsetTabular::getMaxWidth(BufferView * bv,
- UpdatableInset const * inset) const
-{
- int cell = tabular.getCellFromInset(inset, actcell);
-
- if (cell == -1) {
- lyxerr << "Own inset not found, shouldn't really happen!"
- << endl;
- return -1;
- }
-
- int w = getMaxWidthOfCell(bv, cell);
- if (w > 0) {
- // because the inset then subtracts it's top_x and owner->x()
- w += (inset->x() - top_x);
- }
-
- return w;
-}
-
-
-void InsetTabular::deleteLyXText(BufferView * bv, bool recursive) const
-{
- resizeLyXText(bv, recursive);
-}
-
-
-void InsetTabular::resizeLyXText(BufferView * bv, bool force) const
-{
- if (force) {
- for(int i = 0; i < tabular.rows(); ++i) {
- for(int j = 0; j < tabular.columns(); ++j) {
- tabular.getCellInset(i, j)->resizeLyXText(bv, true);
- }
- }
- }
- need_update = FULL;
+ updateLocal(bv);
+ return the_locking_inset;
}
-LyXText * InsetTabular::getLyXText(BufferView const * bv,
- bool const recursive) const
+void InsetTabular::deleteLyXText(BufferView * /*bv*/, bool /*recursive*/) const
{
- if (the_locking_inset)
- return the_locking_inset->getLyXText(bv, recursive);
-#if 0
- // if we're locked lock the actual insettext and return it's LyXText!!!
- if (locked) {
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular.getCellInset(actcell));
- inset->edit(const_cast<BufferView *>(bv), 0, 0, 0);
- return the_locking_inset->getLyXText(bv, recursive);
- }
-#endif
- return Inset::getLyXText(bv, recursive);
+ //resizeLyXText(bv, recursive);
}
bool InsetTabular::showInsetDialog(BufferView * bv) const
{
- if (!the_locking_inset || !the_locking_inset->showInsetDialog(bv)) {
- InsetTabular * tmp = const_cast<InsetTabular *>(this);
- InsetTabularMailer mailer(*tmp);
- mailer.showDialog(bv);
- }
+ if (!the_locking_inset || !the_locking_inset->showInsetDialog(bv))
+ InsetTabularMailer(*this).showDialog(bv);
return true;
}
void InsetTabular::openLayoutDialog(BufferView * bv) const
{
+#warning Look here
+/*
if (the_locking_inset) {
- InsetTabular * i = static_cast<InsetTabular *>
+ InsetTabular * inset = static_cast<InsetTabular *>
(the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE));
- if (i) {
- i->openLayoutDialog(bv);
+ if (inset) {
+ inset->openLayoutDialog(bv);
return;
}
}
- InsetTabular * tmp = const_cast<InsetTabular *>(this);
- InsetTabularMailer mailer(*tmp);
- mailer.showDialog(bv);
+*/
+ InsetTabularMailer(*this).showDialog(bv);
}
}
if (action == LyXTabular::LAST_ACTION) {
status.clear();
- return status.unknown(true);
+ status.unknown(true);
+ return status;
}
- string const argument = ltrim(what.substr(tabularFeature[i].feature.length()));
+ string const argument
+ = ltrim(what.substr(tabularFeature[i].feature.length()));
int sel_row_start;
int sel_row_end;
LyXTabular::ltType dummyltt;
bool flag = true;
- if (hasSelection()) {
+ if (hasSelection())
getSelection(sel_row_start, sel_row_end, dummy, dummy);
- } else {
+ else
sel_row_start = sel_row_end = tabular.row_of_cell(actcell);
- }
switch (action) {
case LyXTabular::SET_PWIDTH:
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));
break;
+
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
case LyXTabular::TOGGLE_LINE_TOP:
status.setOnOff(tabular.topLine(actcell, flag));
break;
+
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM:
status.setOnOff(tabular.bottomLine(actcell, flag));
break;
+
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT:
status.setOnOff(tabular.leftLine(actcell, flag));
break;
+
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT:
status.setOnOff(tabular.rightLine(actcell, flag));
break;
+
case LyXTabular::M_ALIGN_LEFT:
flag = false;
case LyXTabular::ALIGN_LEFT:
status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_LEFT);
break;
+
case LyXTabular::M_ALIGN_RIGHT:
flag = false;
case LyXTabular::ALIGN_RIGHT:
status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_RIGHT);
break;
+
case LyXTabular::M_ALIGN_CENTER:
flag = false;
case LyXTabular::ALIGN_CENTER:
status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_CENTER);
break;
+
case LyXTabular::ALIGN_BLOCK:
status.disabled(tabular.getPWidth(actcell).zero());
status.setOnOff(tabular.getAlignment(actcell, flag) == LYX_ALIGN_BLOCK);
break;
+
case LyXTabular::M_VALIGN_TOP:
flag = false;
case LyXTabular::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);
break;
- case LyXTabular::M_VALIGN_CENTER:
+
+ case LyXTabular::M_VALIGN_MIDDLE:
flag = false;
- case LyXTabular::VALIGN_CENTER:
- status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER);
+ case LyXTabular::VALIGN_MIDDLE:
+ status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
break;
+
case LyXTabular::SET_LONGTABULAR:
status.setOnOff(tabular.isLongTabular());
break;
+
case LyXTabular::UNSET_LONGTABULAR:
status.setOnOff(!tabular.isLongTabular());
break;
+
case LyXTabular::SET_ROTATE_TABULAR:
status.setOnOff(tabular.getRotateTabular());
break;
+
case LyXTabular::UNSET_ROTATE_TABULAR:
status.setOnOff(!tabular.getRotateTabular());
break;
+
case LyXTabular::SET_ROTATE_CELL:
status.setOnOff(tabular.getRotateCell(actcell));
break;
+
case LyXTabular::UNSET_ROTATE_CELL:
status.setOnOff(!tabular.getRotateCell(actcell));
break;
+
case LyXTabular::SET_USEBOX:
status.setOnOff(strToInt(argument) == tabular.getUsebox(actcell));
break;
+
case LyXTabular::SET_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::SET_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::SET_LTNEWPAGE:
status.setOnOff(tabular.getLTNewPage(sel_row_start));
break;
+
default:
status.clear();
status.disabled(true);
}
-void InsetTabular::getLabelList(std::vector<string> & list) const
+void InsetTabular::getLabelList(Buffer const & buffer,
+ std::vector<string> & list) const
{
- tabular.getLabelList(list);
+ tabular.getLabelList(buffer, list);
}
} else {
sel_col_end = tabular.right_column_of_cell(sel_cell_end);
}
- int const columns = sel_col_end - sel_col_start + 1;
int sel_row_start = tabular.row_of_cell(sel_cell_start);
int sel_row_end = tabular.row_of_cell(sel_cell_end);
- if (sel_row_start > sel_row_end) {
+ if (sel_row_start > sel_row_end)
swap(sel_row_start, sel_row_end);
- }
- int const rows = sel_row_end - sel_row_start + 1;
- delete paste_tabular;
- paste_tabular = new LyXTabular(bv->buffer()->params,
- this, tabular); // rows, columns);
+ paste_tabular.reset(new LyXTabular(tabular));
+ paste_tabular->setOwner(this);
+
for (int i = 0; i < sel_row_start; ++i)
paste_tabular->deleteRow(0);
+
+ int const rows = sel_row_end - sel_row_start + 1;
while (paste_tabular->rows() > rows)
paste_tabular->deleteRow(rows);
+
paste_tabular->setTopLine(0, true, true);
paste_tabular->setBottomLine(paste_tabular->getFirstCellInRow(rows - 1),
true, true);
+
for (int i = 0; i < sel_col_start; ++i)
paste_tabular->deleteColumn(0);
+
+ int const columns = sel_col_end - sel_col_start + 1;
while (paste_tabular->columns() > columns)
paste_tabular->deleteColumn(columns);
+
paste_tabular->setLeftLine(0, true, true);
paste_tabular->setRightLine(paste_tabular->getLastCellInRow(0),
true, true);
- ostringstream sstr;
- paste_tabular->ascii(bv->buffer(), sstr,
- (int)parOwner()->params().depth(), true, '\t');
- bv->stuffClipboard(STRCONV(sstr.str()));
+ ostringstream os;
+ OutputParams const runparams;
+ paste_tabular->plaintext(*bv->buffer(), os, runparams,
+ ownerPar(*bv->buffer(), this).params().depth(), true, '\t');
+ bv->stuffClipboard(os.str());
return true;
}
return false;
for (int r1 = 0, r2 = actrow;
- (r1 < paste_tabular->rows()) && (r2 < tabular.rows());
+ r1 < paste_tabular->rows() && r2 < tabular.rows();
++r1, ++r2) {
- for(int c1 = 0, c2 = actcol;
- (c1 < paste_tabular->columns()) && (c2 < tabular.columns());
+ for (int c1 = 0, c2 = actcol;
+ c1 < paste_tabular->columns() && c2 < tabular.columns();
++c1, ++c2) {
- if (paste_tabular->isPartOfMultiColumn(r1,c1) &&
- tabular.isPartOfMultiColumn(r2,c2))
+ if (paste_tabular->isPartOfMultiColumn(r1, c1) &&
+ tabular.isPartOfMultiColumn(r2, c2))
continue;
- if (paste_tabular->isPartOfMultiColumn(r1,c1)) {
+ if (paste_tabular->isPartOfMultiColumn(r1, c1)) {
--c2;
continue;
}
- if (tabular.isPartOfMultiColumn(r2,c2)) {
+ if (tabular.isPartOfMultiColumn(r2, c2)) {
--c1;
continue;
}
- int const n1 = paste_tabular->getCellNumber(r1, c1);
- int const n2 = tabular.getCellNumber(r2, c2);
- *(tabular.getCellInset(n2)) = *(paste_tabular->getCellInset(n1));
- tabular.getCellInset(n2)->setOwner(this);
- tabular.getCellInset(n2)->deleteLyXText(bv);
- tabular.getCellInset(n2)->markNew();
+ InsetText & inset = tabular.getCellInset(r2, c2);
+ inset = paste_tabular->getCellInset(r1, c1);
+ inset.setOwner(this);
+ inset.deleteLyXText(bv);
+ inset.markNew();
}
}
return true;
} else {
sel_col_end = tabular.right_column_of_cell(sel_cell_end);
}
+
int sel_row_start = tabular.row_of_cell(sel_cell_start);
int sel_row_end = tabular.row_of_cell(sel_cell_end);
- if (sel_row_start > sel_row_end) {
+
+ if (sel_row_start > sel_row_end)
swap(sel_row_start, sel_row_end);
- }
- if (sel_cell_start > sel_cell_end) {
+
+ if (sel_cell_start > sel_cell_end)
swap(sel_cell_start, sel_cell_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(tabular.getCellNumber(i, j))->clear(bp.tracking_changes);
- }
- }
+
+ 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);
return true;
}
}
-bool InsetTabular::nodraw() const
-{
- if (!UpdatableInset::nodraw() && the_locking_inset)
- return the_locking_inset->nodraw();
- return UpdatableInset::nodraw();
-}
-
-
int InsetTabular::scroll(bool recursive) const
{
int sx = UpdatableInset::scroll(false);
srow = tabular.row_of_cell(start);
erow = tabular.row_of_cell(end);
- if (srow > erow) {
+ if (srow > erow)
swap(srow, erow);
- }
scol = tabular.column_of_cell(start);
ecol = tabular.column_of_cell(end);
- if (scol > ecol) {
+ if (scol > ecol)
swap(scol, ecol);
- } else {
+ else
ecol = tabular.right_column_of_cell(end);
- }
}
ParagraphList * InsetTabular::getParagraphs(int i) const
{
- return (i < tabular.getNumberOfCells())
- ? tabular.getCellInset(i)->getParagraphs(0)
+ 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 Inset::cursor(bv);
-}
-
-
-Inset * InsetTabular::getInsetFromID(int id_arg) const
-{
- if (id_arg == id())
- return const_cast<InsetTabular *>(this);
-
- Inset * result;
- for(int i = 0; i < tabular.rows(); ++i) {
- for(int j = 0; j < tabular.columns(); ++j) {
- if ((result = tabular.getCellInset(i, j)->getInsetFromID(id_arg)))
- return result;
- }
- }
- return 0;
-}
-
-
-WordLangTuple const
-InsetTabular::selectNextWordToSpellcheck(BufferView * bv, float & value) const
-{
- nodraw(true);
- if (the_locking_inset) {
- WordLangTuple word(the_locking_inset->selectNextWordToSpellcheck(bv, value));
- if (!word.word().empty()) {
- nodraw(false);
- return word;
- }
- if (tabular.isLastCell(actcell)) {
- bv->unlockInset(const_cast<InsetTabular *>(this));
- nodraw(false);
- return WordLangTuple();
- }
- ++actcell;
- }
- // otherwise we have to lock the next inset and ask for it's selecttion
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular.getCellInset(actcell));
- inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
- WordLangTuple word(selectNextWordInt(bv, value));
- nodraw(false);
- 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
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular.getCellInset(++actcell));
- inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
- return selectNextWordInt(bv, value);
-}
-
-
-void InsetTabular::selectSelectedWord(BufferView * bv)
+int InsetTabular::numParagraphs() const
{
- if (the_locking_inset) {
- the_locking_inset->selectSelectedWord(bv);
- return;
- }
- return;
+ return tabular.getNumberOfCells();
}
-void InsetTabular::toggleSelection(BufferView * bv, bool kill_selection)
+LyXText * InsetTabular::getText(int i) const
{
- if (the_locking_inset) {
- the_locking_inset->toggleSelection(bv, kill_selection);
- }
+ return i < tabular.getNumberOfCells()
+ ? tabular.getCellInset(i).getText(0)
+ : 0;
}
void InsetTabular::markErased()
{
- int cell = 0;
-
- while (cell < tabular.getNumberOfCells()) {
- InsetText * inset = tabular.getCellInset(cell);
- inset->markErased();
- ++cell;
- }
-}
-
-
-bool InsetTabular::nextChange(BufferView * bv, lyx::pos_type & length)
-{
- if (the_locking_inset) {
- if (the_locking_inset->nextChange(bv, length)) {
- updateLocal(bv, CELL);
- return true;
- }
- if (tabular.isLastCell(actcell))
- return false;
- ++actcell;
- }
- InsetText * inset = tabular.getCellInset(actcell);
- if (inset->nextChange(bv, length)) {
- updateLocal(bv, FULL);
- return true;
- }
- while (!tabular.isLastCell(actcell)) {
- ++actcell;
- inset = tabular.getCellInset(actcell);
- if (inset->nextChange(bv, length)) {
- updateLocal(bv, FULL);
- 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, CELL);
- 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, FULL);
- return true;
- }
- while (!tabular.isLastCell(cell)) {
- ++cell;
- inset = tabular.getCellInset(cell);
- if (inset->searchForward(bv, str, cs, mw)) {
- updateLocal(bv, FULL);
- return true;
- }
- }
- return false;
+ for (int cell = 0; cell < tabular.getNumberOfCells(); ++cell)
+ tabular.getCellInset(cell).markErased();
}
-bool InsetTabular::searchBackward(BufferView * bv, string const & str,
- bool cs, bool mw)
+bool InsetTabular::insetAllowed(InsetOld::Code) const
{
- int cell = tabular.getNumberOfCells();
- if (the_locking_inset) {
- if (the_locking_inset->searchBackward(bv, str, cs, mw)) {
- updateLocal(bv, CELL);
- return true;
- }
- cell = actcell;
- }
-
- while (cell) {
- --cell;
- InsetText * inset = tabular.getCellInset(cell);
- if (inset->searchBackward(bv, str, cs, mw)) {
- updateLocal(bv, CELL);
- return true;
- }
- }
return false;
}
-bool InsetTabular::insetAllowed(Inset::Code code) 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(Inset const * in) const
+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();
+ // 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
- if (owner())
- return owner()->forceDefaultParagraphs(in);
- // if we're here there is really something strange going on!!!
- return false;
+ BOOST_ASSERT(owner());
+ return owner()->forceDefaultParagraphs(in);
}
+
bool InsetTabular::insertAsciiString(BufferView * bv, string const & buf,
bool usePaste)
{
string::size_type len = buf.length();
string::size_type p = 0;
- while (p < len &&
- ((p = buf.find_first_of("\t\n", p)) != string::npos))
- {
+ 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;
rows = loctab->rows();
int const columns = loctab->columns();
- while ((cell < cells) && (p < len) && (row < rows) &&
+ while (cell < cells && p < len && row < rows &&
(p = buf.find_first_of("\t\n", p)) != string::npos)
{
if (p >= len)
case '\t':
// we can only set this if we are not too far right
if (cols < columns) {
- InsetText * ti = loctab->getCellInset(cell);
- LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraphs.begin(), 0);
- ti->setText(buf.substr(op, p - op), font);
+ InsetText & inset = loctab->getCellInset(cell);
+ LyXFont const font = inset.text_.
+ getFont(inset.paragraphs.begin(), 0);
+ inset.setText(buf.substr(op, p - op), font);
++cols;
++cell;
}
case '\n':
// we can only set this if we are not too far right
if (cols < columns) {
- InsetText * ti = loctab->getCellInset(cell);
- LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraphs.begin(), 0);
- ti->setText(buf.substr(op, p - op), font);
+ InsetText & inset = tabular.getCellInset(cell);
+ LyXFont const font = inset.text_.
+ getFont(inset.paragraphs.begin(), 0);
+ inset.setText(buf.substr(op, p - op), font);
}
cols = ocol;
++row;
op = p;
}
// check for the last cell if there is no trailing '\n'
- if ((cell < cells) && (op < len)) {
- InsetText * ti = loctab->getCellInset(cell);
- LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraphs.begin(), 0);
- ti->setText(buf.substr(op, len - op), font);
+ if (cell < cells && op < len) {
+ InsetText & inset = loctab->getCellInset(cell);
+ LyXFont const font = inset.text_.getFont(inset.paragraphs.begin(), 0);
+ inset.setText(buf.substr(op, len - op), font);
}
return true;
}
-void InsetTabular::addPreview(grfx::PreviewLoader & loader) const
+void InsetTabular::addPreview(PreviewLoader & loader) const
{
int const rows = tabular.rows();
int const columns = tabular.columns();
for (int i = 0; i < rows; ++i) {
- for (int j = 0; j < columns; ++j) {
- tabular.getCellInset(i,j)->addPreview(loader);
- }
+ for (int j = 0; j < columns; ++j)
+ tabular.getCellInset(i, j).addPreview(loader);
}
}
-string const InsetTabularMailer:: name_("tabular");
+string const InsetTabularMailer::name_("tabular");
-InsetTabularMailer::InsetTabularMailer(InsetTabular & inset)
- : inset_(inset)
+InsetTabularMailer::InsetTabularMailer(InsetTabular const & inset)
+ : inset_(const_cast<InsetTabular &>(inset))
{}
-string const InsetTabularMailer::inset2string() const
+string const InsetTabularMailer::inset2string(Buffer const &) const
{
return params2string(inset_);
}
int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
{
- istringstream data(STRCONV(in));
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
if (!lex.isOK())
return -1;
- // FIXME: even current_view would be better than this.
- BufferView * const bv = inset.view();
- Buffer const * const buffer = bv ? bv->buffer() : 0;
- if (buffer)
- inset.read(buffer, lex);
+ Buffer const & buffer = inset.buffer();
+ inset.read(buffer, lex);
// We can't set the active cell, but we can tell the frontend
// what it is.
string const InsetTabularMailer::params2string(InsetTabular const & inset)
{
- // FIXME: even current_view would be better than this.
- BufferView * const bv = inset.view();
- Buffer const * const buffer = bv ? bv->buffer() : 0;
- if (!buffer)
- return string();
-
ostringstream data;
data << name_ << " \\active_cell " << inset.getActCell() << '\n';
- inset.write(buffer, data);
+ inset.write(inset.buffer(), data);
data << "\\end_inset\n";
- return STRCONV(data.str());
+ return data.str();
}
projects / lyx.git / blobdiff