#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 <map>
//#include <signal.h>
+
+using std::vector;
using std::ostream;
using std::ifstream;
using std::max;
// 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
+ // +--------------------+
+ // | 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;
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);
need_update = INIT;
break;
case SELECTION:
- need_update = INIT;
+ need_update = FULL;
break;
default:
break;
void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what,
- bool mark_dirty) const
+ bool mark_dirty) const
{
if (what == INIT) {
LyXFont font;
}
if (need_update < what) // only set this if it has greater update
need_update = what;
+#if 0 // maybe this should not be done!
if ((what == INIT) && hasSelection()) {
clearSelection();
}
+#endif
// Dirty Cast! (Lgb)
if (need_update != NONE) {
bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
}
if (in->getInsetFromID(id)) {
actcell = i;
- the_locking_inset = in;
- locked = true;
- resetPos(bv);
+ in->edit(bv);
return the_locking_inset->lockInsetInInset(bv, inset);
}
}
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() <
(top_baseline + tabular->GetHeightOfTabular()))
{
bv->scrollCB(bv->text->first + bv->painter().paperHeight());
- updateLocal(bv, FULL, false);
+ 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);
+ 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,
while (p < len &&
((p = clip.find_first_of("\t\n", p)) != string::npos)) {
- switch(clip[p]) {
+ switch (clip[p]) {
case '\t':
++cols;
break;
(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;
}
// 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(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)) {
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);
int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) const
{
- return tabular->ascii(buf,os, (int)parOwner()->params().depth(), false, 0);
+ os << "<![CDATA[";
+ int const ret = tabular->ascii(buf,os,
+ (int)parOwner()->params().depth(),
+ false, 0);
+ os << "]]>";
+ return ret;
}
if (len.zero())
return -1;
-#ifdef WITH_WARNINGS
-#warning Remove use of VSpace as soon as LyXLength::inPixels exists (JMarc)
-#endif
- return VSpace(len).inPixels(bv);
+ return len.inPixels(latexTextWidth(bv), bv->text->defaultHeight());
}
int InsetTabular::getMaxWidth(BufferView * bv,
UpdatableInset const * inset) const
{
- int cell = tabular->cur_cell;
- if (tabular->GetCellInset(cell) != inset) {
- cell = actcell;
- if (tabular->GetCellInset(cell) != inset) {
-
- lyxerr[Debug::INSETTEXT] << "Actcell not equal to actual cell!\n";
- cell = -1;
- }
- }
-
- int const n = tabular->GetNumberOfCells();
+ int cell = tabular->GetCellFromInset(inset, actcell);
if (cell == -1) {
- for (cell = 0; cell < n; ++cell) {
- if (tabular->GetCellInset(cell) == inset)
- break;
- }
- }
-
- if (cell >= n) {
- lyxerr << "Own inset not found, shouldn't really happen!\n";
+ lyxerr << "Own inset not found, shouldn't really happen!"
+ << endl;
return -1;
}
}
-std::vector<string> const InsetTabular::getLabelList() const
+vector<string> const InsetTabular::getLabelList() const
{
return tabular->getLabelList();
}
}
-bool InsetTabular::isRightToLeft(BufferView *bv )
+bool InsetTabular::isRightToLeft(BufferView * bv)
{
return bv->getParentLanguage(this)->RightToLeft();
}
bool InsetTabular::forceDefaultParagraphs(Inset const * in) const
{
- int const n = tabular->GetNumberOfCells();
- static int last = 0;
+ const int cell = tabular->GetCellFromInset(in, actcell);
- // maybe some speedup
- if ((last < n) && tabular->GetCellInset(last) == in) {
- if (tabular->GetPWidth(last+1).zero())
- return true;
- return false;
- }
- if ((++last < n) && tabular->GetCellInset(last) == in) {
- if (tabular->GetPWidth(last).zero())
- return true;
- return false;
- }
+ if (cell != -1)
+ return tabular->GetPWidth(cell).zero();
- for(int i=0; i < n; ++i) {
- if (tabular->GetCellInset(i) == in) {
- last = i;
- if (tabular->GetPWidth(i).zero())
- return true;
- return false;
- }
- }
- last = 0;
// well we didn't obviously find it so maybe our owner knows more
if (owner())
return owner()->forceDefaultParagraphs(in);
projects / lyx.git / blobdiff