X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettabular.C;h=d21030ee98d11ebc7413c5f57dcac73490420171;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=d04a9423e0e1d7f78c9df8c447fb1f17c593062b;hpb=dca91cf463150d8ace1f828dc73b7c4058636585;p=lyx.git diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index d04a9423e0..d21030ee98 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -48,6 +48,8 @@ #include //#include + +using std::vector; using std::ostream; using std::ifstream; using std::max; @@ -138,6 +140,7 @@ InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns) // for now make it always display as display() inset // just for test!!! the_locking_inset = 0; + old_locking_inset = 0; locked = false; oldcell = -1; actrow = actcell = 0; @@ -145,6 +148,8 @@ InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns) need_update = INIT; in_update = false; in_reset_pos = false; + inset_x = 0; + inset_y = 0; } @@ -154,6 +159,7 @@ InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf, { tabular.reset(new LyXTabular(this, *(tab.tabular), same_id)); the_locking_inset = 0; + old_locking_inset = 0; locked = false; oldcell = -1; actrow = actcell = 0; @@ -161,6 +167,8 @@ InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf, need_update = INIT; in_update = false; in_reset_pos = false; + inset_x = 0; + inset_y = 0; } @@ -366,16 +374,18 @@ void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline, // 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; @@ -401,7 +411,16 @@ void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline, 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); @@ -601,9 +620,11 @@ void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what, } 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(this), mark_dirty); @@ -639,9 +660,7 @@ bool InsetTabular::lockInsetInInset(BufferView * bv, UpdatableInset * inset) } if (in->getInsetFromID(id)) { actcell = i; - the_locking_inset = in; - locked = true; - resetPos(bv); + in->edit(bv); return the_locking_inset->lockInsetInInset(bv, inset); } } @@ -1063,6 +1082,10 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, case LFUN_HOMESEL: case LFUN_END: case LFUN_ENDSEL: + case LFUN_BEGINNINGBUF: + case LFUN_BEGINNINGBUFSEL: + case LFUN_ENDBUF: + case LFUN_ENDBUFSEL: break; case LFUN_LAYOUT_TABULAR: bv->owner()->getDialogs()->showTabular(this); @@ -1101,7 +1124,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, while (p < len && ((p = clip.find_first_of("\t\n", p)) != string::npos)) { - switch(clip[p]) { + switch (clip[p]) { case '\t': ++cols; break; @@ -1125,7 +1148,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, (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; @@ -1216,7 +1239,12 @@ int InsetTabular::ascii(Buffer const * buf, ostream & os, int ll) const int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) const { - return tabular->ascii(buf,os, (int)parOwner()->params().depth(), false, 0); + os << "ascii(buf,os, + (int)parOwner()->params().depth(), + false, 0); + os << "]]>"; + return ret; } @@ -2099,37 +2127,18 @@ int InsetTabular::getMaxWidthOfCell(BufferView * bv, int cell) const 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; } @@ -2205,16 +2214,13 @@ void InsetTabular::openLayoutDialog(BufferView * bv) const // -// functions returns: -// 0 ... disabled -// 1 ... enabled -// 2 ... toggled on -// 3 ... toggled off +// function returns an object as defined in func_status.h: +// states OK, Unknown, Disabled, On, Off. // -func_status::value_type InsetTabular::getStatus(string const & what) const +FuncStatus InsetTabular::getStatus(string const & what) const { int action = LyXTabular::LAST_ACTION; - func_status::value_type status = func_status::OK; + FuncStatus status; int i = 0; for (; tabularFeature[i].action != LyXTabular::LAST_ACTION; ++i) { @@ -2226,9 +2232,11 @@ func_status::value_type InsetTabular::getStatus(string const & what) const break; } } - if (action == LyXTabular::LAST_ACTION) - return func_status::Unknown; - + if (action == LyXTabular::LAST_ACTION) { + status.clear(); + return status.unknown(true); + } + string const argument = frontStrip(what.substr(tabularFeature[i].feature.length())); int sel_row_start; @@ -2248,8 +2256,7 @@ func_status::value_type InsetTabular::getStatus(string const & what) const case LyXTabular::SET_MPWIDTH: case LyXTabular::SET_SPECIAL_COLUMN: case LyXTabular::SET_SPECIAL_MULTI: - status |= func_status::Disabled; - return status; + return status.disabled(true); case LyXTabular::APPEND_ROW: case LyXTabular::APPEND_COLUMN: @@ -2257,176 +2264,107 @@ func_status::value_type InsetTabular::getStatus(string const & what) const case LyXTabular::DELETE_COLUMN: case LyXTabular::SET_ALL_LINES: case LyXTabular::UNSET_ALL_LINES: - status |= func_status::OK; - return status; + return status.clear(); case LyXTabular::MULTICOLUMN: - if (tabular->IsMultiColumn(actcell)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->IsMultiColumn(actcell)); break; case LyXTabular::M_TOGGLE_LINE_TOP: flag = false; case LyXTabular::TOGGLE_LINE_TOP: - if (tabular->TopLine(actcell, flag)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->TopLine(actcell, flag)); break; case LyXTabular::M_TOGGLE_LINE_BOTTOM: flag = false; case LyXTabular::TOGGLE_LINE_BOTTOM: - if (tabular->BottomLine(actcell, flag)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->BottomLine(actcell, flag)); break; case LyXTabular::M_TOGGLE_LINE_LEFT: flag = false; case LyXTabular::TOGGLE_LINE_LEFT: - if (tabular->LeftLine(actcell, flag)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->LeftLine(actcell, flag)); break; case LyXTabular::M_TOGGLE_LINE_RIGHT: flag = false; case LyXTabular::TOGGLE_LINE_RIGHT: - if (tabular->RightLine(actcell, flag)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->RightLine(actcell, flag)); break; case LyXTabular::M_ALIGN_LEFT: flag = false; case LyXTabular::ALIGN_LEFT: - if (tabular->GetAlignment(actcell, flag) == LYX_ALIGN_LEFT) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetAlignment(actcell, flag) == LYX_ALIGN_LEFT); break; case LyXTabular::M_ALIGN_RIGHT: flag = false; case LyXTabular::ALIGN_RIGHT: - if (tabular->GetAlignment(actcell, flag) == LYX_ALIGN_RIGHT) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetAlignment(actcell, flag) == LYX_ALIGN_RIGHT); break; case LyXTabular::M_ALIGN_CENTER: flag = false; case LyXTabular::ALIGN_CENTER: - if (tabular->GetAlignment(actcell, flag) == LYX_ALIGN_CENTER) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetAlignment(actcell, flag) == LYX_ALIGN_CENTER); break; case LyXTabular::M_VALIGN_TOP: flag = false; case LyXTabular::VALIGN_TOP: - if (tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_TOP); break; case LyXTabular::M_VALIGN_BOTTOM: flag = false; case LyXTabular::VALIGN_BOTTOM: - if (tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM); break; case LyXTabular::M_VALIGN_CENTER: flag = false; case LyXTabular::VALIGN_CENTER: - if (tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER); break; case LyXTabular::SET_LONGTABULAR: - if (tabular->IsLongTabular()) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->IsLongTabular()); break; case LyXTabular::UNSET_LONGTABULAR: - if (!tabular->IsLongTabular()) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(!tabular->IsLongTabular()); break; case LyXTabular::SET_ROTATE_TABULAR: - if (tabular->GetRotateTabular()) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetRotateTabular()); break; case LyXTabular::UNSET_ROTATE_TABULAR: - if (!tabular->GetRotateTabular()) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(!tabular->GetRotateTabular()); break; case LyXTabular::SET_ROTATE_CELL: - if (tabular->GetRotateCell(actcell)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetRotateCell(actcell)); break; case LyXTabular::UNSET_ROTATE_CELL: - if (!tabular->GetRotateCell(actcell)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(!tabular->GetRotateCell(actcell)); break; case LyXTabular::SET_USEBOX: - if (strToInt(argument) == tabular->GetUsebox(actcell)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(strToInt(argument) == tabular->GetUsebox(actcell)); break; case LyXTabular::SET_LTFIRSTHEAD: - if (tabular->GetRowOfLTHead(sel_row_start, dummyltt)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetRowOfLTHead(sel_row_start, dummyltt)); break; case LyXTabular::SET_LTHEAD: - if (tabular->GetRowOfLTHead(sel_row_start, dummyltt)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetRowOfLTHead(sel_row_start, dummyltt)); break; case LyXTabular::SET_LTFOOT: - if (tabular->GetRowOfLTFoot(sel_row_start, dummyltt)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetRowOfLTFoot(sel_row_start, dummyltt)); break; case LyXTabular::SET_LTLASTFOOT: - if (tabular->GetRowOfLTFoot(sel_row_start, dummyltt)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetRowOfLTFoot(sel_row_start, dummyltt)); break; case LyXTabular::SET_LTNEWPAGE: - if (tabular->GetLTNewPage(sel_row_start)) - status |= func_status::ToggleOn; - else - status |= func_status::ToggleOff; + status.setOnOff(tabular->GetLTNewPage(sel_row_start)); break; default: - status = func_status::Disabled; + status.clear(); + status.disabled(true); break; } return status; } -std::vector const InsetTabular::getLabelList() const +vector const InsetTabular::getLabelList() const { return tabular->getLabelList(); } @@ -2542,7 +2480,7 @@ bool InsetTabular::cutSelection() } -bool InsetTabular::isRightToLeft(BufferView *bv ) +bool InsetTabular::isRightToLeft(BufferView * bv) { return bv->getParentLanguage(this)->RightToLeft(); } @@ -2718,7 +2656,7 @@ void InsetTabular::toggleSelection(BufferView * bv, bool kill_selection) bool InsetTabular::searchForward(BufferView * bv, string const & str, - bool const & cs, bool const & mw) + bool cs, bool mw) { nodraw(true); if (the_locking_inset) { @@ -2746,7 +2684,7 @@ bool InsetTabular::searchForward(BufferView * bv, string const & str, bool InsetTabular::searchBackward(BufferView * bv, string const & str, - bool const & cs, bool const & mw) + bool cs, bool mw) { nodraw(true); if (the_locking_inset) { @@ -2783,30 +2721,11 @@ bool InsetTabular::insetAllowed(Inset::Code code) const 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);