#include <config.h>
-
#include "insettabular.h"
#include "insettext.h"
#include "buffer.h"
#include "BufferView.h"
-#include "commandtags.h"
+#include "lfuns.h"
#include "debug.h"
+#include "dimension.h"
#include "funcrequest.h"
#include "gettext.h"
#include "language.h"
#include "LaTeXFeatures.h"
+#include "Lsstream.h"
#include "lyx_cb.h"
#include "lyxfunc.h"
#include "lyxlength.h"
#include "ParagraphParameters.h"
#include "undo_funcs.h"
#include "WordLangTuple.h"
+#include "metricsinfo.h"
#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
- : buffer(&buf)
+ : buffer_(&buf)
{
if (rows <= 0)
rows = 1;
}
-InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf,
- bool same_id)
- : UpdatableInset(tab, same_id), buffer(&buf)
+InsetTabular::InsetTabular(InsetTabular const & tab)
+ : UpdatableInset(tab), buffer_(tab.buffer_)
{
- tabular.reset(new LyXTabular(buf.params,
- this, *(tab.tabular), same_id));
+ tabular.reset(new LyXTabular(buffer_->params,
+ this, *(tab.tabular)));
the_locking_inset = 0;
old_locking_inset = 0;
locked = false;
}
-Inset * InsetTabular::clone(Buffer const & buf, bool same_id) const
+Inset * InsetTabular::clone() const
{
- return new InsetTabular(*this, buf, same_id);
+ return new InsetTabular(*this);
}
BufferView * InsetTabular::view() const
{
- return buffer->getUser();
+ return buffer_->getUser();
+}
+
+
+void InsetTabular::buffer(Buffer * b)
+{
+ buffer_ = b;
}
}
-int InsetTabular::ascent(BufferView *, LyXFont const &) const
-{
- return tabular->GetAscentOfRow(0);
-}
-
-
-int InsetTabular::descent(BufferView *, LyXFont const &) const
+void InsetTabular::metrics(MetricsInfo &,
+ Dimension & dim) const
{
- return tabular->GetHeightOfTabular() - tabular->GetAscentOfRow(0) + 1;
+ dim.asc = tabular->GetAscentOfRow(0);
+ dim.des = tabular->GetHeightOfTabular() - tabular->GetAscentOfRow(0) + 1;
+ dim.wid = tabular->GetWidthOfTabular() + 2 * ADD_TO_TABULAR_WIDTH;
}
-int InsetTabular::width(BufferView *, LyXFont const &) const
-{
- return tabular->GetWidthOfTabular() + (2 * ADD_TO_TABULAR_WIDTH);
-}
-
-
-void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline,
- float & x) const
+void InsetTabular::draw(PainterInfo & pi, int x, int y) const
{
if (nodraw()) {
need_update = FULL;
return;
}
- Painter & pain = bv->painter();
+ BufferView * bv = pi.base.bv;
int i;
int j;
int nx;
#if 0
- UpdatableInset::draw(bv, font, baseline, x);
+ UpdatableInset::draw(pi, x, y);
#else
if (!owner())
- x += static_cast<float>(scroll());
+ x += scroll();
#endif
- top_x = int(x);
- topx_set = true;
- top_baseline = baseline;
+ top_x = x;
+ top_baseline = y;
x += ADD_TO_TABULAR_WIDTH;
int cell = 0;
- float cx;
+ int cx;
first_visible_cell = -1;
for (i = 0; i < tabular->rows(); ++i) {
- nx = int(x);
+ nx = x;
cell = tabular->GetCellNumber(i, 0);
- if (!((baseline + tabular->GetDescentOfRow(i)) > 0) &&
- (baseline - tabular->GetAscentOfRow(i))<pain.paperHeight())
+ if (!((y + tabular->GetDescentOfRow(i)) > 0) &&
+ (y - tabular->GetAscentOfRow(i)) < pi.pain.paperHeight())
{
- baseline += tabular->GetDescentOfRow(i) +
+ y += tabular->GetDescentOfRow(i) +
tabular->GetAscentOfRow(i + 1) +
tabular->GetAdditionalHeight(i + 1);
continue;
if (first_visible_cell < 0)
first_visible_cell = cell;
if (hasSelection()) {
- drawCellSelection(pain, nx, baseline, i, j, cell);
+ drawCellSelection(pi.pain, nx, y, i, j, cell);
}
- tabular->GetCellInset(cell)->draw(bv, font, baseline, cx);
- drawCellLines(pain, nx, baseline, i, cell);
+ tabular->GetCellInset(cell)->draw(pi, cx, y);
+ drawCellLines(pi.pain, nx, y, i, cell);
nx += tabular->GetWidthOfColumn(cell);
++cell;
}
- baseline += tabular->GetDescentOfRow(i) +
+
+// Would be nice, but for some completely unfathomable reason,
+// on a col resize to a new fixed width, even though the insettexts
+// are resized, the cell isn't, but drawing all cells in a tall table
+// has the desired effect somehow. Complete dark magic.
+#if 0
+ // avoiding drawing the rest of a long table is
+ // a pretty big speedup
+ if (y > bv->workHeight())
+ break;
+#endif
+
+ y += tabular->GetDescentOfRow(i) +
tabular->GetAscentOfRow(i + 1) +
tabular->GetAdditionalHeight(i + 1);
}
- x -= ADD_TO_TABULAR_WIDTH;
- x += width(bv, font);
- if (bv->text->status() == LyXText::CHANGED_IN_DRAW) {
- int i = 0;
- for(Inset * inset = owner(); inset; ++i)
- inset = inset->owner();
- if (calculate_dimensions_of_cells(bv, font, false))
- need_update = INIT;
- } else {
- need_update = NONE;
- }
+ need_update = NONE;
}
-void InsetTabular::drawCellLines(Painter & pain, int x, int baseline,
+void InsetTabular::drawCellLines(Painter & pain, int x, int y,
int row, int cell) const
{
int x2 = x + tabular->GetWidthOfColumn(cell);
if (!tabular->topAlreadyDrawn(cell)) {
on_off = !tabular->TopLine(cell);
- pain.line(x, baseline - tabular->GetAscentOfRow(row),
- x2, baseline - tabular->GetAscentOfRow(row),
+ pain.line(x, y - tabular->GetAscentOfRow(row),
+ x2, y - tabular->GetAscentOfRow(row),
on_off ? LColor::tabularonoffline : LColor::tabularline,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular->BottomLine(cell);
- pain.line(x, baseline + tabular->GetDescentOfRow(row),
- x2, baseline + tabular->GetDescentOfRow(row),
+ pain.line(x, y + tabular->GetDescentOfRow(row),
+ x2, y + tabular->GetDescentOfRow(row),
on_off ? LColor::tabularonoffline : LColor::tabularline,
on_off ? Painter::line_onoffdash : Painter::line_solid);
if (!tabular->leftAlreadyDrawn(cell)) {
on_off = !tabular->LeftLine(cell);
- pain.line(x, baseline - tabular->GetAscentOfRow(row),
- x, baseline + tabular->GetDescentOfRow(row),
+ pain.line(x, y - tabular->GetAscentOfRow(row),
+ x, y + tabular->GetDescentOfRow(row),
on_off ? LColor::tabularonoffline : LColor::tabularline,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular->RightLine(cell);
pain.line(x2 - tabular->GetAdditionalWidth(cell),
- baseline - tabular->GetAscentOfRow(row),
+ y - tabular->GetAscentOfRow(row),
x2 - tabular->GetAdditionalWidth(cell),
- baseline + tabular->GetDescentOfRow(row),
+ y + tabular->GetDescentOfRow(row),
on_off ? LColor::tabularonoffline : LColor::tabularline,
on_off ? Painter::line_onoffdash : Painter::line_solid);
}
-void InsetTabular::drawCellSelection(Painter & pain, int x, int baseline,
+void InsetTabular::drawCellSelection(Painter & pain, int x, int y,
int row, int column, int cell) const
{
lyx::Assert(hasSelection());
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, baseline - tabular->GetAscentOfRow(row) + 1,
+ pain.fillRectangle(x, y - tabular->GetAscentOfRow(row) + 1,
w, h, LColor::selection);
}
}
-void InsetTabular::update(BufferView * bv, LyXFont const & font, bool reinit)
+void InsetTabular::update(BufferView * bv, bool reinit)
{
if (in_update) {
if (reinit) {
resetPos(bv);
if (owner())
- owner()->update(bv, font, true);
+ owner()->update(bv, true);
}
return;
}
in_update = true;
if (reinit) {
need_update = INIT;
- if (calculate_dimensions_of_cells(bv, font, true))
+ if (calculate_dimensions_of_cells(bv, true))
resetPos(bv);
if (owner())
- owner()->update(bv, font, true);
+ owner()->update(bv, true);
in_update = false;
return;
}
if (the_locking_inset)
- the_locking_inset->update(bv, font, reinit);
+ the_locking_inset->update(bv, reinit);
if (need_update < FULL &&
- bv->text->status() == LyXText::NEED_MORE_REFRESH)
+ bv->text->refreshStatus() == LyXText::REFRESH_AREA)
{
need_update = FULL;
}
case INIT:
case FULL:
case CELL:
- if (calculate_dimensions_of_cells(bv, font, false)) {
+ if (calculate_dimensions_of_cells(bv, false)) {
need_update = INIT;
resetPos(bv);
}
string const InsetTabular::editMessage() const
{
- return _("Opened Tabular Inset");
-}
-
-
-void InsetTabular::edit(BufferView * bv, int x, int y, mouse_button::state button)
-{
- UpdatableInset::edit(bv, x, y, button);
-
- if (!bv->lockInset(this)) {
- lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl;
- return;
- }
- locked = true;
- the_locking_inset = 0;
- inset_x = 0;
- inset_y = 0;
- setPos(bv, x, y);
- clearSelection();
- finishUndo();
- if (insetHit(bv, x, y) && (button != mouse_button::button3)) {
- activateCellInsetAbs(bv, x, y, button);
- }
-}
-
-
-void InsetTabular::edit(BufferView * bv, bool front)
-{
- UpdatableInset::edit(bv, front);
-
- if (!bv->lockInset(this)) {
- lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl;
- return;
- }
- finishUndo();
- locked = true;
- the_locking_inset = 0;
- inset_x = 0;
- inset_y = 0;
- if (front) {
- 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();
+ return _("Opened table");
}
{
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
the_locking_inset = 0;
}
- hideInsetCursor(bv);
actcell = 0;
oldcell = -1;
locked = false;
if (scroll(false)) {
scroll(bv, 0.0F);
}
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
}
}
-void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what,
- bool mark_dirty) const
+void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what) const
{
if (what == INIT) {
- LyXFont font;
- calculate_dimensions_of_cells(bv, font, true);
+ calculate_dimensions_of_cells(bv, true);
}
if (!locked && what == CELL)
what = FULL;
need_update = what;
// Dirty Cast! (Lgb)
if (need_update != NONE) {
- bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
+ bv->updateInset(const_cast<InsetTabular *>(this));
if (locked)
resetPos(bv);
}
}
if (in->getInsetFromID(id)) {
actcell = i;
- in->edit(bv);
+ in->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
return the_locking_inset->lockInsetInInset(bv, inset);
}
}
if (scroll(false))
scroll(bv, 0.0F);
#endif
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
// this has to be here otherwise we don't redraw the cell!
the_locking_inset = 0;
-// showInsetCursor(bv, false);
return true;
}
if (the_locking_inset->unlockInsetInInset(bv, inset, lr)) {
if (!static_cast<InsetText *>(tl_inset)->updateInsetInInset(bv, inset))
return false;
}
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
return true;
}
if (hasSelection()) {
clearSelection();
- updateLocal(cmd.view(), SELECTION, false);
+ updateLocal(cmd.view(), SELECTION);
}
int const ocell = actcell;
int const orow = actrow;
BufferView * bv = cmd.view();
- hideInsetCursor(bv);
if (!locked) {
locked = true;
the_locking_inset = 0;
}
setPos(bv, cmd.x, cmd.y);
if (actrow != orow)
- updateLocal(bv, NONE, false);
+ 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, false);
+ updateLocal(bv, CELL);
the_locking_inset = 0;
}
- showInsetCursor(bv);
return;
}
#endif
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
the_locking_inset = 0;
}
the_locking_inset->localDispatch(cmd1);
return;
}
- showInsetCursor(bv);
}
ret = the_locking_inset->localDispatch(cmd1);
}
if (cmd.button() == mouse_button::button3 && !ret) {
- InsetTabularMailer mailer(*this);
- mailer.showDialog(cmd.view());
+ InsetTabularMailer(*this).showDialog(cmd.view());
return true;
}
return ret;
}
BufferView * bv = cmd.view();
- hideInsetCursor(bv);
int const old_cell = actcell;
setPos(bv, cmd.x, cmd.y);
if (!hasSelection()) {
setSelection(actcell, actcell);
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
} else if (old_cell != actcell) {
setSelection(sel_cell_start, actcell);
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
}
- showInsetCursor(bv);
}
// the_locking_inset->localDispatch might unlock it.
old_locking_inset = the_locking_inset;
RESULT result = UpdatableInset::localDispatch(cmd);
-
BufferView * bv = cmd.view();
+
+ if (cmd.action == LFUN_INSET_EDIT) {
+
+ if (!bv->lockInset(this)) {
+ lyxerr[Debug::INSETTEXT] << "InsetTabular::Cannot lock inset" << endl;
+ return DISPATCHED;
+ }
+
+ 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();
+ }
+
+ 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;
+ }
+
if (result == DISPATCHED || result == DISPATCHED_NOUPDATE) {
resetPos(bv);
return result;
case LFUN_MOUSE_RELEASE:
return lfunMouseRelease(cmd) ? DISPATCHED : UNDISPATCHED;
- case LFUN_SHIFT_TAB:
- case LFUN_TAB:
- hideInsetCursor(bv);
+ case LFUN_CELL_BACKWARD:
+ case LFUN_CELL_FORWARD:
unlockInsetInInset(bv, the_locking_inset);
- if (cmd.action == LFUN_TAB)
+ if (cmd.action == LFUN_CELL_FORWARD)
moveNextCell(bv, old_locking_inset != 0);
else
movePrevCell(bv, old_locking_inset != 0);
clearSelection();
if (hs)
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
if (!the_locking_inset) {
- showInsetCursor(bv);
return DISPATCHED_NOUPDATE;
}
return result;
int sc = scroll();
resetPos(bv);
if (sc != scroll()) { // inset has been scrolled
- the_locking_inset->toggleInsetCursor(bv);
- updateLocal(bv, FULL, false);
- the_locking_inset->toggleInsetCursor(bv);
+ updateLocal(bv, FULL);
}
return result;
} else if (result == DISPATCHED) {
- the_locking_inset->toggleInsetCursor(bv);
- updateLocal(bv, CELL, false);
- the_locking_inset->toggleInsetCursor(bv);
+ 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();
}
}
- hideInsetCursor(bv);
result = DISPATCHED;
switch (action) {
// --- Cursor Movements ----------------------------------
end = actcell;
}
setSelection(start, end);
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
break;
}
case LFUN_RIGHT:
result = moveRight(bv);
clearSelection();
if (hs)
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
break;
case LFUN_LEFTSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
end = actcell;
}
setSelection(start, end);
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
break;
}
case LFUN_LEFT:
result = moveLeft(bv);
clearSelection();
if (hs)
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
break;
case LFUN_DOWNSEL: {
int const start = hasSelection() ? sel_cell_start : actcell;
} else {
setSelection(start, start);
}
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
}
break;
case LFUN_DOWN:
result = moveDown(bv, old_locking_inset != 0);
clearSelection();
if (hs) {
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
}
break;
case LFUN_UPSEL: {
} else {
setSelection(start, start);
}
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
}
break;
case LFUN_UP:
result = moveUp(bv, old_locking_inset != 0);
clearSelection();
if (hs)
- updateLocal(bv, SELECTION, false);
+ updateLocal(bv, SELECTION);
break;
case LFUN_NEXT: {
UpdateCodes code = CURSOR;
actcell = tabular->GetFirstCellInRow(tabular->rows() - 1) + column;
}
resetPos(bv);
- updateLocal(bv, code, false);
+ updateLocal(bv, code);
break;
}
case LFUN_PRIOR: {
actcell = column;
}
resetPos(bv);
- updateLocal(bv, code, false);
+ updateLocal(bv, code);
break;
}
// none of these make sense for insettabular,
if (tmpstr.empty())
break;
if (insertAsciiString(bv, tmpstr, false))
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
else
result = UNDISPATCHED;
break;
break;
// no break here!
case LFUN_DELETE:
- setUndo(bv, Undo::DELETE,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ setUndo(bv, Undo::DELETE, bv->text->cursor.par());
cutSelection(bv->buffer()->params);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LFUN_COPY:
if (!hasSelection())
}
case LFUN_PASTE:
if (hasPasteBuffer()) {
- setUndo(bv, Undo::INSERT,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ setUndo(bv, Undo::INSERT, bv->text->cursor.par());
pasteSelection(bv);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
}
// ATTENTION: the function above has to be PASTE and PASTESELECTION!!!
unlockInsetInInset(bv, the_locking_inset);
nodraw(false);
// we need to update if this was requested before
- updateLocal(bv, NONE, false);
+ updateLocal(bv, NONE);
return UNDISPATCHED;
} else if (hs) {
clearSelection();
need_update = SELECTION;
}
nodraw(false);
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
return result;
}
break;
if (result < FINISHED) {
if (!the_locking_inset) {
if (bv->fitCursor())
- updateLocal(bv, FULL, false);
- if (locked)
- showInsetCursor(bv);
+ updateLocal(bv, FULL);
}
} else
bv->unlockInset(this);
int InsetTabular::latex(Buffer const * buf, ostream & os,
- bool fragile, bool fp) const
+ LatexRunParams const & runparams) const
{
- return tabular->latex(buf, os, fragile, fp);
+ return tabular->latex(buf, os, runparams);
}
}
-bool InsetTabular::calculate_dimensions_of_cells(BufferView * bv,
- LyXFont const & font,
- bool reinit) const
+bool InsetTabular::calculate_dimensions_of_cells(BufferView * bv, bool reinit) const
{
int cell = -1;
int maxAsc = 0;
InsetText * inset;
bool changed = false;
+ // FIXME: since InsetText ignores this anyway, it doesn't
+ // matter what we pass it. Ugly
+ LyXFont font;
+
// 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) &&
++cell;
inset = tabular->GetCellInset(cell);
if (!reinit && !tabular->GetPWidth(cell).zero())
- inset->update(bv, font, false);
+ 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;
}
-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();
-}
-
-
-void InsetTabular::toggleInsetCursor(BufferView * bv)
+void InsetTabular::getCursor(BufferView & bv, int & x, int & y) const
{
- if (nodraw()) {
- if (isCursorVisible())
- bv->hideLockedInsetCursor();
- return;
- }
if (the_locking_inset) {
- the_locking_inset->toggleInsetCursor(bv);
+ the_locking_inset->getCursor(bv, x, y);
return;
}
- LyXFont font; // = the_locking_inset->GetFont(par, cursor.pos);
+ x = cursor_.x();
+ y = cursor_.y() + InsetTabular::y();
- int const asc = font_metrics::maxAscent(font);
- int const desc = font_metrics::maxDescent(font);
-
- if (isCursorVisible())
- bv->hideLockedInsetCursor();
- else
- bv->showLockedInsetCursor(cursor_.x(), cursor_.y(), asc, desc);
- toggleCursorVisible();
+ // 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::showInsetCursor(BufferView * bv, bool show)
+void InsetTabular::getCursorPos(BufferView * bv, int & x, int & y) const
{
- if (nodraw())
+ if (the_locking_inset) {
+ the_locking_inset->getCursorPos(bv, x, y);
return;
- if (!isCursorVisible()) {
- LyXFont font; // = GetFont(par, cursor.pos);
-
- int const asc = font_metrics::maxAscent(font);
- int const desc = font_metrics::maxDescent(font);
- bv->fitLockedInsetCursor(cursor_.x(), cursor_.y(), asc, desc);
- if (show)
- bv->showLockedInsetCursor(cursor_.x(), cursor_.y(), asc, desc);
- setCursorVisible(true);
- }
-}
-
-
-void InsetTabular::hideInsetCursor(BufferView * bv)
-{
- if (isCursorVisible()) {
- bv->hideLockedInsetCursor();
- setCursorVisible(false);
}
+ x = cursor_.x() - top_x;
+ y = cursor_.y();
}
(tabular->GetWidthOfTabular() < bv->workWidth()-20))
{
scroll(bv, 0.0F);
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
} else if (the_locking_inset &&
(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, false);
+ updateLocal(bv, FULL);
} else if (xx < 20) {
if (xx < 0)
xx = -xx + 60;
else
xx = 60;
scroll(bv, xx);
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
}
} else if ((cursor_.x() - offset) > 20 &&
(cursor_.x() - offset + tabular->GetWidthOfColumn(actcell))
> (bv->workWidth() - 20)) {
scroll(bv, -tabular->GetWidthOfColumn(actcell) - 20);
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
} else if ((cursor_.x() - offset) < 20) {
scroll(bv, 20 - cursor_.x() + offset);
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
} else if (scroll() && top_x > 20 &&
(top_x + tabular->GetWidthOfTabular()) > (bv->workWidth() - 20)) {
scroll(bv, old_x - cursor_.x());
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
}
if (the_locking_inset) {
inset_x = cursor_.x() - top_x + tabular->GetBeginningOfTextInCell(actcell);
++actcell;
}
if (lock) {
- bool rtl = tabular->GetCellInset(actcell)->paragraph()->
+ bool rtl = tabular->GetCellInset(actcell)->paragraphs.begin()->
isRightToLeftPar(bv->buffer()->params);
activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
--actcell;
}
if (lock) {
- bool rtl = tabular->GetCellInset(actcell)->paragraph()->
+ bool rtl = tabular->GetCellInset(actcell)->paragraphs.begin()->
isRightToLeftPar(bv->buffer()->params);
activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
setSelection(0, tabular->GetNumberOfCells() - 1);
}
if (hasSelection()) {
- setUndo(bv, Undo::EDIT,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ setUndo(bv, Undo::EDIT, bv->text->cursor.par());
bool const frozen = undo_frozen;
if (!frozen)
freezeUndo();
unFreezeUndo();
if (selectall)
clearSelection();
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
}
if (the_locking_inset)
the_locking_inset->setFont(bv, font, tall);
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,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ setUndo(bv, Undo::FINISH, bv->text->cursor.par());
int row = tabular->row_of_cell(actcell);
int column = tabular->column_of_cell(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, true);
+ updateLocal(bv, INIT);
}
if (vallen.zero()
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, true);
+ updateLocal(bv, INIT);
}
}
break;
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
tabular->SetAlignSpecial(actcell,value,feature);
- updateLocal(bv, FULL, true);
+ 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, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
unlockInsetInInset(bv, the_locking_inset);
tabular->AppendColumn(bv->buffer()->params, actcell);
actcell = tabular->GetCellNumber(row, column);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::DELETE_ROW:
unlockInsetInInset(bv, the_locking_inset);
--sel_row_start;
actcell = tabular->GetCellNumber(sel_row_start, column);
clearSelection();
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::DELETE_COLUMN:
unlockInsetInInset(bv, the_locking_inset);
--sel_col_start;
actcell = tabular->GetCellNumber(row, sel_col_start);
clearSelection();
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
tabular->SetTopLine(
tabular->GetCellNumber(i, j),
lineSet, flag);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
}
tabular->GetCellNumber(i, j),
lineSet,
flag);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
}
tabular->GetCellNumber(i,j),
lineSet,
flag);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
}
tabular->GetCellNumber(i,j),
lineSet,
flag);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
}
tabular->GetCellNumber(i, j),
setAlign,
flag);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::M_VALIGN_TOP:
case LyXTabular::M_VALIGN_BOTTOM:
tabular->SetVAlignment(
tabular->GetCellNumber(i, j),
setVAlign, flag);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::MULTICOLUMN:
{
if (sel_row_start != sel_row_end) {
- Alert::alert(_("Impossible operation!"),
- _("Multicolumns can only be horizontally."),
- _("Sorry."));
+#ifdef WITH_WARNINGS
+#warning Need I say it ? This is horrible.
+#endif
+ Alert::error(_("Error setting multicolumn"),
+ _("You cannot set multicolumn vertically."));
return;
}
// just multicol for one Single Cell
// check wether we are completly in a multicol
if (tabular->IsMultiColumn(actcell)) {
tabular->UnsetMultiColumn(actcell);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
} else {
tabular->SetMultiColumn(bv->buffer(), actcell, 1);
- updateLocal(bv, CELL, true);
+ updateLocal(bv, CELL);
}
- return;
+ break;
}
// we have a selection so this means we just add all this
// cells to form a multicolumn cell
tabular->SetMultiColumn(bv->buffer(), s_start, s_end - s_start + 1);
actcell = s_start;
clearSelection();
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
}
case LyXTabular::SET_ALL_LINES:
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular->SetAllLines(
tabular->GetCellNumber(i,j), setLines);
- updateLocal(bv, INIT, true);
+ updateLocal(bv, INIT);
break;
case LyXTabular::SET_LONGTABULAR:
tabular->SetLongTabular(true);
- updateLocal(bv, INIT, true); // because this toggles displayed
+ updateLocal(bv, INIT); // because this toggles displayed
break;
case LyXTabular::UNSET_LONGTABULAR:
tabular->SetLongTabular(false);
- updateLocal(bv, INIT, true); // because this toggles displayed
+ updateLocal(bv, INIT); // because this toggles displayed
break;
case LyXTabular::SET_ROTATE_TABULAR:
tabular->SetRotateTabular(true);
case LyXTabular::LAST_ACTION:
break;
}
+
+ InsetTabularMailer mailer(*this);
+ mailer.updateDialog(bv);
}
}
//inset_x = cursor.x() - top_x + tabular->GetBeginningOfTextInCell(actcell);
//inset_y = cursor.y();
- inset->edit(bv, x, y, button);
+ inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT, x, y, button));
if (!the_locking_inset)
return false;
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
return (the_locking_inset != 0);
}
case LyXTabular::SET_MPWIDTH:
case LyXTabular::SET_SPECIAL_COLUMN:
case LyXTabular::SET_SPECIAL_MULTI:
- return status.disabled(true);
-
case LyXTabular::APPEND_ROW:
case LyXTabular::APPEND_COLUMN:
case LyXTabular::DELETE_ROW:
}
-Paragraph * InsetTabular::firstParagraph() const
-{
- if (the_locking_inset)
- return the_locking_inset->firstParagraph();
- return 0;
-}
-
-
-Paragraph * InsetTabular::getFirstParagraph(int i) const
+ParagraphList * InsetTabular::getParagraphs(int i) const
{
return (i < tabular->GetNumberOfCells())
- ? tabular->GetCellInset(i)->getFirstParagraph(0)
+ ? tabular->GetCellInset(i)->getParagraphs(0)
: 0;
}
// otherwise we have to lock the next inset and ask for it's selecttion
UpdatableInset * inset =
static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
- inset->edit(bv, 0, 0, mouse_button::none);
+ inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
WordLangTuple word(selectNextWordInt(bv, value));
nodraw(false);
if (!word.word().empty())
// otherwise we have to lock the next inset and ask for it's selecttion
UpdatableInset * inset =
static_cast<UpdatableInset*>(tabular->GetCellInset(++actcell));
- inset->edit(bv);
+ inset->localDispatch(FuncRequest(bv, LFUN_INSET_EDIT));
return selectNextWordInt(bv, value);
}
{
if (the_locking_inset) {
if (the_locking_inset->nextChange(bv, length)) {
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
return true;
}
if (tabular->IsLastCell(actcell))
}
InsetText * inset = tabular->GetCellInset(actcell);
if (inset->nextChange(bv, length)) {
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
return true;
}
while (!tabular->IsLastCell(actcell)) {
++actcell;
inset = tabular->GetCellInset(actcell);
if (inset->nextChange(bv, length)) {
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
return true;
}
}
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, false);
+ updateLocal(bv, CELL);
return true;
}
if (tabular->IsLastCell(actcell))
return false;
- ++actcell;
+ cell = actcell + 1;
}
- InsetText * inset = tabular->GetCellInset(actcell);
+ InsetText * inset = tabular->GetCellInset(cell);
if (inset->searchForward(bv, str, cs, mw)) {
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
return true;
}
- while (!tabular->IsLastCell(actcell)) {
- ++actcell;
- inset = tabular->GetCellInset(actcell);
+ while (!tabular->IsLastCell(cell)) {
+ ++cell;
+ inset = tabular->GetCellInset(cell);
if (inset->searchForward(bv, str, cs, mw)) {
- updateLocal(bv, FULL, false);
+ updateLocal(bv, FULL);
return true;
}
}
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, CELL, false);
+ updateLocal(bv, CELL);
return true;
}
+ cell = actcell;
}
- if (!locked)
- actcell = tabular->GetNumberOfCells();
- while (actcell) {
- --actcell;
- InsetText * inset = tabular->GetCellInset(actcell);
+ while (cell) {
+ --cell;
+ InsetText * inset = tabular->GetCellInset(cell);
if (inset->searchBackward(bv, str, cs, mw)) {
- updateLocal(bv, CELL, false);
+ updateLocal(bv, CELL);
return true;
}
}
if (cols < columns) {
InsetText * ti = loctab->GetCellInset(cell);
LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraph(), 0);
- ti->setText(buf.substr(op, p-op), font);
+ getFont(bv->buffer(), ti->paragraphs.begin(), 0);
+ ti->setText(buf.substr(op, p - op), font);
++cols;
++cell;
}
if (cols < columns) {
InsetText * ti = loctab->GetCellInset(cell);
LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraph(), 0);
- ti->setText(buf.substr(op, p-op), font);
+ getFont(bv->buffer(), ti->paragraphs.begin(), 0);
+ ti->setText(buf.substr(op, p - op), font);
}
cols = ocol;
++row;
if ((cell < cells) && (op < len)) {
InsetText * ti = loctab->GetCellInset(cell);
LyXFont const font = ti->getLyXText(bv)->
- getFont(bv->buffer(), ti->paragraph(), 0);
- ti->setText(buf.substr(op, len-op), font);
+ getFont(bv->buffer(), ti->paragraphs.begin(), 0);
+ ti->setText(buf.substr(op, len - op), font);
}
return true;
int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
{
- istringstream data(in);
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
+#warning CHECK verify that this is a sane value to return.
+ if (in.empty())
+ return -1;
+
if (lex.isOK()) {
lex.next();
string const token = lex.getString();
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)
}
-string const
-InsetTabularMailer::params2string(InsetTabular const & inset)
+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)
data << name_ << " \\active_cell " << inset.getActCell() << '\n';
inset.write(buffer, data);
data << "\\end_inset\n";
-
- return data.str();
+ return STRCONV(data.str());
}
projects / lyx.git / blobdiff