X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext3.C;h=1dc903f7cf3006e262ede13f7cb3ab0a28d783d9;hb=2bb86211292f416cd584023feb23dc3b86bc1761;hp=d65d24bf45419004436274a5bd87877bdde20b43;hpb=6a55be9506b112110826cf63bc21786044569f1d;p=lyx.git diff --git a/src/text3.C b/src/text3.C index d65d24bf45..1dc903f7cf 100644 --- a/src/text3.C +++ b/src/text3.C @@ -17,9 +17,11 @@ #include "lyxtext.h" +#include "BranchList.h" #include "FloatList.h" #include "FuncStatus.h" #include "buffer.h" +#include "buffer_funcs.h" #include "bufferparams.h" #include "BufferView.h" #include "cursor.h" @@ -32,6 +34,7 @@ #include "gettext.h" #include "intl.h" #include "language.h" +#include "LyXAction.h" #include "lyxfunc.h" #include "lyxlex.h" #include "lyxrc.h" @@ -54,11 +57,14 @@ #include "support/lstrings.h" #include "support/lyxlib.h" -#include "support/tostr.h" +#include "support/convert.h" +#include "support/lyxtime.h" #include "mathed/math_hullinset.h" #include "mathed/math_macrotemplate.h" +#include + #include #include @@ -70,15 +76,11 @@ using lyx::cap::pasteSelection; using lyx::cap::replaceSelection; using lyx::support::isStrUnsignedInt; -using lyx::support::strToUnsignedInt; -using lyx::support::atoi; using lyx::support::token; using std::endl; -using std::find; using std::string; using std::istringstream; -using std::vector; extern string current_layout; @@ -131,21 +133,24 @@ namespace { { recordUndo(cur); string sel = cur.selectionAsString(false); - lyxerr << "selection is: '" << sel << "'" << endl; + //lyxerr << "selection is: '" << sel << "'" << endl; if (sel.empty()) { const int old_pos = cur.pos(); - cur.insert(new MathHullInset); + cur.insert(new MathHullInset("simple")); BOOST_ASSERT(old_pos == cur.pos()); cur.nextInset()->edit(cur, true); - cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple")); // don't do that also for LFUN_MATH_MODE // unless you want end up with always changing // to mathrm when opening an inlined inset -- // I really hate "LyXfunc overloading"... if (display) cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY)); - cur.dispatch(FuncRequest(LFUN_INSERT_MATH, cmd.argument)); + // Avoid an unnecessary undo step if cmd.argument + // is empty + if (!cmd.argument.empty()) + cur.dispatch(FuncRequest(LFUN_INSERT_MATH, + cmd.argument)); } else { // create a macro if we see "\\newcommand" // somewhere, and an ordinary formula @@ -154,9 +159,8 @@ namespace { if (sel.find("\\newcommand") == string::npos && sel.find("\\def") == string::npos) { - cur.insert(new MathHullInset); + cur.insert(new MathHullInset("simple")); cur.dispatch(FuncRequest(LFUN_RIGHT)); - cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple")); cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel)); } else { istringstream is(sel); @@ -182,115 +186,50 @@ string const freefont2string() } -bool LyXText::gotoNextInset(LCursor & cur, - vector const & codes, string const & contents) -{ - BOOST_ASSERT(this == cur.text()); - pit_type end = paragraphs().size(); - pit_type pit = cur.pit(); - pos_type pos = cur.pos(); - - InsetBase * inset; - do { - if (pos + 1 < pars_[pit].size()) { - ++pos; - } else { - ++pit; - pos = 0; - } - - } while (pit != end && - !(pars_[pit].isInset(pos) && - (inset = pars_[pit].getInset(pos)) != 0 && - find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() && - (contents.empty() || - static_cast(pars_[pit].getInset(pos))->getContents() - == contents))); - - if (pit == end) - return false; - - setCursor(cur, pit, pos, false); - return true; -} - - -void LyXText::gotoInset(LCursor & cur, - vector const & codes, bool same_content) -{ - cur.clearSelection(); - - string contents; - if (same_content - && cur.pos() < cur.lastpos() - && cur.paragraph().isInset(cur.pos())) { - InsetBase const * inset = cur.paragraph().getInset(cur.pos()); - if (find(codes.begin(), codes.end(), inset->lyxCode()) - != codes.end()) - contents = static_cast(inset)->getContents(); - } - - if (!gotoNextInset(cur, codes, contents)) { - if (cur.pos() || cur.pit() != 0) { - CursorSlice tmp = cur.top(); - cur.pit() = 0; - cur.pos() = 0; - if (!gotoNextInset(cur, codes, contents)) { - cur.top() = tmp; - cur.message(_("No more insets")); - } - } else { - cur.message(_("No more insets")); - } - } - cur.resetAnchor(); -} - - -void LyXText::gotoInset(LCursor & cur, InsetBase_code code, bool same_content) -{ - gotoInset(cur, vector(1, code), same_content); -} - - -void LyXText::cursorPrevious(LCursor & cur) +bool LyXText::cursorPrevious(LCursor & cur) { pos_type cpos = cur.pos(); lyx::pit_type cpar = cur.pit(); int x = cur.x_target(); - setCursorFromCoordinates(cur, x, 0); - cursorUp(cur); + bool updated = setCursorFromCoordinates(cur, x, 0); + if (updated) + cur.bv().update(); + updated |= cursorUp(cur); if (cpar == cur.pit() && cpos == cur.pos()) { // we have a row which is taller than the workarea. The // simplest solution is to move to the previous row instead. - cursorUp(cur); + updated |= cursorUp(cur); } cur.bv().updateScrollbar(); finishUndo(); + return updated; } -void LyXText::cursorNext(LCursor & cur) +bool LyXText::cursorNext(LCursor & cur) { pos_type cpos = cur.pos(); lyx::pit_type cpar = cur.pit(); int x = cur.x_target(); - setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1); - cursorDown(cur); + bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1); + if (updated) + cur.bv().update(); + updated |= cursorDown(cur); if (cpar == cur.pit() && cpos == cur.pos()) { // we have a row which is taller than the workarea. The // simplest solution is to move to the next row instead. - cursorDown(cur); + updated |= cursorDown(cur); } cur.bv().updateScrollbar(); finishUndo(); + return updated; } @@ -304,12 +243,12 @@ void specialChar(LCursor & cur, InsetSpecialChar::Kind kind) } -void doInsertInset(LCursor & cur, LyXText * text, +bool doInsertInset(LCursor & cur, LyXText * text, FuncRequest const & cmd, bool edit, bool pastesel) { InsetBase * inset = createInset(&cur.bv(), cmd); if (!inset) - return; + return false; recordUndo(cur); bool gotsel = false; @@ -324,6 +263,7 @@ void doInsertInset(LCursor & cur, LyXText * text, if (gotsel && pastesel) cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE)); + return true; } @@ -331,7 +271,7 @@ void update(LCursor & cur) { //we don't call update(true, false) directly to save a metrics call if (cur.bv().fitCursor()) - cur.bv().update(false, true); + cur.bv().update(Update::Force); } @@ -355,13 +295,21 @@ bool LyXText::isRTL(Paragraph const & par) const void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) { lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl; - //lyxerr << "*** LyXText::dispatch: cmd: " << cmd << endl; BOOST_ASSERT(cur.text() == this); BufferView * bv = &cur.bv(); - CursorSlice sl = cur.top(); + CursorSlice oldTopSlice = cur.top(); + bool oldBoundary = cur.boundary(); bool sel = cur.selection(); - bool moving = false; + // Signals that, even if needsUpdate == false, an update of the + // cursor paragraph is required + bool singleParUpdate = lyxaction.funcHasFlag(cmd.action, + LyXAction::SingleParUpdate); + // Signals that a full-screen update is required + bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action, + LyXAction::NoUpdate) || singleParUpdate); + // Remember the old paragraph metric (_outer_ paragraph!) + Dimension olddim = cur.bottom().paragraph().dim(); switch (cmd.action) { @@ -369,6 +317,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) Paragraph & par = cur.paragraph(); bool start = !par.params().startOfAppendix(); +#ifdef WITH_WARNINGS +#warning The code below only makes sense at top level. +// Should LFUN_APPENDIX be restricted to top-level paragraphs? +#endif // ensure that we have only one start_of_appendix in this document for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) { if (pars_[tmp].params().startOfAppendix()) { @@ -382,7 +334,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) par.params().startOfAppendix(start); // we can set the refreshing parameters now - updateCounters(); + updateCounters(cur.buffer()); break; } @@ -405,29 +357,27 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_WORDRIGHT: - moving = true; if (!cur.mark()) cur.clearSelection(); if (isRTL(cur.paragraph())) - cursorLeftOneWord(cur); + needsUpdate = cursorLeftOneWord(cur); else - cursorRightOneWord(cur); + needsUpdate = cursorRightOneWord(cur); finishChange(cur, false); break; case LFUN_WORDLEFT: - moving = true; if (!cur.mark()) cur.clearSelection(); if (isRTL(cur.paragraph())) - cursorRightOneWord(cur); + needsUpdate = cursorRightOneWord(cur); else - cursorLeftOneWord(cur); + needsUpdate = cursorLeftOneWord(cur); finishChange(cur, false); break; case LFUN_BEGINNINGBUF: - if (cur.size() == 1) { + if (cur.depth() == 1) { if (!cur.mark()) cur.clearSelection(); cursorTop(cur); @@ -438,7 +388,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_BEGINNINGBUFSEL: - if (cur.size() == 1) { + if (cur.depth() == 1) { if (!cur.selection()) cur.resetAnchor(); cursorTop(cur); @@ -449,7 +399,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_ENDBUF: - if (cur.size() == 1) { + if (cur.depth() == 1) { if (!cur.mark()) cur.clearSelection(); cursorBottom(cur); @@ -460,7 +410,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_ENDBUFSEL: - if (cur.size() == 1) { + if (cur.depth() == 1) { if (!cur.selection()) cur.resetAnchor(); cursorBottom(cur); @@ -471,61 +421,73 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_RIGHT: - moving = true; case LFUN_RIGHTSEL: - //lyxerr << "handle LFUN_RIGHT[SEL]:\n" << cur << endl; + //lyxerr << BOOST_CURRENT_FUNCTION + // << " LFUN_RIGHT[SEL]:\n" << cur << endl; cur.selHandle(cmd.action == LFUN_RIGHTSEL); if (isRTL(cur.paragraph())) - cursorLeft(cur); + needsUpdate = cursorLeft(cur); else - cursorRight(cur); - if (sl == cur.top()) { + needsUpdate = cursorRight(cur); + + if (!needsUpdate && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_RIGHT); } break; case LFUN_LEFT: - moving = true; case LFUN_LEFTSEL: //lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl; cur.selHandle(cmd.action == LFUN_LEFTSEL); if (isRTL(cur.paragraph())) - cursorRight(cur); + needsUpdate = cursorRight(cur); else - cursorLeft(cur); - if (sl == cur.top()) { + needsUpdate = cursorLeft(cur); + + if (!needsUpdate && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_LEFT); } break; case LFUN_UP: - moving = true; case LFUN_UPSEL: update(cur); //lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl; cur.selHandle(cmd.action == LFUN_UPSEL); - cursorUp(cur); - if (sl == cur.top()) { + + needsUpdate = cursorUp(cur); + if (!needsUpdate && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_UP); } break; case LFUN_DOWN: - moving = true; case LFUN_DOWNSEL: update(cur); //lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl; cur.selHandle(cmd.action == LFUN_DOWNSEL); - cursorDown(cur); - if (sl == cur.top()) { + needsUpdate = cursorDown(cur); + if (!needsUpdate && oldTopSlice == cur.top() && + cur.boundary() == oldBoundary) + { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_DOWN); } break; + case LFUN_UP_PARAGRAPH: + if (!cur.mark()) + cur.clearSelection(); + needsUpdate = cursorUpParagraph(cur); + finishChange(cur, false); + break; + case LFUN_UP_PARAGRAPHSEL: if (!cur.selection()) cur.resetAnchor(); @@ -533,6 +495,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) finishChange(cur, true); break; + case LFUN_DOWN_PARAGRAPH: + if (!cur.mark()) + cur.clearSelection(); + needsUpdate = cursorDownParagraph(cur); + finishChange(cur, false); + break; + case LFUN_DOWN_PARAGRAPHSEL: if (!cur.selection()) cur.resetAnchor(); @@ -598,25 +567,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_UP_PARAGRAPH: - moving = true; - if (!cur.mark()) - cur.clearSelection(); - cursorUpParagraph(cur); - finishChange(cur, false); - break; - - case LFUN_DOWN_PARAGRAPH: - moving = true; - if (!cur.mark()) - cur.clearSelection(); - cursorDownParagraph(cur); - finishChange(cur, false); - break; - case LFUN_PRIOR: update(cur); - moving = true; if (!cur.mark()) cur.clearSelection(); finishChange(cur, false); @@ -624,13 +576,12 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_UP); } else { - cursorPrevious(cur); + needsUpdate = cursorPrevious(cur); } break; case LFUN_NEXT: update(cur); - moving = true; if (!cur.mark()) cur.clearSelection(); finishChange(cur, false); @@ -639,7 +590,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_DOWN); } else { - cursorNext(cur); + needsUpdate = cursorNext(cur); } break; @@ -670,7 +621,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_DELETE: if (!cur.selection()) { - Delete(cur); + needsUpdate = Delete(cur); cur.resetAnchor(); // It is possible to make it a lot faster still // just comment out the line below... @@ -698,7 +649,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_BACKSPACE: if (!cur.selection()) { if (bv->owner()->getIntl().getTransManager().backspace()) { - backspace(cur); + needsUpdate = backspace(cur); cur.resetAnchor(); // It is possible to make it a lot faster still // just comment out the line below... @@ -789,19 +740,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_INSET_APPLY: { - string const name = cmd.getArg(0); - InsetBase * inset = bv->owner()->getDialogs().getOpenInset(name); - if (inset) { - FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument); - inset->dispatch(cur, fr); - } else { - FuncRequest fr(LFUN_INSET_INSERT, cmd.argument); - dispatch(cur, fr); - } - break; - } - case LFUN_INSET_INSERT: { recordUndo(cur); InsetBase * inset = createInset(bv, cmd); @@ -813,26 +751,31 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_INSET_SETTINGS: - if (cur.inset().asUpdatableInset()) - cur.inset().asUpdatableInset()->showInsetDialog(bv); + cur.inset().showInsetDialog(bv); break; case LFUN_NEXT_INSET_TOGGLE: { InsetBase * inset = cur.nextInset(); + // this is the real function we want to invoke + cmd = FuncRequest(LFUN_INSET_TOGGLE); + cur.undispatched(); + // if there is an inset at cursor, see whether it + // wants to toggle. if (inset) { - cur.clearSelection(); - FuncRequest fr = cmd; - fr.action = LFUN_INSET_TOGGLE; - inset->dispatch(cur, fr); + LCursor tmpcur = cur; + tmpcur.pushLeft(*inset); + inset->dispatch(tmpcur, cmd); + if (tmpcur.result().dispatched()) { + cur.clearSelection(); + cur.dispatched(); + } } + // if it did not work, try the underlying inset. + if (!cur.result().dispatched()) + cur.inset().dispatch(cur, cmd); break; } - case LFUN_KEYMAP_TOGGLE: - cur.clearSelection(); - bv->switchKeyMap(); - break; - case LFUN_SPACE_INSERT: if (cur.paragraph().layout()->free_spacing) insertChar(cur, ' '); @@ -882,11 +825,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_PASTE: cur.message(_("Paste")); lyx::cap::replaceSelection(cur); -#ifdef WITH_WARNINGS -#warning FIXME Check if the arg is in the domain of available selections. -#endif if (isStrUnsignedInt(cmd.argument)) - pasteSelection(cur, strToUnsignedInt(cmd.argument)); + pasteSelection(cur, convert(cmd.argument)); else pasteSelection(cur, 0); cur.clearSelection(); // bug 393 @@ -905,8 +845,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_GETXY: - cur.message(convert(cursorX(cur.top())) + ' ' - + convert(cursorY(cur.top()))); + cur.message(convert(cursorX(cur.top(), cur.boundary())) + ' ' + + convert(cursorY(cur.top(), cur.boundary()))); break; case LFUN_SETXY: { @@ -997,6 +937,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.clearSelection(); string const clip = bv->getClipboard(); if (!clip.empty()) { + recordUndo(cur); if (cmd.argument == "paragraph") insertStringAsParagraphs(cur, clip); else @@ -1005,22 +946,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_GOTOERROR: - gotoInset(cur, InsetBase::ERROR_CODE, false); - break; - - case LFUN_GOTONOTE: - gotoInset(cur, InsetBase::NOTE_CODE, false); - break; - - case LFUN_REFERENCE_GOTO: { - vector tmp; - tmp.push_back(InsetBase::LABEL_CODE); - tmp.push_back(InsetBase::REF_CODE); - gotoInset(cur, tmp, true); - break; - } - case LFUN_QUOTE: { lyx::cap::replaceSelection(cur); Paragraph & par = cur.paragraph(); @@ -1043,12 +968,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.insert(new InsetQuotes(c, bufparams.quotes_language, InsetQuotes::SingleQ)); - else if (arg == "double") + else cur.insert(new InsetQuotes(c, bufparams.quotes_language, InsetQuotes::DoubleQ)); - else - cur.insert(new InsetQuotes(c, bufparams)); cur.posRight(); } else @@ -1056,27 +979,14 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_DATE_INSERT: { - lyx::cap::replaceSelection(cur); - time_t now_time_t = time(NULL); - struct tm * now_tm = localtime(&now_time_t); - setlocale(LC_TIME, ""); - string arg; - if (!cmd.argument.empty()) - arg = cmd.argument; + case LFUN_DATE_INSERT: + if (cmd.argument.empty()) + bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, + lyx::formatted_time(lyx::current_time()))); else - arg = lyxrc.date_insert_format; - char datetmp[32]; - int const datetmp_len = - ::strftime(datetmp, 32, arg.c_str(), now_tm); - - for (int i = 0; i < datetmp_len; i++) - insertChar(cur, datetmp[i]); - - cur.resetAnchor(); - moveCursor(cur, false); + bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, + lyx::formatted_time(lyx::current_time(), cmd.argument))); break; - } case LFUN_MOUSE_TRIPLE: if (cmd.button() == mouse_button::button1) { @@ -1084,6 +994,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.resetAnchor(); cursorEnd(cur); cur.setSelection(); + bv->cursor() = cur; bv->haveSelection(cur.selection()); } break; @@ -1091,6 +1002,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MOUSE_DOUBLE: if (cmd.button() == mouse_button::button1) { selectWord(cur, lyx::WHOLE_WORD_STRICT); + bv->cursor() = cur; bv->haveSelection(cur.selection()); } break; @@ -1113,20 +1025,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) paste_internally = true; } - // Clear the selection - cur.clearSelection(); - - setCursorFromCoordinates(cur, cmd.x, cmd.y); - cur.resetAnchor(); - finishUndo(); - cur.setTargetX(); - - // Has the cursor just left the inset? - if (bv->cursor().inMathed() && !cur.inMathed()) - bv->cursor().inset().notifyCursorLeaves(bv->cursor()); - - // Set cursor here. - bv->cursor() = cur; + bv->mouseSetCursor(cur); // Insert primary selection with middle mouse // if there is a local selection in the current buffer, @@ -1174,7 +1073,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // don't set anchor_ bvcur.setCursor(cur); bvcur.selection() = true; - lyxerr << "MOTION: " << bv->cursor() << endl; + //lyxerr << "MOTION: " << bv->cursor() << endl; } } else @@ -1223,10 +1122,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.resetAnchor(); moveCursor(cur, false); - - // real_current_font.number can change so we need to - // update the minibuffer - if (old_font != real_current_font) bv->updateScrollbar(); break; } @@ -1274,13 +1169,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_INSERT_BRANCH: case LFUN_INSERT_BIBITEM: case LFUN_INSET_ERT: - case LFUN_INSET_FLOAT: case LFUN_INSET_FOOTNOTE: case LFUN_INSET_MARGINAL: case LFUN_INSET_OPTARG: - case LFUN_INSET_WIDE_FLOAT: - case LFUN_INSET_WRAP: - case LFUN_TABULAR_INSERT: case LFUN_ENVIRONMENT_INSERT: // Open the inset, and move the current selection // inside it. @@ -1288,12 +1179,38 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.posRight(); break; - case LFUN_INDEX_INSERT: - // Just open the inset - doInsertInset(cur, this, cmd, true, false); + case LFUN_TABULAR_INSERT: + // if there were no arguments, just open the dialog + if (doInsertInset(cur, this, cmd, false, true)) + cur.posRight(); + else + bv->owner()->getDialogs().show("tabularcreate"); + + break; + + case LFUN_INSET_FLOAT: + case LFUN_INSET_WIDE_FLOAT: + case LFUN_INSET_WRAP: + doInsertInset(cur, this, cmd, true, true); cur.posRight(); + // FIXME: the "Caption" name should not be hardcoded, + // but given by the float definition. + cur.dispatch(FuncRequest(LFUN_LAYOUT, "Caption")); break; + case LFUN_INDEX_INSERT: { + InsetBase * inset = createInset(&cur.bv(), cmd); + if (!inset) + break; + + recordUndo(cur); + cur.clearSelection(); + insertInset(cur, inset); + inset->edit(cur, true); + cur.posRight(); + break; + } + case LFUN_INDEX_PRINT: case LFUN_TOC_INSERT: case LFUN_HFILL: @@ -1331,10 +1248,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) else { string s = cmd.argument; string const s1 = token(s, ' ', 1); - int const nargs = s1.empty() ? 0 : atoi(s1); + int const nargs = s1.empty() ? 0 : convert(s1); string const s2 = token(s, ' ', 2); string const type = s2.empty() ? "newcommand" : s2; - cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, s2)); + cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, type)); //cur.nextInset()->edit(cur, true); } break; @@ -1350,9 +1267,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_INSERT_MATH: case LFUN_INSERT_MATRIX: case LFUN_MATH_DELIM: { - cur.insert(new MathHullInset); + cur.insert(new MathHullInset("simple")); cur.dispatch(FuncRequest(LFUN_RIGHT)); - cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple")); cur.dispatch(cmd); break; } @@ -1483,8 +1399,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) params2string(cur.paragraph(), data); // Will the paragraph accept changes from the dialog? - InsetBase & inset = cur.inset(); - bool const accept = !inset.forceDefaultParagraphs(&inset); + bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx()); data = "update " + convert(accept) + '\n' + data; bv->owner()->getDialogs().update("paragraph", data); @@ -1595,22 +1510,35 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.selection() = false; } else { cur.undispatched(); - cmd = FuncRequest(LFUN_FINISHED_LEFT); + cmd = FuncRequest(LFUN_FINISHED_RIGHT); } break; default: + lyxerr[Debug::ACTION] + << BOOST_CURRENT_FUNCTION + << ": Command " << cmd + << " not DISPATCHED by LyXText" << endl; cur.undispatched(); break; } - // avoid to update when navigating - if (moving - && &sl.inset() == &cur.inset() - && sl.idx() == cur.idx() - && sel == false - && cur.selection() == false) + if (singleParUpdate) + // Inserting characters does not change par height + if (cur.bottom().paragraph().dim().height() + == olddim.height()) { + // if so, update _only_ this paragraph + cur.bv().update(Update::SinglePar | Update::Force); + } else + needsUpdate = true; + if (!needsUpdate + && &oldTopSlice.inset() == &cur.inset() + && oldTopSlice.idx() == cur.idx() + && !sel + && !cur.selection()) cur.noUpdate(); + else + cur.needsUpdate(); } @@ -1618,8 +1546,10 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { BOOST_ASSERT(cur.text() == this); + LyXFont const & font = real_current_font; bool enable = true; + InsetBase::Code code = InsetBase::NO_CODE; switch (cmd.action) { @@ -1631,19 +1561,14 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, enable = changeDepthAllowed(cur, INC_DEPTH); break; - case LFUN_INSET_OPTARG: - enable = numberOfOptArgs(cur.paragraph()) - < cur.paragraph().layout()->optionalargs; - break; - case LFUN_APPENDIX: flag.setOnOff(cur.paragraph().params().startOfAppendix()); + return true; + + case LFUN_INSERT_BIBITEM: + enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO); break; -#if 0 - // the functions which insert insets - InsetBase::Code code = InsetBase::NO_CODE; - switch (cmd.action) { case LFUN_DIALOG_SHOW_NEW_INSET: if (cmd.argument == "bibitem") code = InsetBase::BIBITEM_CODE; @@ -1721,7 +1646,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, break; case LFUN_INSERT_CHARSTYLE: code = InsetBase::CHARSTYLE_CODE; - if (buf->params().getLyXTextClass().charstyles().empty()) + if (cur.buffer().params().getLyXTextClass().charstyles().empty()) enable = false; break; case LFUN_INSERT_BOX: @@ -1729,7 +1654,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, break; case LFUN_INSERT_BRANCH: code = InsetBase::BRANCH_CODE; - if (buf->params().branchlist().empty()) + if (cur.buffer().getMasterBuffer()->params().branchlist().empty()) enable = false; break; case LFUN_INSERT_LABEL: @@ -1737,6 +1662,8 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, break; case LFUN_INSET_OPTARG: code = InsetBase::OPTARG_CODE; + enable = numberOfOptArgs(cur.paragraph()) + < cur.paragraph().layout()->optionalargs; break; case LFUN_ENVIRONMENT_INSERT: code = InsetBase::BOX_CODE; @@ -1771,6 +1698,11 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, if (cur.inTexted()) code = InsetBase::SPACE_CODE; break; + +#ifdef WITH_WARNINGS +#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005) +#endif +#if 0 case LFUN_INSET_DIALOG_SHOW: { InsetBase * inset = cur.nextInset(); enable = inset; @@ -1784,59 +1716,47 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, } break; } - default: - break; - } - - if (code != InsetBase::NO_CODE - && (cur.empty() || !cur.inset().insetAllowed(code))) - enable = false; - #endif - case LFUN_DIALOG_SHOW_NEW_INSET: - case LFUN_INSET_ERT: - case LFUN_INSERT_BOX: - case LFUN_INSERT_BRANCH: - case LFUN_ENVIRONMENT_INSERT: - case LFUN_INDEX_INSERT: - case LFUN_INDEX_PRINT: - case LFUN_TOC_INSERT: - case LFUN_HTMLURL: - case LFUN_URL: - case LFUN_QUOTE: - case LFUN_HYPHENATION: - case LFUN_LIGATURE_BREAK: - case LFUN_HFILL: - case LFUN_MENU_SEPARATOR: - case LFUN_LDOTS: - case LFUN_END_OF_SENTENCE: - case LFUN_SPACE_INSERT: - case LFUN_INSET_DIALOG_SHOW: + case LFUN_INSET_MODIFY: + // We need to disable this, because we may get called for a + // tabular cell via + // InsetTabular::getStatus() -> InsetText::getStatus() + // and we don't handle LFUN_INSET_MODIFY. + enable = false; break; case LFUN_EMPH: flag.setOnOff(font.emph() == LyXFont::ON); - break; + return true; case LFUN_NOUN: flag.setOnOff(font.noun() == LyXFont::ON); - break; + return true; case LFUN_BOLD: flag.setOnOff(font.series() == LyXFont::BOLD_SERIES); - break; + return true; case LFUN_SANS: flag.setOnOff(font.family() == LyXFont::SANS_FAMILY); - break; + return true; case LFUN_ROMAN: flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY); - break; + return true; case LFUN_CODE: flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY); + return true; + + case LFUN_CUT: + case LFUN_COPY: + enable = cur.selection(); + break; + + case LFUN_PASTE: + enable = lyx::cap::numberOfSelections() > 0; break; case LFUN_DELETE_WORD_FORWARD: @@ -1876,37 +1796,20 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_BREAKPARAGRAPHKEEPLAYOUT: case LFUN_BREAKPARAGRAPH_SKIP: case LFUN_PARAGRAPH_SPACING: - case LFUN_INSET_APPLY: case LFUN_INSET_INSERT: case LFUN_NEXT_INSET_TOGGLE: case LFUN_UPCASE_WORD: case LFUN_LOWCASE_WORD: case LFUN_CAPITALIZE_WORD: case LFUN_TRANSPOSE_CHARS: - case LFUN_PASTE: - case LFUN_CUT: - case LFUN_COPY: case LFUN_GETXY: case LFUN_SETXY: case LFUN_GETFONT: case LFUN_GETLAYOUT: case LFUN_LAYOUT: case LFUN_PASTESELECTION: - case LFUN_GOTOERROR: - case LFUN_GOTONOTE: - case LFUN_REFERENCE_GOTO: case LFUN_DATE_INSERT: case LFUN_SELFINSERT: - case LFUN_INSERT_LABEL: - case LFUN_INSERT_NOTE: - case LFUN_INSERT_CHARSTYLE: - case LFUN_INSERT_BIBITEM: - case LFUN_INSET_FLOAT: - case LFUN_INSET_FOOTNOTE: - case LFUN_INSET_MARGINAL: - case LFUN_INSET_WIDE_FLOAT: - case LFUN_INSET_WRAP: - case LFUN_TABULAR_INSERT: case LFUN_INSERT_LINE: case LFUN_INSERT_PAGEBREAK: case LFUN_MATH_DISPLAY: @@ -1943,13 +1846,11 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_HUNG_UMLAUT: case LFUN_CIRCLE: case LFUN_OGONEK: - case LFUN_FLOAT_LIST: case LFUN_ACCEPT_CHANGE: case LFUN_REJECT_CHANGE: case LFUN_THESAURUS_ENTRY: case LFUN_PARAGRAPH_APPLY: case LFUN_ESCAPE: - case LFUN_KEYMAP_TOGGLE: case LFUN_ENDBUF: case LFUN_BEGINNINGBUF: case LFUN_BEGINNINGBUFSEL: @@ -1961,6 +1862,11 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, default: return false; } + + if (code != InsetBase::NO_CODE + && (cur.empty() || !cur.inset().insetAllowed(code))) + enable = false; + flag.enabled(enable); return true; }