Don't remove cell selections after fontchange.

[lyx.git] / src / insets / insettabular.C

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 32b45f29f181b55cd89beda3b5de40721170141f..d21030ee98d11ebc7413c5f57dcac73490420171 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -48,6 +48,8 @@
 #include <map>
 //#include <signal.h>
 
+
+using std::vector;
 using std::ostream;
 using std::ifstream;
 using std::max;
@@ -372,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; 
@@ -407,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);
@@ -607,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<InsetTabular *>(this), mark_dirty);
@@ -645,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);
                        }
                }
@@ -1069,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);
@@ -1107,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;
@@ -1131,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;
@@ -1222,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 << "<![CDATA[";
+       int const ret = tabular->ascii(buf,os,
+                                      (int)parOwner()->params().depth(),
+                                      false, 0);
+       os << "]]>";
+       return ret;
 }
 
 
@@ -2105,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;
        }
        
@@ -2361,7 +2364,7 @@ FuncStatus InsetTabular::getStatus(string const & what) const
 }
 
 
-std::vector<string> const InsetTabular::getLabelList() const
+vector<string> const InsetTabular::getLabelList() const
 {
        return tabular->getLabelList();
 }
@@ -2477,7 +2480,7 @@ bool InsetTabular::cutSelection()
 }
 
 
-bool InsetTabular::isRightToLeft(BufferView *bv )
+bool InsetTabular::isRightToLeft(BufferView * bv)
 {
        return bv->getParentLanguage(this)->RightToLeft();
 }
@@ -2653,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) {
@@ -2681,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) {
@@ -2718,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);