-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
+/**
+ * \file insettabular.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * Copyright 2001 The LyX Team.
+ * \author Jürgen Vigna
*
- * ======================================================
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
#endif
#include "insettabular.h"
+#include "insettext.h"
#include "buffer.h"
+#include "BufferView.h"
#include "commandtags.h"
-#include "lyxfunc.h"
-#include "debug.h"
-#include "LaTeXFeatures.h"
-#include "Painter.h"
-#include "font.h"
-#include "lyxtext.h"
-#include "lyx_gui_misc.h"
-#include "LyXView.h"
-#include "insets/insettext.h"
#include "debug.h"
-#include "WorkArea.h"
+#include "funcrequest.h"
#include "gettext.h"
#include "language.h"
-#include "BufferView.h"
-#include "undo_funcs.h"
+#include "LaTeXFeatures.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 "frontends/Dialogs.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 <map>
//#include <signal.h>
+
+using std::vector;
using std::ostream;
using std::ifstream;
using std::max;
{ LyXTabular::ALIGN_LEFT, "align-left" },
{ LyXTabular::ALIGN_RIGHT, "align-right" },
{ LyXTabular::ALIGN_CENTER, "align-center" },
+ { LyXTabular::ALIGN_BLOCK, "align-block" },
{ LyXTabular::VALIGN_TOP, "valign-top" },
{ LyXTabular::VALIGN_BOTTOM, "valign-bottom" },
{ LyXTabular::VALIGN_CENTER, "valign-center" },
rows = 1;
if (columns <= 0)
columns = 1;
- tabular.reset(new LyXTabular(this, rows, columns));
+ tabular.reset(new LyXTabular(buf.params, this, rows, columns));
// for now make it always display as display() inset
// just for test!!!
the_locking_inset = 0;
clearSelection();
need_update = INIT;
in_update = false;
- in_reset_pos = false;
+ in_reset_pos = 0;
inset_x = 0;
inset_y = 0;
}
bool same_id)
: UpdatableInset(tab, same_id), buffer(&buf)
{
- tabular.reset(new LyXTabular(this, *(tab.tabular), same_id));
+ tabular.reset(new LyXTabular(buf.params,
+ this, *(tab.tabular), same_id));
the_locking_inset = 0;
old_locking_inset = 0;
locked = false;
clearSelection();
need_update = INIT;
in_update = false;
- in_reset_pos = false;
+ in_reset_pos = 0;
inset_x = 0;
inset_y = 0;
}
x += static_cast<float>(scroll());
#endif
if (!cleared && ((need_update == INIT) || (need_update == FULL) ||
- (top_x != int(x)) || (top_baseline != baseline)))
+ (top_x != int(x)) || (top_baseline != baseline)))
{
int h = ascent(bv, font) + descent(bv, font);
int const tx = display() || !owner() ? 0 : top_x;
int w = tx ? width(bv, font) : pain.paperWidth();
int ty = baseline - ascent(bv, font);
-
+
if (ty < 0)
ty = 0;
if ((ty + h) > pain.paperHeight())
if (hasSelection()) {
drawCellSelection(pain, nx, baseline, i, j, cell);
}
-
+
tabular->GetCellInset(cell)->draw(bv, font, baseline, cx, cleared);
drawCellLines(pain, nx, baseline, i, cell);
nx += tabular->GetWidthOfColumn(cell);
// Here we use rectangular backgroundColor patches to clean up
// within a cell around the cell's red inset box. As follows:
//
- // +---+ +---+
- // | | | | The rectangles are A, B and C
- // | A |------------| B | below, origin top left (tx, ty),
+ // +--------------------+
+ // | C | The rectangles are A, B and C
+ // | A |------------| B | below, origin top left (tx, ty),
// | | inset box | | dimensions w(idth), h(eight).
// +---+------------+---+ x grows rightward, y downward
// | D |
// +--------------------+
//
+#if 0
// clear only if we didn't have a change
if (bv->text->status() != LyXText::CHANGED_IN_DRAW) {
+#endif
// clear before the inset
int tx, ty, w, h;
- tx = nx + 1;
+ tx = nx + 1;
ty = baseline - tabular->GetAscentOfRow(i) + 1;
w = int(cx - nx - 1);
- h = tabular->GetAscentOfRow(i) +
+ h = tabular->GetAscentOfRow(i) +
tabular->GetDescentOfRow(i) - 1;
pain.fillRectangle(tx, ty, w, h, backgroundColor());
// clear behind the inset
h = tabular->GetDescentOfRow(i) -
the_locking_inset->descent(bv, font) - 1;
pain.fillRectangle(tx, ty, w, h, backgroundColor());
+ // clear above the inset
+ tx = nx + 1;
+ ty = baseline - tabular->GetAscentOfRow(i) + 1;
+ w = tabular->GetWidthOfColumn(cell) -
+ tabular->GetAdditionalWidth(cell) - 1;
+ h = tabular->GetAscentOfRow(i) - the_locking_inset->ascent(bv, font);
+ pain.fillRectangle(tx, ty, w, h, backgroundColor());
+#if 0
}
+#endif
}
x -= ADD_TO_TABULAR_WIDTH;
x += width(bv, font);
void InsetTabular::drawCellLines(Painter & pain, int x, int baseline,
- int row, int cell) const
+ int row, int cell) const
{
int x2 = x + tabular->GetWidthOfColumn(cell);
bool on_off;
-
+
if (!tabular->TopAlreadyDrawed(cell)) {
on_off = !tabular->TopLine(cell);
pain.line(x, baseline - tabular->GetAscentOfRow(row),
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, baseline + tabular->GetDescentOfRow(row),
+ x2, baseline + tabular->GetDescentOfRow(row),
on_off ? LColor::tabularonoffline : LColor::tabularline,
on_off ? Painter::line_onoffdash : Painter::line_solid);
if (!tabular->LeftAlreadyDrawed(cell)) {
} else {
ce = tabular->right_column_of_cell(sel_cell_end);
}
-
+
int rs = tabular->row_of_cell(sel_cell_start);
int re = tabular->row_of_cell(sel_cell_end);
if (rs > re)
swap(rs, re);
-
+
if ((column >= cs) && (column <= ce) && (row >= rs) && (row <= re)) {
int w = tabular->GetWidthOfColumn(cell);
- int h = tabular->GetAscentOfRow(row) + tabular->GetDescentOfRow(row);
- pain.fillRectangle(x, baseline - tabular->GetAscentOfRow(row),
+ int h = tabular->GetAscentOfRow(row) + tabular->GetDescentOfRow(row)-1;
+ pain.fillRectangle(x, baseline - tabular->GetAscentOfRow(row) + 1,
w, h, LColor::selection);
}
}
case INIT:
case FULL:
case CELL:
- if (calculate_dimensions_of_cells(bv, font, false))
+ if (calculate_dimensions_of_cells(bv, font, false)) {
need_update = INIT;
+ resetPos(bv);
+ }
break;
case SELECTION:
- need_update = INIT;
+ need_update = FULL;
break;
default:
break;
}
-void InsetTabular::edit(BufferView * bv, int x, int y, unsigned int button)
+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;
setPos(bv, x, y);
clearSelection();
finishUndo();
- if (insetHit(bv, x, y) && (button != 3)) {
+ 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)
- actcell = 0;
- else
- actcell = tabular->GetNumberOfCells() - 1;
+ 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);
- finishUndo();
+ bv->fitCursor();
}
{
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
+ updateLocal(bv, CELL, false);
the_locking_inset = 0;
}
hideInsetCursor(bv);
+ actcell = 0;
oldcell = -1;
locked = false;
if (scroll(false) || hasSelection()) {
LyXFont font;
calculate_dimensions_of_cells(bv, font, true);
}
+ if (!locked && what == CELL)
+ what = FULL;
if (need_update < what) // only set this if it has greater update
need_update = what;
- if ((what == INIT) && hasSelection()) {
- clearSelection();
- }
// Dirty Cast! (Lgb)
if (need_update != NONE) {
bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
- if (locked) // && (what != NONE))
+ if (locked)
resetPos(bv);
}
}
if (in->getInsetFromID(id)) {
actcell = i;
in->edit(bv);
-// the_locking_inset = in;
-// locked = true;
-// resetPos(bv);
return the_locking_inset->lockInsetInInset(bv, inset);
}
}
return false;
if (the_locking_inset == inset) {
the_locking_inset->insetUnlock(bv);
- the_locking_inset = 0;
#ifdef WITH_WARNINGS
#warning fix scrolling when cellinset has requested a scroll (Jug)!!!
#endif
scroll(bv, 0.0F);
#endif
updateLocal(bv, CELL, false);
- showInsetCursor(bv, false);
+ // 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 (inset->lyxCode() == TABULAR_CODE &&
!the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE)) {
- bv->owner()->getDialogs()->updateTabular(this);
+ bv->owner()->getDialogs().updateTabular(this);
oldcell = actcell;
}
return true;
bool InsetTabular::updateInsetInInset(BufferView * bv, Inset * inset)
{
- if (!the_locking_inset)
+ 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;
- if (the_locking_inset != inset) {
- if (!the_locking_inset->updateInsetInInset(bv, inset))
+ // 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, false);
}
-unsigned int InsetTabular::insetInInsetY()
+int InsetTabular::insetInInsetY() const
{
if (!the_locking_inset)
return 0;
}
-void InsetTabular::insetButtonPress(BufferView * bv, int x, int y, int button)
+void InsetTabular::lfunMousePress(FuncRequest const & cmd)
{
- if (hasSelection() && (button == 3))
+ if (hasSelection() && cmd.button() == mouse_button::button3)
return;
if (hasSelection()) {
clearSelection();
- updateLocal(bv, SELECTION, false);
+ updateLocal(cmd.view(), SELECTION, false);
}
int const ocell = actcell;
int const orow = actrow;
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
- setPos(bv, x, y);
+ if (!locked) {
+ locked = true;
+ the_locking_inset = 0;
+ inset_x = 0;
+ inset_y = 0;
+ }
+ setPos(bv, cmd.x, cmd.y);
if (actrow != orow)
updateLocal(bv, NONE, false);
clearSelection();
#if 0
- if (button == 3) {
+ if (cmd.button() == mouse_button::button3) {
if ((ocell != actcell) && the_locking_inset) {
the_locking_inset->insetUnlock(bv);
+ updateLocal(bv, CELL, false);
the_locking_inset = 0;
}
showInsetCursor(bv);
}
#endif
- bool const inset_hit = insetHit(bv, x, y);
+ bool const inset_hit = insetHit(bv, cmd.x, cmd.y);
if ((ocell == actcell) && the_locking_inset && inset_hit) {
resetPos(bv);
- the_locking_inset->insetButtonPress(bv,
- x - inset_x, y - inset_y,
- button);
+ FuncRequest cmd1 = cmd;
+ cmd1.x -= inset_x;
+ cmd1.y -= inset_y;
+ the_locking_inset->localDispatch(cmd1);
return;
- } else if (the_locking_inset) {
+ }
+
+ if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
+ updateLocal(bv, CELL, false);
+ the_locking_inset = 0;
}
- the_locking_inset = 0;
- if (button == 2) {
- localDispatch(bv, LFUN_PASTESELECTION, "paragraph");
+
+ if (cmd.button() == mouse_button::button2) {
+ localDispatch(FuncRequest(bv, LFUN_PASTESELECTION, "paragraph"));
return;
}
+
if (inset_hit && bv->theLockingInset()) {
- if (activateCellInsetAbs(bv, x, y, button))
- the_locking_inset->insetButtonPress(bv,
- x - inset_x,
- y - inset_y,
- button);
+ 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;
}
showInsetCursor(bv);
}
-bool InsetTabular::insetButtonRelease(BufferView * bv,
- int x, int y, int button)
+bool InsetTabular::lfunMouseRelease(FuncRequest const & cmd)
{
bool ret = false;
- if (the_locking_inset)
- ret = the_locking_inset->insetButtonRelease(bv, x - inset_x,
- y - inset_y, button);
- if (button == 3 && !ret) {
- bv->owner()->getDialogs()->showTabular(this);
+ 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) {
+ cmd.view()->owner()->getDialogs().showTabular(this);
return true;
}
return ret;
}
-void InsetTabular::insetMotionNotify(BufferView * bv, int x, int y, int button)
+void InsetTabular::lfunMouseMotion(FuncRequest const & cmd)
{
if (the_locking_inset) {
- the_locking_inset->insetMotionNotify(bv,
- x - inset_x,
- y - inset_y,
- button);
+ FuncRequest cmd1 = cmd;
+ cmd1.x -= inset_x;
+ cmd1.y -= inset_y;
+ the_locking_inset->localDispatch(cmd1);
return;
}
-
+
+ BufferView * bv = cmd.view();
hideInsetCursor(bv);
-// int const old_cell = actcell;
-
- setPos(bv, x, y);
+ int const old_cell = actcell;
+
+ setPos(bv, cmd.x, cmd.y);
if (!hasSelection()) {
setSelection(actcell, actcell);
- } else {
+ updateLocal(bv, SELECTION, false);
+ } else if (old_cell != actcell) {
setSelection(sel_cell_start, actcell);
+ updateLocal(bv, SELECTION, false);
}
- updateLocal(bv, SELECTION, false);
showInsetCursor(bv);
}
-void InsetTabular::insetKeyPress(XKeyEvent * xke)
-{
- if (the_locking_inset) {
- the_locking_inset->insetKeyPress(xke);
- return;
- }
-}
-
-
-UpdatableInset::RESULT
-InsetTabular::localDispatch(BufferView * bv, kb_action action,
- string const & arg)
+Inset::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
{
- // We need to save the value of the_locking_inset as the call to
- // the_locking_inset->LocalDispatch might unlock it.
+ // 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;
- UpdatableInset::RESULT result =
- UpdatableInset::localDispatch(bv, action, arg);
+ RESULT result = UpdatableInset::localDispatch(cmd);
+
+ BufferView * bv = cmd.view();
if (result == DISPATCHED || result == DISPATCHED_NOUPDATE) {
resetPos(bv);
return result;
}
- if ((action < 0) && arg.empty())
+ if (cmd.action < 0 && cmd.argument.empty())
return FINISHED;
bool hs = hasSelection();
// 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 (action) {
+ 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_SHIFT_TAB:
case LFUN_TAB:
hideInsetCursor(bv);
unlockInsetInInset(bv, the_locking_inset);
- if (action == LFUN_TAB)
+ if (cmd.action == LFUN_TAB)
moveNextCell(bv, old_locking_inset != 0);
else
movePrevCell(bv, old_locking_inset != 0);
}
}
+ kb_action action = cmd.action;
+ string arg = cmd.argument;
if (the_locking_inset) {
- result = the_locking_inset->localDispatch(bv, action, arg);
+ result = the_locking_inset->localDispatch(cmd);
if (result == DISPATCHED_NOUPDATE) {
int sc = scroll();
resetPos(bv);
setSelection(start, actcell);
break;
}
-
+
int end = actcell;
// if we are starting a selection, only select
// the current cell at the beginning
setSelection(start, actcell);
break;
}
-
+
int end = actcell;
// if we are starting a selection, only select
// the current cell at the beginning
- if (hasSelection()) {
+ if (hasSelection()) {
moveLeft(bv, false);
end = actcell;
}
updateLocal(bv, SELECTION, false);
break;
case LFUN_NEXT: {
+ UpdateCodes code = CURSOR;
+ if (hs) {
+ clearSelection();
+ code = SELECTION;
+ }
int column = actcol;
unlockInsetInInset(bv, the_locking_inset);
- if (bv->text->first + bv->painter().paperHeight() <
+ if (bv->text->first_y + bv->painter().paperHeight() <
(top_baseline + tabular->GetHeightOfTabular()))
{
- bv->scrollCB(bv->text->first + bv->painter().paperHeight());
- updateLocal(bv, FULL, false);
+ bv->scrollDocView(bv->text->first_y + bv->painter().paperHeight());
+ code = FULL;
actcell = tabular->GetCellBelow(first_visible_cell) + column;
} else {
actcell = tabular->GetFirstCellInRow(tabular->rows() - 1) + column;
}
resetPos(bv);
- updateLocal(bv, CURSOR, false);
+ updateLocal(bv, code, false);
break;
}
case LFUN_PRIOR: {
+ UpdateCodes code = CURSOR;
+ if (hs) {
+ clearSelection();
+ code = SELECTION;
+ }
int column = actcol;
unlockInsetInInset(bv, the_locking_inset);
if (top_baseline < 0) {
- bv->scrollCB(bv->text->first - bv->painter().paperHeight());
- updateLocal(bv, FULL, false);
+ bv->scrollDocView(bv->text->first_y - bv->painter().paperHeight());
+ code = FULL;
if (top_baseline > 0)
actcell = column;
else
actcell = column;
}
resetPos(bv);
- updateLocal(bv, CURSOR, false);
+ updateLocal(bv, code, false);
break;
}
// none of these make sense for insettabular,
case LFUN_NEXTSEL:
case LFUN_WORDLEFT:
case LFUN_WORDLEFTSEL:
- case LFUN_WORDRIGHT:
+ case LFUN_WORDRIGHT:
case LFUN_WORDRIGHTSEL:
+ case LFUN_WORDSEL:
case LFUN_DOWN_PARAGRAPH:
case LFUN_DOWN_PARAGRAPHSEL:
case LFUN_UP_PARAGRAPH:
case LFUN_UP_PARAGRAPHSEL:
case LFUN_BACKSPACE:
- case LFUN_DELETE:
case LFUN_HOME:
case LFUN_HOMESEL:
case LFUN_END:
case LFUN_ENDSEL:
case LFUN_BEGINNINGBUF:
- case LFUN_BEGINNINGBUFSEL:
+ case LFUN_BEGINNINGBUFSEL:
case LFUN_ENDBUF:
case LFUN_ENDBUFSEL:
break;
case LFUN_LAYOUT_TABULAR:
- bv->owner()->getDialogs()->showTabular(this);
+ bv->owner()->getDialogs().showTabular(this);
break;
case LFUN_TABULAR_FEATURE:
if (!tabularFeatures(bv, arg))
result = UNDISPATCHED;
break;
+ // insert file functions
+ case LFUN_FILE_INSERT_ASCII_PARA:
+ case LFUN_FILE_INSERT_ASCII:
+ {
+ string tmpstr = getContentsOfAsciiFile(bv, arg, false);
+ if (tmpstr.empty())
+ break;
+ if (insertAsciiString(bv, tmpstr, false))
+ updateLocal(bv, INIT, true);
+ else
+ result = UNDISPATCHED;
+ break;
+ }
+ // cut and paste functions
case LFUN_CUT:
if (!copySelection(bv))
break;
+ // no break here!
+ case LFUN_DELETE:
setUndo(bv, Undo::DELETE,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ bv->text->cursor.par(),
+ bv->text->cursor.par()->next());
cutSelection();
updateLocal(bv, INIT, true);
break;
case LFUN_PASTESELECTION:
{
string const clip(bv->getClipboard());
-
- if (clip.empty())
+ if (clip.empty())
break;
+#if 0
if (clip.find('\t') != string::npos) {
int cols = 1;
int rows = 1;
while (p < len &&
((p = clip.find_first_of("\t\n", p)) != string::npos)) {
- switch(clip[p]) {
+ switch (clip[p]) {
case '\t':
++cols;
break;
}
maxCols = max(cols, maxCols);
delete paste_tabular;
- paste_tabular = new LyXTabular(this, rows, maxCols);
+ paste_tabular = new LyXTabular(bv->buffer()->params,
+ this, rows, maxCols);
string::size_type op = 0;
int cell = 0;
int cells = paste_tabular->GetNumberOfCells();
(p = clip.find_first_of("\t\n", p)) != string::npos) {
if (p >= len)
break;
- switch(clip[p]) {
+ switch (clip[p]) {
case '\t':
paste_tabular->GetCellInset(cell)->setText(clip.substr(op, p-op));
++cols;
// check for the last cell if there is no trailing '\n'
if ((cell < cells) && (op < len))
paste_tabular->GetCellInset(cell)->setText(clip.substr(op, len-op));
- } else {
+ } else
+#else
+ if (!insertAsciiString(bv, clip, true))
+#endif
+ {
// so that the clipboard is used and it goes on
// to default
// and executes LFUN_PASTESELECTION in insettext!
case LFUN_PASTE:
if (hasPasteBuffer()) {
setUndo(bv, Undo::INSERT,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ bv->text->cursor.par(),
+ bv->text->cursor.par()->next());
pasteSelection(bv);
updateLocal(bv, INIT, true);
break;
}
// 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;
+ }
+ }
// we try to activate the actual inset and put this event down to
// the insets dispatch function.
- result = UNDISPATCHED;
- if (the_locking_inset)
+ 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(bv, action, arg);
+ result = the_locking_inset->localDispatch(FuncRequest(bv, action, arg));
if ((result == UNDISPATCHED) || (result >= FINISHED)) {
unlockInsetInInset(bv, the_locking_inset);
nodraw(false);
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;
}
nodraw(false);
updateLocal(bv, CELL, false);
}
if (result < FINISHED) {
if (!the_locking_inset) {
- showInsetCursor(bv);
+ if (bv->fitCursor())
+ updateLocal(bv, FULL, false);
+ if (locked)
+ showInsetCursor(bv);
}
} else
bv->unlockInset(this);
int InsetTabular::latex(Buffer const * buf, ostream & os,
- bool fragile, bool fp) const
+ bool fragile, bool fp) const
{
return tabular->latex(buf, os, fragile, fp);
}
{
if (ll > 0)
return tabular->ascii(buf, os, (int)parOwner()->params().depth(),
- false,0);
+ false,0);
return tabular->ascii(buf, os, 0, false,0);
}
}
-int InsetTabular::docbook(Buffer const * buf, ostream & os) const
+int InsetTabular::docbook(Buffer const * buf, ostream & os, bool mixcont) const
{
int ret = 0;
Inset * master;
master = master->owner());
if (!master) {
- os << "<informaltable>\n";
+ os << "<informaltable>";
+ if (mixcont)
+ os << endl;
ret++;
}
- ret+= tabular->docBook(buf,os);
+ ret+= tabular->docbook(buf, os, mixcont);
if (!master) {
- os << "</informaltable>\n";
+ os << "</informaltable>";
+ if (mixcont)
+ os << endl;
ret++;
}
return ret;
bool InsetTabular::calculate_dimensions_of_cells(BufferView * bv,
- LyXFont const & font,
- bool reinit) const
+ LyXFont const & font,
+ bool reinit) const
{
int cell = -1;
int maxAsc = 0;
int maxDesc = 0;
InsetText * inset;
bool changed = false;
-
+
// 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->toggleInsetCursor(bv);
return;
}
-
+
LyXFont font; // = the_locking_inset->GetFont(par, cursor.pos);
-
- int const asc = lyxfont::maxAscent(font);
- int const desc = lyxfont::maxDescent(font);
-
+
+ int const asc = font_metrics::maxAscent(font);
+ int const desc = font_metrics::maxDescent(font);
+
if (isCursorVisible())
bv->hideLockedInsetCursor();
else
return;
if (!isCursorVisible()) {
LyXFont font; // = GetFont(par, cursor.pos);
-
- int const asc = lyxfont::maxAscent(font);
- int const desc = lyxfont::maxDescent(font);
+
+ 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);
void InsetTabular::fitInsetCursor(BufferView * bv) const
{
if (the_locking_inset) {
+ int old_first_y = bv->text->first_y;
the_locking_inset->fitInsetCursor(bv);
+ if (old_first_y != bv->text->first_y)
+ need_update = FULL;
return;
}
LyXFont font;
-
- int const asc = lyxfont::maxAscent(font);
- int const desc = lyxfont::maxDescent(font);
- bv->fitLockedInsetCursor(cursor_.x(), cursor_.y(), asc, desc);
+
+ 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;
}
void InsetTabular::setPos(BufferView * bv, int x, int y) const
{
cursor_.y(0);
-
+
actcell = actrow = actcol = 0;
int ly = tabular->GetDescentOfRow(actrow);
int InsetTabular::getCellXPos(int cell) const
{
int c = cell;
-
+
for (; !tabular->IsFirstCellInRow(c); --c)
;
int lx = tabular->GetWidthOfColumn(cell);
void InsetTabular::resetPos(BufferView * bv) const
{
+#ifdef WITH_WARNINGS
#warning This should be fixed in the right manner (20011128 Jug)
+#endif
// fast hack to fix infinite repaintings!
- if (in_reset_pos)
+ if (in_reset_pos > 0)
return;
int cell = 0;
return;
}
// we need this only from here on!!!
- in_reset_pos = true;
+ ++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);
// cursor.x(getCellXPos(actcell) + offset);
- if ((actcol < tabular->columns()-1) && scroll(false) &&
+ if ((actcol < tabular->columns() - 1) && scroll(false) &&
(tabular->GetWidthOfTabular() < bv->workWidth()-20))
{
scroll(bv, 0.0F);
} else if ((cursor_.x() - offset) < 20) {
scroll(bv, 20 - cursor_.x() + offset);
updateLocal(bv, FULL, false);
- } else if (scroll(false) && top_x > 20 &&
+ } else if (scroll() && top_x > 20 &&
(top_x + tabular->GetWidthOfTabular()) > (bv->workWidth() - 20)) {
scroll(bv, old_x - cursor_.x());
updateLocal(bv, FULL, false);
!the_locking_inset->getFirstLockingInsetOfType(TABULAR_CODE)) &&
actcell != oldcell) {
InsetTabular * inset = const_cast<InsetTabular *>(this);
- bv->owner()->getDialogs()->updateTabular(inset);
+ bv->owner()->getDialogs().updateTabular(inset);
oldcell = actcell;
}
- in_reset_pos = false;
+ in_reset_pos = 0;
}
-UpdatableInset::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
+Inset::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
{
if (lock && !old_locking_inset) {
if (activateCellInset(bv))
}
-UpdatableInset::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
+Inset::RESULT 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, 0, true))
+ if (activateCellInset(bv, 0, 0, mouse_button::none, true))
return DISPATCHED;
}
resetPos(bv);
}
-UpdatableInset::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
+Inset::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
{
int const ocell = actcell;
actcell = tabular->GetCellAbove(actcell);
}
-UpdatableInset::RESULT InsetTabular::moveDown(BufferView * bv, bool lock)
+Inset::RESULT InsetTabular::moveDown(BufferView * bv, bool lock)
{
int const ocell = actcell;
actcell = tabular->GetCellBelow(actcell);
if (lock) {
bool rtl = tabular->GetCellInset(actcell)->paragraph()->
isRightToLeftPar(bv->buffer()->params);
- activateCellInset(bv, 0, 0, 0, !rtl);
+ activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
resetPos(bv);
return true;
if (lock) {
bool rtl = tabular->GetCellInset(actcell)->paragraph()->
isRightToLeftPar(bv->buffer()->params);
- activateCellInset(bv, 0, 0, 0, !rtl);
+ activateCellInset(bv, 0, 0, mouse_button::none, !rtl);
}
resetPos(bv);
return true;
void InsetTabular::setFont(BufferView * bv, LyXFont const & font, bool tall,
- bool selectall)
+ bool selectall)
{
if (selectall) {
setSelection(0, tabular->GetNumberOfCells() - 1);
}
if (hasSelection()) {
setUndo(bv, Undo::EDIT,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
- bool frozen = undo_frozen;
+ bv->text->cursor.par(),
+ bv->text->cursor.par()->next());
+ bool const frozen = undo_frozen;
if (!frozen)
freezeUndo();
// apply the fontchange on the whole selection
}
if (!frozen)
unFreezeUndo();
+ if (selectall)
+ clearSelection();
updateLocal(bv, INIT, true);
}
if (the_locking_inset)
bool InsetTabular::tabularFeatures(BufferView * bv, string const & what)
{
LyXTabular::Feature action = LyXTabular::LAST_ACTION;
-
+
int i = 0;
for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
string const tmp = tabularFeature[i].feature;
-
+
if (tmp == what.substr(0, tmp.length())) {
//if (!compare(tabularFeatures[i].feature.c_str(), what.c_str(),
//tabularFeatures[i].feature.length())) {
return false;
string const val =
- frontStrip(what.substr(tabularFeature[i].feature.length()));
+ ltrim(what.substr(tabularFeature[i].feature.length()));
tabularFeatures(bv, action, val);
return true;
}
static void checkLongtableSpecial(LyXTabular::ltType & ltt,
- string const & special, bool & flag)
+ string const & special, bool & flag)
{
if (special == "dl_above") {
ltt.topDL = flag;
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;
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;
sel_row_start = sel_row_end = tabular->row_of_cell(actcell);
}
setUndo(bv, Undo::FINISH,
- bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ bv->text->cursor.par(),
+ bv->text->cursor.par()->next());
int row = tabular->row_of_cell(actcell);
int column = tabular->column_of_cell(actcell);
bool flag = true;
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) {
}
updateLocal(bv, INIT, true);
}
+
+ if (vallen.zero()
+ && tabular->GetAlignment(actcell, true) == LYX_ALIGN_BLOCK)
+ tabularFeatures(bv, LyXTabular::ALIGN_CENTER, string());
+ else if (!vallen.zero()
+ && tabular->GetAlignment(actcell, true) != LYX_ALIGN_BLOCK)
+ tabularFeatures(bv, LyXTabular::ALIGN_BLOCK, string());
}
break;
case LyXTabular::SET_MPWIDTH:
{
LyXLength const vallen(value);
LyXLength const & tmplen = tabular->GetPWidth(actcell);
-
+
bool const update = (tmplen != vallen);
tabular->SetMColumnPWidth(actcell, vallen);
if (update) {
case LyXTabular::APPEND_ROW:
// append the row into the tabular
unlockInsetInInset(bv, the_locking_inset);
- tabular->AppendRow(actcell);
+ tabular->AppendRow(bv->buffer()->params, actcell);
updateLocal(bv, INIT, true);
break;
case LyXTabular::APPEND_COLUMN:
// append the column into the tabular
unlockInsetInInset(bv, the_locking_inset);
- tabular->AppendColumn(actcell);
+ tabular->AppendColumn(bv->buffer()->params, actcell);
actcell = tabular->GetCellNumber(row, column);
updateLocal(bv, INIT, true);
break;
updateLocal(bv, INIT, true);
break;
}
-
+
case LyXTabular::M_TOGGLE_LINE_BOTTOM:
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM:
{
- bool lineSet = !tabular->BottomLine(actcell, flag);
+ 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->SetBottomLine(
updateLocal(bv, INIT, true);
break;
}
-
+
case LyXTabular::M_TOGGLE_LINE_LEFT:
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT:
updateLocal(bv, INIT, true);
break;
}
-
+
case LyXTabular::M_TOGGLE_LINE_RIGHT:
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT:
updateLocal(bv, INIT, true);
break;
}
-
+
case LyXTabular::M_ALIGN_LEFT:
case LyXTabular::M_ALIGN_RIGHT:
case LyXTabular::M_ALIGN_CENTER:
case LyXTabular::ALIGN_LEFT:
case LyXTabular::ALIGN_RIGHT:
case LyXTabular::ALIGN_CENTER:
+ case LyXTabular::ALIGN_BLOCK:
for (int i = sel_row_start; i <= sel_row_end; ++i)
for (int j = sel_col_start; j <= sel_col_end; ++j)
tabular->SetAlignment(
case LyXTabular::MULTICOLUMN:
{
if (sel_row_start != sel_row_end) {
- Alert::alert(_("Impossible Operation!"),
- _("Multicolumns can only be horizontally."),
+ Alert::alert(_("Impossible Operation!"),
+ _("Multicolumns can only be horizontally."),
_("Sorry."));
return;
}
tabular->UnsetMultiColumn(actcell);
updateLocal(bv, INIT, true);
} else {
- tabular->SetMultiColumn(actcell, 1);
+ tabular->SetMultiColumn(bv->buffer(), actcell, 1);
updateLocal(bv, CELL, true);
}
return;
s_start = sel_cell_start;
s_end = sel_cell_end;
}
- tabular->SetMultiColumn(s_start, s_end - s_start + 1);
+ tabular->SetMultiColumn(bv->buffer(), s_start, s_end - s_start + 1);
actcell = s_start;
clearSelection();
updateLocal(bv, INIT, true);
}
-bool InsetTabular::activateCellInset(BufferView * bv, int x, int y, int button,
+bool InsetTabular::activateCellInset(BufferView * bv, int x, int y, mouse_button::state button,
bool behind)
{
UpdatableInset * inset =
bool InsetTabular::activateCellInsetAbs(BufferView * bv, int x, int y,
- int button)
+ mouse_button::state button)
{
inset_x = cursor_.x()
- top_x + tabular->GetBeginningOfTextInCell(actcell);
int InsetTabular::getMaxWidthOfCell(BufferView * bv, int cell) const
{
LyXLength const len = tabular->GetPWidth(cell);
-
+
if (len.zero())
return -1;
- return len.inPixels(latexTextWidth(bv), bv->text->defaultHeight());
+ return len.inPixels(latexTextWidth(bv));
}
int InsetTabular::getMaxWidth(BufferView * bv,
- UpdatableInset const * inset) const
+ UpdatableInset const * inset) const
{
int cell = tabular->GetCellFromInset(inset, actcell);
<< 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;
}
LyXText * InsetTabular::getLyXText(BufferView const * bv,
- bool const recursive) const
+ bool const recursive) const
{
if (the_locking_inset)
return the_locking_inset->getLyXText(bv, recursive);
bool InsetTabular::showInsetDialog(BufferView * bv) const
{
if (!the_locking_inset || !the_locking_inset->showInsetDialog(bv))
- bv->owner()->getDialogs()
- ->showTabular(const_cast<InsetTabular *>(this));
+ bv->owner()->getDialogs().
+ showTabular(const_cast<InsetTabular *>(this));
return true;
}
return;
}
}
- bv->owner()->getDialogs()->showTabular(
+ bv->owner()->getDialogs().showTabular(
const_cast<InsetTabular *>(this));
}
{
int action = LyXTabular::LAST_ACTION;
FuncStatus status;
-
+
int i = 0;
for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) {
string const tmp = tabularFeature[i].feature;
- if (tmp == what.substr(0, tmp.length())) {
+ if (tmp == what.substr(0, tmp.length())) {
//if (!compare(tabularFeatures[i].feature.c_str(), what.c_str(),
// tabularFeatures[i].feature.length())) {
action = tabularFeature[i].action;
status.clear();
return status.unknown(true);
}
-
- string const argument = frontStrip(what.substr(tabularFeature[i].feature.length()));
+
+ string const argument = ltrim(what.substr(tabularFeature[i].feature.length()));
int sel_row_start;
int sel_row_end;
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:
}
-std::vector<string> const InsetTabular::getLabelList() const
+vector<string> const InsetTabular::getLabelList() const
{
return tabular->getLabelList();
}
int const rows = sel_row_end - sel_row_start + 1;
delete paste_tabular;
- paste_tabular = new LyXTabular(this, *tabular); // rows, columns);
+ paste_tabular = new LyXTabular(bv->buffer()->params,
+ this, *tabular); // rows, columns);
for (int i = 0; i < sel_row_start; ++i)
paste_tabular->DeleteRow(0);
while (paste_tabular->rows() > rows)
ostringstream sstr;
paste_tabular->ascii(bv->buffer(), sstr,
- (int)parOwner()->params().depth(), true, '\t');
- bv->stuffClipboard(sstr.str().c_str());
+ (int)parOwner()->params().depth(), true, '\t');
+ bv->stuffClipboard(STRCONV(sstr.str()));
return true;
}
}
-bool InsetTabular::isRightToLeft(BufferView *bv )
+bool InsetTabular::isRightToLeft(BufferView * bv)
{
return bv->getParentLanguage(this)->RightToLeft();
}
{
int const start = hasSelection() ? sel_cell_start : actcell;
int const end = hasSelection() ? sel_cell_end : actcell;
-
+
srow = tabular->row_of_cell(start);
erow = tabular->row_of_cell(end);
if (srow > erow) {
}
-string const
+WordLangTuple const
InsetTabular::selectNextWordToSpellcheck(BufferView * bv, float & value) const
{
nodraw(true);
if (the_locking_inset) {
- string const str(the_locking_inset->selectNextWordToSpellcheck(bv, value));
- if (!str.empty()) {
+ WordLangTuple word(the_locking_inset->selectNextWordToSpellcheck(bv, value));
+ if (!word.word().empty()) {
nodraw(false);
- return str;
+ return word;
}
if (tabular->IsLastCell(actcell)) {
bv->unlockInset(const_cast<InsetTabular *>(this));
nodraw(false);
- return string();
+ 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->edit(bv, 0, 0, 0);
- string const str(selectNextWordInt(bv, value));
+ inset->edit(bv, 0, 0, mouse_button::none);
+ WordLangTuple word(selectNextWordInt(bv, value));
nodraw(false);
- if (!str.empty())
+ if (!word.word().empty())
resetPos(bv);
- return str;
+ return word;
}
-string InsetTabular::selectNextWordInt(BufferView * bv, float & value) const
+WordLangTuple InsetTabular::selectNextWordInt(BufferView * bv, float & value) const
{
// when entering this function the inset should be ALWAYS locked!
lyx::Assert(the_locking_inset);
- string const str(the_locking_inset->selectNextWordToSpellcheck(bv, value));
- if (!str.empty())
- return str;
+ 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 string();
+ return WordLangTuple();
}
-
+
// otherwise we have to lock the next inset and ask for it's selecttion
UpdatableInset * inset =
static_cast<UpdatableInset*>(tabular->GetCellInset(++actcell));
bool InsetTabular::searchForward(BufferView * bv, string const & str,
- bool cs, bool mw)
+ bool cs, bool mw)
{
- nodraw(true);
if (the_locking_inset) {
if (the_locking_inset->searchForward(bv, str, cs, mw)) {
- nodraw(false);
updateLocal(bv, CELL, false);
return true;
}
- if (tabular->IsLastCell(actcell)) {
- nodraw(false);
- bv->unlockInset(const_cast<InsetTabular *>(this));
+ if (tabular->IsLastCell(actcell))
return false;
- }
++actcell;
}
- // otherwise we have to lock the next inset and search there
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
- inset->edit(bv);
- bool const ret = searchForward(bv, str, cs, mw);
- nodraw(false);
- updateLocal(bv, CELL, false);
- return ret;
+ InsetText * inset = tabular->GetCellInset(actcell);
+ if (inset->searchForward(bv, str, cs, mw)) {
+ updateLocal(bv, FULL, false);
+ return true;
+ }
+ while (!tabular->IsLastCell(actcell)) {
+ ++actcell;
+ inset = tabular->GetCellInset(actcell);
+ if (inset->searchForward(bv, str, cs, mw)) {
+ updateLocal(bv, FULL, false);
+ return true;
+ }
+ }
+ return false;
}
bool InsetTabular::searchBackward(BufferView * bv, string const & str,
- bool cs, bool mw)
+ bool cs, bool mw)
{
- nodraw(true);
if (the_locking_inset) {
if (the_locking_inset->searchBackward(bv, str, cs, mw)) {
- nodraw(false);
updateLocal(bv, CELL, false);
return true;
}
- if (!actcell) { // we are already in the first cell
- nodraw(false);
- bv->unlockInset(const_cast<InsetTabular *>(this));
- return false;
- }
+ }
+ if (!locked)
+ actcell = tabular->GetNumberOfCells();
+
+ while (actcell) {
--actcell;
+ InsetText * inset = tabular->GetCellInset(actcell);
+ if (inset->searchBackward(bv, str, cs, mw)) {
+ updateLocal(bv, CELL, false);
+ return true;
+ }
}
- // otherwise we have to lock the next inset and search there
- UpdatableInset * inset =
- static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
- inset->edit(bv, false);
- bool const ret = searchBackward(bv, str, cs, mw);
- nodraw(false);
- updateLocal(bv, CELL, false);
- return ret;
+ return false;
}
{
if (the_locking_inset)
return the_locking_inset->insetAllowed(code);
- return false;
+ // 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;
}
// if we're here there is really something strange going on!!!
return false;
}
+
+bool InsetTabular::insertAsciiString(BufferView * bv, string const & buf,
+ bool usePaste)
+{
+ if (buf.length() <= 0)
+ return true;
+
+ int cols = 1;
+ int rows = 1;
+ int maxCols = 1;
+ string::size_type len = buf.length();
+ string::size_type p = 0;
+
+ 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)
+ ++rows;
+ maxCols = max(cols, maxCols);
+ cols = 1;
+ break;
+ }
+ ++p;
+ }
+ maxCols = max(cols, maxCols);
+ LyXTabular * loctab;
+ int cell = 0;
+ int ocol = 0;
+ int row = 0;
+ if (usePaste) {
+ delete paste_tabular;
+ paste_tabular = new LyXTabular(bv->buffer()->params,
+ this, rows, maxCols);
+ loctab = paste_tabular;
+ cols = 0;
+ } else {
+ loctab = tabular.get();
+ cell = actcell;
+ ocol = actcol;
+ row = actrow;
+ }
+ string::size_type op = 0;
+ int cells = loctab->GetNumberOfCells();
+ p = 0;
+ cols = ocol;
+ rows = loctab->rows();
+ int const columns = loctab->columns();
+ while ((cell < cells) && (p < len) && (row < rows) &&
+ (p = buf.find_first_of("\t\n", p)) != string::npos)
+ {
+ if (p >= len)
+ break;
+ switch (buf[p]) {
+ 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->paragraph(), 0);
+ ti->setText(buf.substr(op, p-op), font);
+ ++cols;
+ ++cell;
+ }
+ break;
+ 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->paragraph(), 0);
+ ti->setText(buf.substr(op, p-op), font);
+ }
+ cols = ocol;
+ ++row;
+ if (row < rows)
+ cell = loctab->GetCellNumber(row, cols);
+ break;
+ }
+ ++p;
+ 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->paragraph(), 0);
+ ti->setText(buf.substr(op, len-op), font);
+ }
+
+ return true;
+}
+
+
+void InsetTabular::addPreview(grfx::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);
+ }
+ }
+}
projects / lyx.git / blobdiff