]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_gridinset.C
Andreas' patch to prevent crash on click on previewd inset
[lyx.git] / src / mathed / math_gridinset.C
index bec0cf3b21fb2f36ac31650cdef467b9b3bedcaa..c9fcfcc5141aad10451d4638a5405db61aec1113 100644 (file)
 #include <config.h>
 
 #include "math_gridinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "funcrequest.h"
-#include "frontends/Painter.h"
+
+#include "BufferView.h"
+#include "CutAndPaste.h"
+#include "FuncStatus.h"
+#include "LColor.h"
+#include "cursor.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "undo.h"
 
+#include "frontends/Painter.h"
 
 #include "insets/mailinset.h"
 
-using std::swap;
+#include "support/lstrings.h"
+
+#include <sstream>
+
+using lyx::support::bformat;
+
+using std::endl;
 using std::max;
 using std::min;
-using std::vector;
-using std::istream;
+using std::swap;
+
+using std::string;
 using std::auto_ptr;
-using std::endl;
+using std::istream;
+using std::istringstream;
+using std::ostringstream;
+using std::vector;
 
 
 class GridInsetMailer : public MailInset {
@@ -47,7 +65,7 @@ public:
                data << name() << " active_cell " << 0 << '\n';
                WriteStream ws(data);
                inset_.write(ws);
-               return STRCONV(data.str());
+               return data.str();
        }
 
 protected:
@@ -111,7 +129,7 @@ int MathGridInset::RowInfo::skipPixels() const
 
 
 MathGridInset::ColInfo::ColInfo()
-       : align_('c'), leftline_(false), rightline_(false), lines_(0)
+       : align_('c'), lines_(0)
 {}
 
 
@@ -173,7 +191,7 @@ MathGridInset::~MathGridInset()
 }
 
 
-auto_ptr<InsetBase> MathGridInset::clone() const
+auto_ptr<InsetBase> MathGridInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathGridInset(*this));
 }
