]> git.lyx.org Git - features.git/blobdiff - src/mathed/math_gridinset.C
change "support/std_sstream.h" to <sstream>
[features.git] / src / mathed / math_gridinset.C
index 1de21ee856fcc095ddf20019ca29a0c539f6ffa4..07325ab759e092b8b6ec9002c1f97a227476ef7c 100644 (file)
 #include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+
 #include "BufferView.h"
+#include "CutAndPaste.h"
+#include "FuncStatus.h"
+#include "LColor.h"
 #include "cursor.h"
-#include "dispatchresult.h"
 #include "debug.h"
 #include "funcrequest.h"
-#include "LColor.h"
+#include "undo.h"
 
 #include "frontends/Painter.h"
 
-#include "support/std_sstream.h"
-
 #include "insets/mailinset.h"
 
+#include <sstream>
+
 using std::endl;
 using std::max;
 using std::min;
@@ -457,6 +460,7 @@ void MathGridInset::metrics(MetricsInfo & mi) const
                cxrow->setBaseline(cxrow->getBaseline() - ascent);
        }
 */
+       metricsMarkers2(dim_);
 }
 
 
@@ -489,6 +493,7 @@ void MathGridInset::draw(PainterInfo & pi, int x, int y) const
                                     xx, y + dim_.descent() - 1,
                                     LColor::foreground);
                }
+       drawMarkers2(pi, x, y);
 }
 
 
@@ -827,46 +832,6 @@ bool MathGridInset::idxLast(LCursor & cur) const
 }
 
 
