The speed patch: redraw only rows that have changed

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

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 30a26e8a836570da28c95cb395e410dca1d0c7d5..4d7b3085fe6b5ad303d303f2b39538607a103222 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -245,10 +245,16 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
                int maxDesc = 0;
                for (col_type j = 0; j < tabular.columns(); ++j) {
                        if (tabular.isPartOfMultiColumn(i, j))
+                               // Multicolumn cell, but not first one
                                continue;
                        Dimension dim;
                        MetricsInfo m = mi;
-                       LyXLength p_width = tabular.column_info[j].p_width;
+                       LyXLength p_width;
+                       if (tabular.cell_info[i][j].multicolumn == 
+                           LyXTabular::CELL_BEGIN_OF_MULTICOLUMN)
+                               p_width = tabular.cellinfo_of_cell(cell).p_width;
+                       else
+                               p_width = tabular.column_info[j].p_width;
                        if (!p_width.zero())
                                m.base.textwidth = p_width.inPixels(mi.base.textwidth);
                        tabular.getCellInset(cell)->metrics(m, dim);
@@ -442,8 +448,8 @@ void InsetTabular::edit(LCursor & cur, bool left)
 
 void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       lyxerr << "# InsetTabular::doDispatch: cmd: " << cmd << endl;
-       lyxerr << "  cur:\n" << cur << endl;
+       lyxerr[Debug::DEBUG] << "# InsetTabular::doDispatch: cmd: " << cmd 
+                            << "\n  cur:" << cur << endl;
        CursorSlice sl = cur.top();
        LCursor & bvcur = cur.bv().cursor();
 
@@ -505,24 +511,24 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_RIGHTSEL:
        case LFUN_RIGHT:
                cell(cur.idx())->dispatch(cur, cmd);
-               cur.dispatched(); // override the cell's decision
-               if (sl == cur.top())
+               if (!cur.result().dispatched()) {
                        isRightToLeft(cur) ? movePrevCell(cur) : moveNextCell(cur);
-               if (sl == cur.top()) {
-                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
-                       cur.undispatched();
+                       if (sl == cur.top()) 
+                               cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+                       else
+                               cur.dispatched();
                }
                break;
 
        case LFUN_LEFTSEL:
        case LFUN_LEFT:
                cell(cur.idx())->dispatch(cur, cmd);
-               cur.dispatched(); // override the cell's decision
-               if (sl == cur.top())
+               if (!cur.result().dispatched()) {
                        isRightToLeft(cur) ? moveNextCell(cur) : movePrevCell(cur);
-               if (sl == cur.top()) {
-                       cmd = FuncRequest(LFUN_FINISHED_LEFT);
-                       cur.undispatched();
+                       if (sl == cur.top()) 
+                               cmd = FuncRequest(LFUN_FINISHED_LEFT);
+                       else
+                               cur.dispatched();
                }
                break;
 
@@ -631,7 +637,7 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_CUT:
                if (tablemode(cur)) {
                        if (copySelection(cur)) {
-                               recordUndo(cur, Undo::DELETE);
+                               recordUndoInset(cur, Undo::DELETE);
                                cutSelection(cur);
                        }
                }
@@ -641,9 +647,10 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_BACKSPACE:
        case LFUN_DELETE:
-               recordUndo(cur, Undo::DELETE);
-               if (tablemode(cur))
+               if (tablemode(cur)) {
+                       recordUndoInset(cur, Undo::DELETE);
                        cutSelection(cur);
+               }
                else
                        cell(cur.idx())->dispatch(cur, cmd);
                break;
@@ -730,7 +737,7 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_PASTE:
                if (hasPasteBuffer() && tabularStackDirty()) {
-                       recordUndo(cur, Undo::INSERT);
+                       recordUndoInset(cur, Undo::INSERT);
                        pasteSelection(cur);
                        break;
                }
@@ -1403,7 +1410,7 @@ void InsetTabular::tabularFeatures(LCursor & cur,
                break;
        }
 
-       recordUndo(cur, Undo::ATOMIC);
+       recordUndoInset(cur, Undo::ATOMIC);
 
        getSelection(cur, sel_row_start, sel_row_end, sel_col_start, sel_col_end);
        row_type const row = tabular.row_of_cell(cur.idx());
@@ -1415,18 +1422,15 @@ void InsetTabular::tabularFeatures(LCursor & cur,
 
        case LyXTabular::SET_PWIDTH: {
                LyXLength const len(value);
-               tabular.setColumnPWidth(cur.idx(), len);
+               tabular.setColumnPWidth(cur, cur.idx(), len);
                if (len.zero()
                    && tabular.getAlignment(cur.idx(), true) == LYX_ALIGN_BLOCK)
                        tabularFeatures(cur, LyXTabular::ALIGN_CENTER, string());
-               else if (!len.zero()
-                        && tabular.getAlignment(cur.idx(), true) != LYX_ALIGN_BLOCK)
-                       tabularFeatures(cur, LyXTabular::ALIGN_BLOCK, string());
                break;
        }
 
        case LyXTabular::SET_MPWIDTH:
-               tabular.setMColumnPWidth(cur.idx(), LyXLength(value));
+               tabular.setMColumnPWidth(cur, cur.idx(), LyXLength(value));
                break;
 
        case LyXTabular::SET_SPECIAL_COLUMN:
@@ -1841,27 +1845,9 @@ void InsetTabular::markErased(bool erased)
 }
 
 
-bool InsetTabular::forceDefaultParagraphs(InsetBase const *) const
+bool InsetTabular::forceDefaultParagraphs(idx_type cell) const
 {
-#if 0
-       idx_type const cell = tabular.getCellFromInset(in);
-       // FIXME: getCellFromInset() returns now always a valid cell, so
-       // the stuff below can be deleted, and instead we have:
        return tabular.getPWidth(cell).zero();
-
-       if (cell != npos)
-               return tabular.getPWidth(cell).zero();
-
-       // this is a workaround for a crash (New, Insert->Tabular,
-       // Insert->FootNote)
-       if (!owner())
-               return false;
-
-       // well we didn't obviously find it so maybe our owner knows more
-       BOOST_ASSERT(owner());
-       return owner()->forceDefaultParagraphs(in);
-#endif
-       return false;
 }