@@ -202,11 +220,12 @@ void MathGridInset::halign(string const & hh)
 {
        col_type col = 0;
        for (string::const_iterator it = hh.begin(); it != hh.end(); ++it) {
-               if (col >= ncols())
-                       break;
                char c = *it;
                if (c == '|') {
                        colinfo_[col].lines_++;
+               } else if (col >= ncols()) {
+                       // Only '|' is allowed in the last dummy column
+                       break;
                } else if (c == 'c' || c == 'l' || c == 'r') {
                        colinfo_[col].align_ = c;
                        ++col;
@@ -447,6 +466,7 @@ void MathGridInset::metrics(MetricsInfo & mi) const
                cxrow->setBaseline(cxrow->getBaseline() - ascent);
        }
 */
+       metricsMarkers2(dim_);
 }
 
 
@@ -458,23 +478,35 @@ void MathGridInset::metrics(MetricsInfo & mi, Dimension & dim) const
 
 
 void MathGridInset::draw(PainterInfo & pi, int x, int y) const
+{
+       drawWithMargin(pi, x, y, 0, 0);
+}
+
+void MathGridInset::drawWithMargin(PainterInfo & pi, int x, int y,
+       int lmargin, int rmargin) const
 {
        for (idx_type idx = 0; idx < nargs(); ++idx)
-               cell(idx).draw(pi, x + cellXOffset(idx), y + cellYOffset(idx));
+               cell(idx).draw(pi, x + lmargin + cellXOffset(idx),
+                       y + cellYOffset(idx));
 
        for (row_type row = 0; row <= nrows(); ++row)
-               for (int i = 0; i < rowinfo_[row].lines_; ++i) {
+               for (unsigned int i = 0; i < rowinfo_[row].lines_; ++i) {
                        int yy = y + rowinfo_[row].offset_ - rowinfo_[row].ascent_
                                - i * hlinesep() - hlinesep()/2 - rowsep()/2;
-                       pi.pain.line(x + 1, yy, x + dim_.width() - 1, yy);
+                       pi.pain.line(x + lmargin + 1, yy,
+                                    x + dim_.width() - rmargin - 1, yy,
+                                    LColor::foreground);
                }
 
        for (col_type col = 0; col <= ncols(); ++col)
-               for (int i = 0; i < colinfo_[col].lines_; ++i) {
-                       int xx = x + colinfo_[col].offset_
+               for (unsigned int i = 0; i < colinfo_[col].lines_; ++i) {
+                       int xx = x + lmargin + colinfo_[col].offset_
                                - i * vlinesep() - vlinesep()/2 - colsep()/2;
-                       pi.pain.line(xx, y - dim_.ascent() + 1, xx, y + dim_.descent() - 1);
+                       pi.pain.line(xx, y - dim_.ascent() + 1,
+                                    xx, y + dim_.descent() - 1,
+                                    LColor::foreground);
                }
+       drawMarkers2(pi, x, y);
 }
 
 
@@ -741,121 +773,78 @@ int MathGridInset::cellYOffset(idx_type idx) const
 }
 
 
-bool MathGridInset::idxUpDown(idx_type & idx, pos_type & pos, bool up,
-       int targetx) const
+bool MathGridInset::idxUpDown(LCursor & cur, bool up) const
 {
        if (up) {
-               if (idx < ncols())
+               if (cur.row() == 0)
                        return false;
-               idx -= ncols();
-               pos = cell(idx).x2pos(targetx - cell(idx).xo());
-               return true;
+               cur.idx() -= ncols();
        } else {
-               if (idx >= ncols() * (nrows() - 1))
+               if (cur.row() + 1 >= nrows())
                        return false;
-               idx += ncols();
-               pos = cell(idx).x2pos(targetx - cell(idx).xo());
-               return true;
+               cur.idx() += ncols();
        }
+       cur.pos() = cur.cell().x2pos(cur.x_target() - cur.cell().xo());
+       return true;
 }
 
 
-bool MathGridInset::idxLeft(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxLeft(LCursor & cur) const
 {
        // leave matrix if on the left hand edge
-       if (col(idx) == 0)
+       if (cur.col() == 0)
                return false;
-       --idx;
-       pos = cell(idx).size();
+       --cur.idx();
+       cur.pos() = cur.lastpos();
        return true;
 }
 
 
-bool MathGridInset::idxRight(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxRight(LCursor & cur) const
 {
        // leave matrix if on the right hand edge
-       if (col(idx) + 1 == ncols())
+       if (cur.col() + 1 == ncols())
                return false;
-       ++idx;
-       pos = 0;
+       ++cur.idx();
+       cur.pos() = 0;
        return true;
 }
 
 
-bool MathGridInset::idxFirst(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxFirst(LCursor & cur) const
 {
        switch (v_align_) {
                case 't':
-                       idx = 0;
+                       cur.idx() = 0;
                        break;
                case 'b':
-                       idx = (nrows() - 1) * ncols();
+                       cur.idx() = (nrows() - 1) * ncols();
                        break;
                default:
-                       idx = ((nrows() - 1) / 2) * ncols();
+                       cur.idx() = ((nrows() - 1) / 2) * ncols();
        }
-       pos = 0;
+       cur.pos() = 0;
        return true;
 }
 
 
-bool MathGridInset::idxLast(idx_type & idx, pos_type & pos) const
+bool MathGridInset::idxLast(LCursor & cur) const
 {
        switch (v_align_) {
                case 't':
-                       idx = ncols() - 1;
+                       cur.idx() = ncols() - 1;
                        break;
                case 'b':
-                       idx = nargs() - 1;
+                       cur.idx() = nargs() - 1;
                        break;
                default:
-                       idx = ((nrows() - 1) / 2 + 1) * ncols() - 1;
+                       cur.idx() = ((nrows() - 1) / 2 + 1) * ncols() - 1;
        }
-       pos = cell(idx).size();
+       cur.pos() = cur.lastpos();
        return true;
 }
 
 
-bool MathGridInset::idxHome(idx_type & idx, pos_type & pos) const
-{
-       if (pos > 0) {
-               pos = 0;
-               return true;
-       }
-       if (col(idx) > 0) {
-               idx -= idx % ncols();
-               pos = 0;
-               return true;
-       }
-       if (idx > 0) {
-               idx = 0;
-               pos = 0;
-               return true;
-       }
-       return false;
-}
-
-
-bool MathGridInset::idxEnd(idx_type & idx, pos_type & pos) const
-{
-       if (pos < cell(idx).size()) {
-               pos = cell(idx).size();
-               return true;
-       }
-       if (col(idx) < ncols() - 1) {
-               idx = idx - idx % ncols() + ncols() - 1;
-               pos = cell(idx).size();
-               return true;
-       }
-       if (idx < nargs() - 1) {
-               idx = nargs() - 1;
-               pos = cell(idx).size();
-               return true;
-       }
-       return false;
-}
-
-
 bool MathGridInset::idxDelete(idx_type & idx)
 {
        // nothing to do if we have just one row
@@ -873,7 +862,7 @@ bool MathGridInset::idxDelete(idx_type & idx)
 
        // move cells if necessary
        for (idx_type i = index(row(idx), 0); i < idx; ++i)
-               std::swap(cell(i), cell(i + ncols()));
+               swap(cell(i), cell(i + ncols()));
 
        delRow(row(idx));
 
@@ -1019,165 +1008,369 @@ int MathGridInset::border() const
 }
 
 
-void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
+void MathGridInset::splitCell(LCursor & cur)
 {
-       if (idx + 1 == nargs())
+       if (cur.idx() == cur.lastidx())
                return;
-       MathArray ar = cell(idx);
-       ar.erase(0, pos);
-       cell(idx).erase(pos, cell(idx).size());
-       ++idx;
-       pos = 0;
-       cell(idx).insert(0, ar);
+       MathArray ar = cur.cell();
+       ar.erase(0, cur.pos());
+       cur.cell().erase(cur.pos(), cur.lastpos());
+       ++cur.idx();
+       cur.pos() = 0;
+       cur.cell().insert(0, ar);
 }
 
 
-dispatch_result MathGridInset::dispatch
-       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+void MathGridInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
+       //lyxerr << "*** MathGridInset: request: " << cmd << endl;
        switch (cmd.action) {
 
-               case LFUN_MOUSE_RELEASE:
-                       //if (cmd.button() == mouse_button::button3) {
-                       //      GridInsetMailer(*this).showDialog();
-                       //      return DISPATCHED;
-                       //}
-                       return UNDISPATCHED;
-
-               case LFUN_INSET_DIALOG_UPDATE:
-                       GridInsetMailer(*this).updateDialog(cmd.view());
-                       return UNDISPATCHED;
-
-               // insert file functions
-               case LFUN_DELETE_LINE_FORWARD:
-                       //autocorrect_ = false;
-                       //macroModeClose();
-                       //if (selection_) {
-                       //      selDel();
-                       //      return;
-                       //}
-                       if (nrows() > 1)
-                               delRow(row(idx));
-                       if (idx >= nargs())
-                               idx = nargs() - 1;
-                       if (pos > cell(idx).size())
-                               pos = cell(idx).size();
-                       return DISPATCHED_POP;
-
-               case LFUN_CELL_SPLIT:
-                       //recordUndo(bv, Undo::ATOMIC);
-                       splitCell(idx, pos);
-                       return DISPATCHED_POP;
-
-               case LFUN_BREAKLINE: {
-                       //recordUndo(bv, Undo::INSERT);
-                       row_type const r = row(idx);
-                       addRow(r);
-
-                       // split line
-                       for (col_type c = col(idx) + 1; c < ncols(); ++c)
-                               std::swap(cell(index(r, c)), cell(index(r + 1, c)));
-
-                       // split cell
-                       splitCell(idx, pos);
-                       std::swap(cell(idx), cell(idx + ncols() - 1));
-                       if (idx > 0)
-                               --idx;
-                       pos = cell(idx).size();
-
-                       //mathcursor->normalize();
-                       return DISPATCHED_POP;
+       case LFUN_MOUSE_RELEASE:
+               //if (cmd.button() == mouse_button::button3) {
+               //      GridInsetMailer(*this).showDialog();
+               //      return DispatchResult(true, true);
+               //}
+               MathNestInset::doDispatch(cur, cmd);
+               break;
+
+       case LFUN_INSET_DIALOG_UPDATE:
+               GridInsetMailer(*this).updateDialog(&cur.bv());
+               break;
+
+       // insert file functions
+       case LFUN_DELETE_LINE_FORWARD:
+               // FIXME: We use recordUndoInset when a change reflects more
+               // than one cell, because recordUndo does not work for
+               // multiple cells. Unfortunately this puts the cursor in front
+               // of the inset after undo. This is (especilally for large
+               // grids) annoying.
+               recordUndoInset(cur);
+               //autocorrect_ = false;
+               //macroModeClose();
+               //if (selection_) {
+               //      selDel();
+               //      break;
+               //}
+               if (nrows() > 1)
+                       delRow(cur.row());
+               if (cur.idx() > cur.lastidx())
+                       cur.idx() = cur.lastidx();
+               if (cur.pos() > cur.lastpos())
+                       cur.pos() = cur.lastpos();
+               break;
+
+       case LFUN_CELL_SPLIT:
+               recordUndo(cur);
+               splitCell(cur);
+               break;
+
+       case LFUN_CELL_BACKWARD:
+               // See below.
+               cur.selection() = false;
+               if (!idxPrev(cur)) {
+                       cmd = FuncRequest(LFUN_FINISHED_LEFT);
+                       cur.undispatched();
+               }
+               break;
+       
+       case LFUN_CELL_FORWARD:
+               // Can't handle selection by additional 'shift' as this is
+               // hard bound to LFUN_CELL_BACKWARD
+               cur.selection() = false;
+               if (!idxNext(cur)) {
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+                       cur.undispatched();
                }
+               break;
+
+       case LFUN_BREAKLINE: {
+               recordUndoInset(cur);
+               row_type const r = cur.row();
+               addRow(r);
+
+               // split line
+               for (col_type c = col(cur.idx()) + 1; c < ncols(); ++c)
+                       swap(cell(index(r, c)), cell(index(r + 1, c)));
+
+               // split cell
+               splitCell(cur);
+               swap(cell(cur.idx()), cell(cur.idx() + ncols() - 1));
+               if (cur.idx() > 0)
+                       --cur.idx();
+               cur.pos() = cur.lastpos();
+
+               //mathcursor->normalize();
+               //cmd = FuncRequest(LFUN_FINISHED_LEFT);
+               break;
+       }
 
-               case LFUN_TABULAR_FEATURE: {
-                       //lyxerr << "handling tabular-feature " << cmd.argument << endl;
-                       istringstream is(STRCONV(cmd.argument));
-                       string s;
-                       is >> s;
-                       if (s == "valign-top")
-                               valign('t');
-                       else if (s == "valign-middle")
-                               valign('c');
-                       else if (s == "valign-bottom")
-                               valign('b');
-                       else if (s == "align-left")
-                               halign('l', col(idx));
-                       else if (s == "align-right")
-                               halign('r', col(idx));
-                       else if (s == "align-center")
-                               halign('c', col(idx));
-                       else if (s == "append-row")
-                               for (int i = 0, n = extractInt(is); i < n; ++i)
-                                       addRow(row(idx));
-                       else if (s == "delete-row")
-                               for (int i = 0, n = extractInt(is); i < n; ++i) {
-                                       delRow(row(idx));
-                                       if (idx > nargs())
-                                               idx -= ncols();
-                               }
-                       else if (s == "copy-row")
-                               for (int i = 0, n = extractInt(is); i < n; ++i)
-                                       copyRow(row(idx));
-                       else if (s == "swap-row")
-                               swapRow(row(idx));
-                       else if (s == "append-column")
-                               for (int i = 0, n = extractInt(is); i < n; ++i) {
-                                       row_type r = row(idx);
-                                       col_type c = col(idx);
-                                       addCol(c);
-                                       idx = index(r, c);
-                               }
-                       else if (s == "delete-column")
-                               for (int i = 0, n = extractInt(is); i < n; ++i) {
-                                       row_type r = row(idx);
-                                       col_type c = col(idx);
-                                       delCol(col(idx));
-                                       idx = index(r, c);
-                                       if (idx > nargs())
-                                               idx -= ncols();
-                               }
-                       else if (s == "copy-column")
-                               copyCol(col(idx));
-                       else if (s == "swap-column")
-                               swapCol(col(idx));
-                       else
-                               return UNDISPATCHED;
-                       lyxerr << "returning DISPATCHED_POP" << endl;
-                       return DISPATCHED_POP;
+       case LFUN_TABULAR_FEATURE: {
+               recordUndoInset(cur);
+               //lyxerr << "handling tabular-feature " << cmd.argument << endl;
+               istringstream is(cmd.argument);
+               string s;
+               is >> s;
+               if (s == "valign-top")
+                       valign('t');
+               else if (s == "valign-middle")
+                       valign('c');
+               else if (s == "valign-bottom")
+                       valign('b');
+               else if (s == "align-left")
+                       halign('l', cur.col());
+               else if (s == "align-right")
+                       halign('r', cur.col());
+               else if (s == "align-center")
+                       halign('c', cur.col());
+               else if (s == "append-row")
+                       for (int i = 0, n = extractInt(is); i < n; ++i)
+                               addRow(cur.row());
+               else if (s == "delete-row")
+                       for (int i = 0, n = extractInt(is); i < n; ++i) {
+                               delRow(cur.row());
+                               if (cur.idx() > nargs())
+                                       cur.idx() -= ncols();
+                       }
+               else if (s == "copy-row") {
+                       // Here (as later) we save the cursor col/row 
+                       // in order to restore it after operation. 
+                       row_type const r = cur.row();
+                       col_type const c = cur.col();
+                       for (int i = 0, n = extractInt(is); i < n; ++i)
+                               copyRow(cur.row());
+                       cur.idx() = index(r, c);
+               }
+               else if (s == "swap-row") {
+                       swapRow(cur.row());
+                       // Trick to suppress same-idx-means-different-cell 
+                       // assertion crash:
+                       cur.pos() = 0; 
+               }
+               else if (s == "add-hline-above")
+                       rowinfo_[cur.row()].lines_++;
+               else if (s == "add-hline-below")
+                       rowinfo_[cur.row()+1].lines_++;
+               else if (s == "delete-hline-above")
+                       rowinfo_[cur.row()].lines_--;
+               else if (s == "delete-hline-below")
+                       rowinfo_[cur.row()+1].lines_--;
+               else if (s == "append-column") {
+                       row_type const r = cur.row();
+                       col_type const c = cur.col();
+                       for (int i = 0, n = extractInt(is); i < n; ++i)
+                               addCol(cur.col());
+                       cur.idx() = index(r, c);
+               }
+               else if (s == "delete-column") {
+                       row_type const r = cur.row();
+                       col_type const c = cur.col();
+                       for (int i = 0, n = extractInt(is); i < n; ++i)
+                               delCol(col(cur.idx()));
+                       cur.idx() = index(r, min(c, cur.ncols() - 1));
+               }
+               else if (s == "copy-column") {
+                       row_type const r = cur.row();
+                       col_type const c = cur.col();
+                       copyCol(cur.col());
+                       cur.idx() = index(r, c);
+               }
+               else if (s == "swap-column") {
+                       swapCol(cur.col());
+                       cur.pos() = 0; // trick, see above
+               }
+               else if (s == "add-vline-left")
+                       colinfo_[cur.col()].lines_++;
+               else if (s == "add-vline-right")
+                       colinfo_[cur.col()+1].lines_++;
+               else if (s == "delete-vline-left")
+                       colinfo_[cur.col()].lines_--;
+               else if (s == "delete-vline-right")
+                       colinfo_[cur.col()+1].lines_--;
+               else {
+                       cur.undispatched();
+                       break;
                }
+               lyxerr << "returning FINISHED_LEFT" << endl;
+               break;
+       }
 
-               case LFUN_PASTE: {
-                       //lyxerr << "pasting '" << cmd.argument << "'" << endl;
-                       MathGridInset grid(1, 1);
-                       mathed_parse_normal(grid, cmd.argument);
-                       if (grid.nargs() == 1) {
-                               // single cell/part of cell
-                               cell(idx).insert(pos, grid.cell(0));
-                               pos += grid.cell(0).size();
-                       } else {
-                               // multiple cells
-                               col_type const numcols = min(grid.ncols(), ncols() - col(idx));
-                               row_type const numrows = min(grid.nrows(), nrows() - row(idx));
-                               for (row_type r = 0; r < numrows; ++r) {
-                                       for (col_type c = 0; c < numcols; ++c) {
-                                               idx_type i = index(r + row(idx), c + col(idx));
-                                               cell(i).append(grid.cell(grid.index(r, c)));
-                                       }
-                                       // append the left over horizontal cells to the last column
-                                       idx_type i = index(r + row(idx), ncols() - 1);
-                                       for (MathInset::col_type c = numcols; c < grid.ncols(); ++c)
-                                               cell(i).append(grid.cell(grid.index(r, c)));
+       case LFUN_PASTE: {
+               lyxerr << "MathGridInset: PASTE: " << cmd << std::endl;
+               istringstream is(cmd.argument);
+               int n = 0;
+               is >> n;
+               MathGridInset grid(1, 1);
+               mathed_parse_normal(grid, lyx::cap::getSelection(cur.buffer(), n));
+               if (grid.nargs() == 1) {
+                       // single cell/part of cell
+                       recordUndo(cur);
+                       cur.cell().insert(cur.pos(), grid.cell(0));
+                       cur.pos() += grid.cell(0).size();
+               } else {
+                       // multiple cells
+                       recordUndoInset(cur);
+                       col_type const numcols =
+                               min(grid.ncols(), ncols() - col(cur.idx()));
+                       row_type const numrows =
+                               min(grid.nrows(), nrows() - cur.row());
+                       for (row_type r = 0; r < numrows; ++r) {
+                               for (col_type c = 0; c < numcols; ++c) {
+                                       idx_type i = index(r + cur.row(), c + col(cur.idx()));
+                                       cell(i).insert(0, grid.cell(grid.index(r, c)));
                                }
-                               // append the left over vertical cells to the last _cell_
-                               idx_type i = nargs() - 1;
-                               for (row_type r = numrows; r < grid.nrows(); ++r)
-                                       for (col_type c = 0; c < grid.ncols(); ++c)
-                                               cell(i).append(grid.cell(grid.index(r, c)));
+                               // append the left over horizontal cells to the last column
+                               idx_type i = index(r + cur.row(), ncols() - 1);
+                               for (MathInset::col_type c = numcols; c < grid.ncols(); ++c)
+                                       cell(i).append(grid.cell(grid.index(r, c)));
                        }
-                       return DISPATCHED_POP;
+                       // append the left over vertical cells to the last _cell_
+                       idx_type i = nargs() - 1;
+                       for (row_type r = numrows; r < grid.nrows(); ++r)
+                               for (col_type c = 0; c < grid.ncols(); ++c)
+                                       cell(i).append(grid.cell(grid.index(r, c)));
                }
+               break;
+       }
 
-               default:
-                       return MathNestInset::dispatch(cmd, idx, pos);
+       case LFUN_HOMESEL:
+       case LFUN_HOME:
+       case LFUN_WORDLEFTSEL:
+       case LFUN_WORDLEFT:
+               cur.selHandle(cmd.action == LFUN_WORDLEFTSEL || cmd.action == LFUN_HOMESEL);
+               cur.macroModeClose();
+               if (cur.pos() != 0) {
+                       cur.pos() = 0;
+               } else if (cur.idx() % cur.ncols() != 0) {
+                       cur.idx() -= cur.idx() % cur.ncols();
+                       cur.pos() = 0;
+               } else if (cur.idx() != 0) {
+                       cur.idx() = 0;
+                       cur.pos() = 0;
+               } else {
+                       cmd = FuncRequest(LFUN_FINISHED_LEFT);
+                       cur.undispatched();
+               }
+               break;
+
+       case LFUN_WORDRIGHTSEL:
+       case LFUN_WORDRIGHT:
+       case LFUN_ENDSEL:
+       case LFUN_END:
+               cur.selHandle(cmd.action == LFUN_WORDRIGHTSEL || cmd.action == LFUN_ENDSEL);
+               cur.macroModeClose();
+               cur.clearTargetX();
+               if (cur.pos() != cur.lastpos()) {
+                       cur.pos() = cur.lastpos();
+               } else if ((cur.idx() + 1) % cur.ncols() != 0) {
+                       cur.idx() += cur.ncols() - 1 - cur.idx() % cur.ncols();
+                       cur.pos() = cur.lastpos();
+               } else if (cur.idx() != cur.lastidx()) {
+                       cur.idx() = cur.lastidx();
+                       cur.pos() = cur.lastpos();
+               } else {
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+                       cur.undispatched();
+               }
+               break;
+
+       default:
+               MathNestInset::doDispatch(cur, cmd);
+       }
+}
+
+
+bool MathGridInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & status) const
+{
+       switch (cmd.action) {
+       case LFUN_TABULAR_FEATURE: {
+               string const s = cmd.argument;
+               if (nrows() <= 1 && (s == "delete-row" || s == "swap-row")) {
+                       status.enabled(false);
+                       status.message(N_("Only one row"));
+                       return true;
+               }
+               if (ncols() <= 1 &&
+                   (s == "delete-column" || s == "swap-column")) {
+                       status.enabled(false);
+                       status.message(N_("Only one column"));
+                       return true;
+               }
+               if ((rowinfo_[cur.row()].lines_ == 0 &&
+                    s == "delete-hline-above") ||
+                   (rowinfo_[cur.row() + 1].lines_ == 0 &&
+                    s == "delete-hline-below")) {
+                       status.enabled(false);
+                       status.message(N_("No hline to delete"));
+                       return true;
+               }
+
+               if ((colinfo_[cur.col()].lines_ == 0 &&
+                    s == "delete-vline-left") ||
+                   (colinfo_[cur.col() + 1].lines_ == 0 &&
+                    s == "delete-vline-right")) {
+                       status.enabled(false);
+                       status.message(N_("No vline to delete"));
+                       return true;
+               }
+               if (s == "valign-top" || s == "valign-middle" ||
+                   s == "valign-bottom" || s == "align-left" ||
+                   s == "align-right" || s == "align-center" ||
+                   s == "append-row" || s == "delete-row" ||
+                   s == "copy-row" || s == "swap-row" ||
+                   s == "add-hline-above" || s == "add-hline-below" ||
+                   s == "delete-hline-above" || s == "delete-hline-below" ||
+                   s == "append-column" || s == "delete-column" ||
+                   s == "copy-column" || s == "swap-column" ||
+                   s == "add-vline-left" || s == "add-vline-right" ||
+                   s == "delete-vline-left" || s == "delete-vline-right")
+                       status.enabled(true);
+               else {
+                       status.enabled(false);
+                       status.message(bformat(
+                               N_("Unknown tabular feature '%1$s'"), s));
+               }
+
+               status.setOnOff(s == "align-left"    && halign(cur.col()) == 'l'
+                          || s == "align-right"   && halign(cur.col()) == 'r'
+                          || s == "align-center"  && halign(cur.col()) == 'c'
+                          || s == "valign-top"    && valign() == 't'
+                          || s == "valign-bottom" && valign() == 'b'
+                          || s == "valign-middle" && valign() == 'm');
+
+#if 0
+               // FIXME: What did this code do?
+               // Please check whether it is still needed!
+               // should be more precise
+               if (v_align_ == '\0') {
+                       status.enable(true);
+                       break;
+               }
+               if (cmd.argument.empty()) {
+                       status.enable(false);
+                       break;
+               }
+               if (!lyx::support::contains("tcb", cmd.argument[0])) {
+                       status.enable(false);
+                       break;
+               }
+               status.setOnOff(cmd.argument[0] == v_align_);
+               status.enabled(true);
+#endif
+               return true;
+       }
+
+       case LFUN_CELL_SPLIT:
+               status.enabled(true);
+               return true;
+
+       case LFUN_CELL_BACKWARD:
+       case LFUN_CELL_FORWARD:
+               status.enabled(true);
+               return true;
+
+       default:
+               return MathNestInset::getStatus(cur, cmd, status);
        }
 }