-bool MathGridInset::idxHome(LCursor & cur) const
-{
-       if (cur.pos() > 0) {
-               cur.pos() = 0;
-               return true;
-       }
-       if (cur.col() > 0) {
-               cur.idx() -= cur.idx() % ncols();
-               cur.pos() = 0;
-               return true;
-       }
-       if (cur.idx() > 0) {
-               cur.idx() = 0;
-               cur.pos() = 0;
-               return true;
-       }
-       return false;
-}
-
-
-bool MathGridInset::idxEnd(LCursor & cur) const
-{
-       if (cur.pos() < cur.lastpos()) {
-               cur.pos() = cur.lastpos();
-               return true;
-       }
-       if (cur.col() < ncols() - 1) {
-               cur.idx() = cur.idx() - cur.idx() % ncols() + ncols() - 1;
-               cur.pos() = cur.lastpos();
-               return true;
-       }
-       if (cur.idx() < nargs() - 1) {
-               cur.idx() = nargs() - 1;
-               cur.pos() = cur.lastpos();
-               return true;
-       }
-       return false;
-}
-
-
 bool MathGridInset::idxDelete(idx_type & idx)
 {
        // nothing to do if we have just one row
@@ -1032,7 +997,7 @@ int MathGridInset::border() const
 
 void MathGridInset::splitCell(LCursor & cur)
 {
-       if (cur.idx() + 1 == nargs())
+       if (cur.idx() == cur.lastidx())
                return;
        MathArray ar = cur.cell();
        ar.erase(0, cur.pos());
@@ -1043,155 +1008,235 @@ void MathGridInset::splitCell(LCursor & cur)
 }
 
 
-DispatchResult
-MathGridInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
-       lyxerr << "*** MathGridInset: request: " << cmd << endl;
+       //lyxerr << "*** MathGridInset: request: " << cmd << endl;
        switch (cmd.action) {
 
-               case LFUN_MOUSE_RELEASE:
-                       //if (cmd.button() == mouse_button::button3) {
-                       //      GridInsetMailer(*this).showDialog();
-                       //      return DispatchResult(true, true);
-                       //}
-                       return DispatchResult(false);
-
-               case LFUN_INSET_DIALOG_UPDATE:
-                       GridInsetMailer(*this).updateDialog(&cur.bv());
-                       return DispatchResult(false);
-
-               // insert file functions
-               case LFUN_DELETE_LINE_FORWARD:
-                       //autocorrect_ = false;
-                       //macroModeClose();
-                       //if (selection_) {
-                       //      selDel();
-                       //      return;
-                       //}
-                       if (nrows() > 1)
+       case LFUN_MOUSE_RELEASE:
+               //if (cmd.button() == mouse_button::button3) {
+               //      GridInsetMailer(*this).showDialog();
+               //      return DispatchResult(true, true);
+               //}
+               MathNestInset::priv_dispatch(cur, cmd);
+               break;
+
+       case LFUN_INSET_DIALOG_UPDATE:
+               GridInsetMailer(*this).updateDialog(&cur.bv());
+               break;
+
+       // insert file functions
+       case LFUN_DELETE_LINE_FORWARD:
+               recordUndo(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_BREAKLINE: {
+               recordUndo(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: {
+               recordUndo(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', col(cur.idx()));
+               else if (s == "align-right")
+                       halign('r', col(cur.idx()));
+               else if (s == "align-center")
+                       halign('c', col(cur.idx()));
+               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() = nargs() - 1;
-                       if (cur.pos() > cur.lastpos())
-                               cur.pos() = cur.lastpos();
-                       return DispatchResult(true, FINISHED);
-
-               case LFUN_CELL_SPLIT:
-                       ////recordUndo(cur, Undo::ATOMIC);
-                       splitCell(cur);
-                       return DispatchResult(true, FINISHED);
-
-               case LFUN_BREAKLINE: {
-                       ////recordUndo(cur, Undo::INSERT);
-                       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.idx() = cur.lastpos();
-
-                       //mathcursor->normalize();
-                       return DispatchResult(true, FINISHED);
+                               if (cur.idx() > nargs())
+                                       cur.idx() -= ncols();
+                       }
+               else if (s == "copy-row")
+                       for (int i = 0, n = extractInt(is); i < n; ++i)
+                               copyRow(cur.row());
+               else if (s == "swap-row")
+                       swapRow(cur.row());
+               else if (s == "append-column")
+                       for (int i = 0, n = extractInt(is); i < n; ++i) {
+                               row_type r = cur.row();
+                               col_type c = col(cur.idx());
+                               addCol(c);
+                               cur.idx() = index(r, c);
+                       }
+               else if (s == "delete-column")
+                       for (int i = 0, n = extractInt(is); i < n; ++i) {
+                               row_type r = cur.row();
+                               col_type c = col(cur.idx());
+                               delCol(col(cur.idx()));
+                               cur.idx() = index(r, c);
+                               if (cur.idx() > nargs())
+                                       cur.idx() -= ncols();
+                       }
+               else if (s == "copy-column")
+                       copyCol(col(cur.idx()));
+               else if (s == "swap-column")
+                       swapCol(col(cur.idx()));
+               else {
+                       cur.undispatched();
+                       break;
                }
+               lyxerr << "returning FINISHED_LEFT" << endl;
+               break;
+       }
 
-               case LFUN_TABULAR_FEATURE: {
-                       //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', col(cur.idx()));
-                       else if (s == "align-right")
-                               halign('r', col(cur.idx()));
-                       else if (s == "align-center")
-                               halign('c', col(cur.idx()));
-                       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")
-                               for (int i = 0, n = extractInt(is); i < n; ++i)
-                                       copyRow(cur.row());
-                       else if (s == "swap-row")
-                               swapRow(cur.row());
-                       else if (s == "append-column")
-                               for (int i = 0, n = extractInt(is); i < n; ++i) {
-                                       row_type r = cur.row();
-                                       col_type c = col(cur.idx());
-                                       addCol(c);
-                                       cur.idx() = index(r, c);
-                               }
-                       else if (s == "delete-column")
-                               for (int i = 0, n = extractInt(is); i < n; ++i) {
-                                       row_type r = cur.row();
-                                       col_type c = col(cur.idx());
-                                       delCol(col(cur.idx()));
-                                       cur.idx() = index(r, c);
-                                       if (cur.idx() > nargs())
-                                               cur.idx() -= ncols();
+       case LFUN_PASTE: {
+               recordUndo(cur);
+               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
+                       cur.cell().insert(cur.pos(), grid.cell(0));
+                       cur.pos() += grid.cell(0).size();
+               } else {
+                       // multiple cells
+                       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)));
                                }
-                       else if (s == "copy-column")
-                               copyCol(col(cur.idx()));
-                       else if (s == "swap-column")
-                               swapCol(col(cur.idx()));
-                       else
-                               return DispatchResult(false);
-                       lyxerr << "returning DispatchResult(true, FINISHED)" << endl;
-                       return DispatchResult(true, FINISHED);
+                               // 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)));
+                       }
+                       // 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;
+       }
 
-               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
-                               cur.cell().insert(cur.pos(), grid.cell(0));
-                               cur.pos() += grid.cell(0).size();
-                       } else {
-                               // multiple cells
-                               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 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)));
-                               }
-                               // 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)));
-                       }
-                       return DispatchResult(true, FINISHED);
+       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);
+               }
+               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);
                }
+               break;
 
-               default:
-                       return MathNestInset::priv_dispatch(cur, cmd);
+       default:
+               MathNestInset::priv_dispatch(cur, cmd);
+       }
+}
+
+
+bool MathGridInset::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       bool ret = true;
+       switch (cmd.action) {
+       case LFUN_TABULAR_FEATURE:
+#if 0
+               // should be more precise
+               if (v_align_ == '\0') {
+                       flag.enable(true);
+                       break;
+               }
+               if (cmd.argument.empty()) {
+                       flag.enable(false);
+                       break;
+               }
+               if (!contains("tcb", cmd.argument[0])) {
+                       flag.enable(false);
+                       break;
+               }
+               flag.setOnOff(cmd.argument[0] == v_align_);
+#endif
+               flag.enabled(true);
+               break;
+       default:
+               ret = MathNestInset::getStatus(cur, cmd, flag);
+               break;
        }
+       return ret;
 }