X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext3.C;h=9ddee5cf60f2574b5ce4fd8a2e52492ee0aa6687;hb=d1f2a9c0000f0ad038425900b001c16a56c72afa;hp=d4e09ee7bf2cb8eb9110d68ffffaac56c4016993;hpb=ba0a69bcd964c1962ddfb0ac01f92127da26171c;p=lyx.git diff --git a/src/text3.C b/src/text3.C index d4e09ee7bf..9ddee5cf60 100644 --- a/src/text3.C +++ b/src/text3.C @@ -23,6 +23,7 @@ #include "bufferparams.h" #include "BufferView.h" #include "cursor.h" +#include "coordcache.h" #include "CutAndPaste.h" #include "debug.h" #include "dispatchresult.h" @@ -31,6 +32,7 @@ #include "gettext.h" #include "intl.h" #include "language.h" +#include "LyXAction.h" #include "lyxfunc.h" #include "lyxlex.h" #include "lyxrc.h" @@ -53,13 +55,13 @@ #include "support/lstrings.h" #include "support/lyxlib.h" -#include "support/tostr.h" -#include "support/std_sstream.h" +#include "support/convert.h" #include "mathed/math_hullinset.h" #include "mathed/math_macrotemplate.h" #include +#include using lyx::pos_type; @@ -69,8 +71,6 @@ 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; @@ -82,10 +82,6 @@ using std::vector; extern string current_layout; -// the selection possible is needed, that only motion events are -// used, where the button press event was on the drawing area too -bool selection_possible = false; - namespace { @@ -107,7 +103,7 @@ namespace { text->bidi.isBoundary(cur.buffer(), par, cur.pos(), text->real_current_font)) - text->setCursor(cur, cur.par(), cur.pos(), + text->setCursor(cur, cur.pit(), cur.pos(), false, !cur.boundary()); } } @@ -137,18 +133,22 @@ namespace { lyxerr << "selection is: '" << sel << "'" << endl; if (sel.empty()) { + const int old_pos = cur.pos(); cur.insert(new MathHullInset); + 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"... + // 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)); } else { - // create a macro if we see "\\newcommand" somewhere, and an ordinary - // formula otherwise + // create a macro if we see "\\newcommand" + // somewhere, and an ordinary formula + // otherwise cutSelection(cur, true, true); if (sel.find("\\newcommand") == string::npos && sel.find("\\def") == string::npos) @@ -181,48 +181,12 @@ string const freefont2string() } - -//takes absolute x,y coordinates -InsetBase * LyXText::checkInsetHit(int x, int y) -{ - par_type pit; - par_type end; - - getParsInRange(paragraphs(), - bv()->top_y() - yo_, - bv()->top_y() - yo_ + bv()->workHeight(), - pit, end); - - lyxerr << "checkInsetHit: x: " << x << " y: " << y << endl; - lyxerr << " pit: " << pit << " end: " << end << endl; - for ( ; pit != end; ++pit) { - InsetList::iterator iit = pars_[pit].insetlist.begin(); - InsetList::iterator iend = pars_[pit].insetlist.end(); - for ( ; iit != iend; ++iit) { - InsetBase * inset = iit->inset; -#if 0 - lyxerr << "examining inset " << inset - << " xo: " << inset->xo() << "..." << inset->xo() + inset->width() - << " yo: " << inset->yo() - inset->ascent() << "..." - << inset->yo() + inset->descent() << endl; -#endif - if (inset->covers(x, y)) { - lyxerr << "Hit inset: " << inset << endl; - return inset; - } - } - } - //lyxerr << "No inset hit. " << endl; - return 0; -} - - bool LyXText::gotoNextInset(LCursor & cur, - vector const & codes, string const & contents) + vector const & codes, string const & contents) { BOOST_ASSERT(this == cur.text()); - par_type end = paragraphs().size(); - par_type pit = cur.par(); + pit_type end = paragraphs().size(); + pit_type pit = cur.pit(); pos_type pos = cur.pos(); InsetBase * inset; @@ -251,7 +215,7 @@ bool LyXText::gotoNextInset(LCursor & cur, void LyXText::gotoInset(LCursor & cur, - vector const & codes, bool same_content) + vector const & codes, bool same_content) { cur.clearSelection(); @@ -266,9 +230,9 @@ void LyXText::gotoInset(LCursor & cur, } if (!gotoNextInset(cur, codes, contents)) { - if (cur.pos() || cur.par() != 0) { + if (cur.pos() || cur.pit() != 0) { CursorSlice tmp = cur.top(); - cur.par() = 0; + cur.pit() = 0; cur.pos() = 0; if (!gotoNextInset(cur, codes, contents)) { cur.top() = tmp; @@ -282,49 +246,52 @@ void LyXText::gotoInset(LCursor & cur, } -void LyXText::gotoInset(LCursor & cur, InsetOld_code code, bool same_content) +void LyXText::gotoInset(LCursor & cur, InsetBase_code code, bool same_content) { - gotoInset(cur, vector(1, code), 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::par_type cpar = cur.par(); + lyx::pit_type cpar = cur.pit(); int x = cur.x_target(); - int y = cur.bv().top_y(); - setCursorFromCoordinates(cur, x, y); - if (cpar == cur.par() && cpos == cur.pos()) { + setCursorFromCoordinates(cur, x, 0); + bool 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::par_type cpar = cur.par(); + lyx::pit_type cpar = cur.pit(); int x = cur.x_target(); - int y = cur.bv().top_y() + cur.bv().workHeight(); - setCursorFromCoordinates(cur, x, y); + setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1); + bool updated = cursorDown(cur); - if (cpar == cur.par() && cpos == cur.pos()) { + 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; } @@ -334,6 +301,7 @@ void specialChar(LCursor & cur, InsetSpecialChar::Kind kind) { lyx::cap::replaceSelection(cur); cur.insert(new InsetSpecialChar(kind)); + cur.posRight(); } @@ -351,12 +319,23 @@ void doInsertInset(LCursor & cur, LyXText * text, gotsel = true; } text->insertInset(cur, inset); + if (edit) inset->edit(cur, true); + if (gotsel && pastesel) cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE)); } + +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); +} + + } // anon namespace @@ -377,11 +356,13 @@ 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; + lyxerr << "*** LyXText::dispatch: cmd: " << cmd << endl; BOOST_ASSERT(cur.text() == this); BufferView * bv = &cur.bv(); - CursorSlice sl = cur.top(); + CursorSlice oldTopSlice = cur.top(); + bool sel = cur.selection(); + bool needsUpdate = !lyxaction.funcHasFlag(cmd.action, LyXAction::NoUpdate); switch (cmd.action) { @@ -390,11 +371,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) bool start = !par.params().startOfAppendix(); // ensure that we have only one start_of_appendix in this document - for (par_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) { + for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) { if (pars_[tmp].params().startOfAppendix()) { recUndo(tmp); pars_[tmp].params().startOfAppendix(false); - redoParagraph(tmp); break; } } @@ -404,7 +384,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // we can set the refreshing parameters now updateCounters(); - redoParagraph(cur); break; } @@ -430,9 +409,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) if (!cur.mark()) cur.clearSelection(); if (isRTL(cur.paragraph())) - cursorLeftOneWord(cur); + needsUpdate = cursorLeftOneWord(cur); else - cursorRightOneWord(cur); + needsUpdate = cursorRightOneWord(cur); finishChange(cur, false); break; @@ -440,35 +419,66 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) 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.mark()) - cur.clearSelection(); - cursorTop(cur); - finishChange(cur, false); + if (cur.depth() == 1) { + if (!cur.mark()) + cur.clearSelection(); + cursorTop(cur); + finishChange(cur, false); + } else { + cur.undispatched(); + } + break; + + case LFUN_BEGINNINGBUFSEL: + if (cur.depth() == 1) { + if (!cur.selection()) + cur.resetAnchor(); + cursorTop(cur); + finishChange(cur, true); + } else { + cur.undispatched(); + } break; case LFUN_ENDBUF: - if (!cur.mark()) - cur.clearSelection(); - cursorBottom(cur); - finishChange(cur, false); + if (cur.depth() == 1) { + if (!cur.mark()) + cur.clearSelection(); + cursorBottom(cur); + finishChange(cur, false); + } else { + cur.undispatched(); + } + break; + + case LFUN_ENDBUFSEL: + if (cur.depth() == 1) { + if (!cur.selection()) + cur.resetAnchor(); + cursorBottom(cur); + finishChange(cur, true); + } else { + cur.undispatched(); + } break; case LFUN_RIGHT: 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.undispatched(); cmd = FuncRequest(LFUN_FINISHED_RIGHT); } @@ -479,10 +489,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) //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 (oldTopSlice == cur.top()) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_LEFT); } @@ -490,10 +500,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_UP: 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 (oldTopSlice == cur.top()) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_UP); } @@ -501,15 +512,23 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_DOWN: 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 (oldTopSlice == cur.top()) { 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(); @@ -517,6 +536,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(); @@ -525,6 +551,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_PRIORSEL: + update(cur); if (!cur.selection()) cur.resetAnchor(); cursorPrevious(cur); @@ -532,6 +559,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_NEXTSEL: + update(cur); if (!cur.selection()) cur.resetAnchor(); cursorNext(cur); @@ -539,6 +567,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_HOMESEL: + update(cur); if (!cur.selection()) cur.resetAnchor(); cursorHome(cur); @@ -546,6 +575,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_ENDSEL: + update(cur); if (!cur.selection()) cur.resetAnchor(); cursorEnd(cur); @@ -578,42 +608,30 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_UP_PARAGRAPH: - if (!cur.mark()) - cur.clearSelection(); - cursorUpParagraph(cur); - finishChange(cur, false); - break; - - case LFUN_DOWN_PARAGRAPH: - if (!cur.mark()) - cur.clearSelection(); - cursorDownParagraph(cur); - finishChange(cur, false); - break; - case LFUN_PRIOR: + update(cur); if (!cur.mark()) cur.clearSelection(); finishChange(cur, false); - if (cur.par() == 0 && cur.textRow().pos() == 0) { + if (cur.pit() == 0 && cur.textRow().pos() == 0) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_UP); } else { - cursorPrevious(cur); + needsUpdate = cursorPrevious(cur); } break; case LFUN_NEXT: + update(cur); if (!cur.mark()) cur.clearSelection(); finishChange(cur, false); - if (cur.par() == cur.lastpar() + if (cur.pit() == cur.lastpit() && cur.textRow().endpos() == cur.lastpos()) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_DOWN); } else { - cursorNext(cur); + needsUpdate = cursorNext(cur); } break; @@ -636,6 +654,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) if (cur.pos() > cur.paragraph().beginOfBody()) { lyx::cap::replaceSelection(cur); cur.insert(new InsetNewline); + cur.posRight(); moveCursor(cur, false); } break; @@ -726,15 +745,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_PARAGRAPH_SPACING: { Paragraph & par = cur.paragraph(); Spacing::Space cur_spacing = par.params().spacing().getSpace(); - float cur_value = 1.0; + string cur_value = "1.0"; if (cur_spacing == Spacing::Other) - cur_value = par.params().spacing().getValue(); + cur_value = par.params().spacing().getValueAsString(); istringstream is(cmd.argument); string tmp; is >> tmp; Spacing::Space new_spacing = cur_spacing; - float new_value = cur_value; + string new_value = cur_value; if (tmp.empty()) { lyxerr << "Missing argument to `paragraph-spacing'" << endl; @@ -746,10 +765,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) new_spacing = Spacing::Double; } else if (tmp == "other") { new_spacing = Spacing::Other; - float tmpval = 0.0; + string tmpval = "0.0"; is >> tmpval; lyxerr << "new_value = " << tmpval << endl; - if (tmpval != 0.0) + if (tmpval != "0.0") new_value = tmpval; } else if (tmp == "default") { new_spacing = Spacing::Default; @@ -757,10 +776,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) lyxerr << _("Unknown spacing argument: ") << cmd.argument << endl; } - if (cur_spacing != new_spacing || cur_value != new_value) { + if (cur_spacing != new_spacing || cur_value != new_value) par.params().spacing(Spacing(new_spacing, new_value)); - redoParagraph(cur); - } break; } @@ -780,8 +797,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_INSET_INSERT: { recordUndo(cur); InsetBase * inset = createInset(bv, cmd); - if (inset) + if (inset) { insertInset(cur, inset); + cur.posRight(); + } break; } @@ -809,8 +828,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_SPACE_INSERT: if (cur.paragraph().layout()->free_spacing) insertChar(cur, ' '); - else + else { doInsertInset(cur, this, cmd, false, false); + cur.posRight(); + } moveCursor(cur, false); break; @@ -848,7 +869,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_TRANSPOSE_CHARS: recordUndo(cur); - redoParagraph(cur); break; case LFUN_PASTE: @@ -858,7 +878,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) #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 @@ -877,8 +897,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_GETXY: - cur.message(tostr(cursorX(cur.top())) + ' ' - + tostr(cursorY(cur.top()))); + cur.message(convert(cursorX(cur.top())) + ' ' + + convert(cursorY(cur.top()))); break; case LFUN_SETXY: { @@ -943,10 +963,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) bool change_layout = (current_layout != layout); if (!change_layout && cur.selection() && - cur.selBegin().par() != cur.selEnd().par()) + cur.selBegin().pit() != cur.selEnd().pit()) { - par_type spit = cur.selBegin().par(); - par_type epit = cur.selEnd().par() + 1; + pit_type spit = cur.selBegin().pit(); + pit_type epit = cur.selEnd().pit() + 1; while (spit != epit) { if (pars_[spit].layout()->name() != current_layout) { change_layout = true; @@ -986,7 +1006,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_REFERENCE_GOTO: { - vector tmp; + vector tmp; tmp.push_back(InsetBase::LABEL_CODE); tmp.push_back(InsetBase::REF_CODE); gotoInset(cur, tmp, true); @@ -1021,6 +1041,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) InsetQuotes::DoubleQ)); else cur.insert(new InsetQuotes(c, bufparams)); + cur.posRight(); } else bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\"")); @@ -1051,7 +1072,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MOUSE_TRIPLE: if (cmd.button() == mouse_button::button1) { - selection_possible = true; cursorHome(cur); cur.resetAnchor(); cursorEnd(cur); @@ -1062,68 +1082,16 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MOUSE_DOUBLE: if (cmd.button() == mouse_button::button1) { - selection_possible = true; selectWord(cur, lyx::WHOLE_WORD_STRICT); bv->haveSelection(cur.selection()); } break; - case LFUN_MOUSE_MOTION: { - // Only use motion with button 1 - //if (cmd.button() != mouse_button::button1) - // return false; - // We want to use only motion events for which - // the button press event was on the drawing area too. - if (!selection_possible) { - lyxerr[Debug::ACTION] << "BufferView::Pimpl::" - "dispatch: no selection possible\n"; - lyxerr << "BufferView::Pimpl::dispatch: no selection possible\n"; - break; - } - - // ignore motions deeper nested than the real anchor - LCursor & bvcur = cur.bv().cursor(); - if (bvcur.selection() && bvcur.anchor_.size() < cur.size()) - break; - - CursorSlice old = cur.top(); - setCursorFromCoordinates(cur, cmd.x, cmd.y); - - // This is to allow jumping over large insets - // FIXME: shouldn't be top-text-specific - if (isMainText() && cur.top() == old) { - if (cmd.y - bv->top_y() >= bv->workHeight()) - cursorDown(cur); - else if (cmd.y - bv->top_y() < 0) - cursorUp(cur); - } - - // don't set anchor_ - bv->cursor().setCursor(cur, true); - lyxerr << "MOTION: " << bv->cursor() << endl; - break; - } - // Single-click on work area case LFUN_MOUSE_PRESS: { - // ok ok, this is a hack (for xforms) - // We shouldn't go further down as we really need to. Only do the - // scrolling and be done with this. Otherwise we may open some - // dialogs (Jug 20020424). - if (cmd.button() == mouse_button::button4) { - bv->scroll(-lyxrc.wheel_jump); - break; - } - - if (cmd.button() == mouse_button::button5) { - bv->scroll(lyxrc.wheel_jump); - break; - } - // Right click on a footnote flag opens float menu if (cmd.button() == mouse_button::button3) { cur.clearSelection(); - selection_possible = false; break; } @@ -1137,15 +1105,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) paste_internally = true; } - selection_possible = true; - // Clear the selection cur.clearSelection(); setCursorFromCoordinates(cur, cmd.x, cmd.y); cur.resetAnchor(); finishUndo(); - cur.x_target() = cursorX(cur.top()); + cur.setTargetX(); // Has the cursor just left the inset? if (bv->cursor().inMathed() && !cur.inMathed()) @@ -1154,10 +1120,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // Set cursor here. bv->cursor() = cur; - // Don't allow selection after a big jump. - if (bv->fitCursor()) - selection_possible = false; - // Insert primary selection with middle mouse // if there is a local selection in the current buffer, // insert this @@ -1166,22 +1128,53 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) bv->owner()->dispatch(FuncRequest(LFUN_PASTE)); else bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph")); - selection_possible = false; } break; } - case LFUN_MOUSE_RELEASE: { - // do nothing if we used the mouse wheel - if (cmd.button() == mouse_button::button4 - || cmd.button() == mouse_button::button5) { - cur.undispatched(); - break; - } + case LFUN_MOUSE_MOTION: { + // Only use motion with button 1 + //if (cmd.button() != mouse_button::button1) + // return false; - selection_possible = false; + // ignore motions deeper nested than the real anchor + LCursor & bvcur = cur.bv().cursor(); + if (bvcur.anchor_.hasPart(cur)) { + CursorSlice old = bvcur.top(); + + int const wh = bv->workHeight(); + int const y = std::max(0, std::min(wh - 1, cmd.y)); + setCursorFromCoordinates(cur, cmd.x, y); + cur.x_target() = cmd.x; + if (cmd.y >= wh) + cursorDown(cur); + else if (cmd.y < 0) + cursorUp(cur); + // This is to allow jumping over large insets + if (cur.top() == old) { + if (cmd.y >= wh) + cursorDown(cur); + else if (cmd.y < 0) + cursorUp(cur); + } + + if (cur.top() == old) + cur.noUpdate(); + else { + // don't set anchor_ + bvcur.setCursor(cur); + bvcur.selection() = true; + lyxerr << "MOTION: " << bv->cursor() << endl; + } + + } else + cur.undispatched(); + break; + } + + case LFUN_MOUSE_RELEASE: { if (cmd.button() == mouse_button::button2) break; @@ -1191,7 +1184,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) bv->switchKeyMap(); bv->owner()->updateMenubar(); - bv->owner()->updateToolbar(); + bv->owner()->updateToolbars(); break; } @@ -1245,9 +1238,19 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_INSERT_LABEL: { - InsetCommandParams p("label"); + // Try to generate a valid label + string const contents = cmd.argument.empty() ? + cur.getPossibleLabel() : cmd.argument; + + InsetCommandParams p("label", contents); string const data = InsetCommandMailer::params2string("label", p); - bv->owner()->getDialogs().show("label", data, 0); + + if (cmd.argument.empty()) { + bv->owner()->getDialogs().show("label", data, 0); + } else { + FuncRequest fr(LFUN_INSET_INSERT, data); + dispatch(cur, fr); + } break; } @@ -1274,11 +1277,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // Open the inset, and move the current selection // inside it. doInsertInset(cur, this, cmd, true, true); + cur.posRight(); break; case LFUN_INDEX_INSERT: // Just open the inset doInsertInset(cur, this, cmd, true, false); + cur.posRight(); break; case LFUN_INDEX_PRINT: @@ -1288,6 +1293,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_INSERT_PAGEBREAK: // do nothing fancy doInsertInset(cur, this, cmd, false, false); + cur.posRight(); break; case LFUN_DEPTH_MIN: @@ -1304,7 +1310,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_MATH_IMPORT_SELECTION: case LFUN_MATH_MODE: - mathDispatch(cur, cmd, false); + if (cmd.argument == "on") + // don't pass "on" as argument + mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false); + else + mathDispatch(cur, cmd, false); break; case LFUN_MATH_MACRO: @@ -1313,7 +1323,7 @@ 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)); @@ -1321,6 +1331,14 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) } break; + // passthrough hat and underscore outside mathed: + case LFUN_SUBSCRIPT: + mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "_"), false); + break; + case LFUN_SUPERSCRIPT: + mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "^"), false); + break; + case LFUN_INSERT_MATH: case LFUN_INSERT_MATRIX: case LFUN_MATH_DELIM: { @@ -1424,21 +1442,21 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_FINISHED_LEFT: - lyxerr << "handle LFUN_FINISHED_LEFT:\n" << cur << endl; + lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl; break; case LFUN_FINISHED_RIGHT: - lyxerr << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl; + lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl; ++cur.pos(); break; case LFUN_FINISHED_UP: - lyxerr << "handle LFUN_FINISHED_UP:\n" << cur << endl; + lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl; cursorUp(cur); break; case LFUN_FINISHED_DOWN: - lyxerr << "handle LFUN_FINISHED_DOWN:\n" << cur << endl; + lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl; cursorDown(cur); break; @@ -1460,7 +1478,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) InsetBase & inset = cur.inset(); bool const accept = !inset.forceDefaultParagraphs(&inset); - data = "update " + tostr(accept) + '\n' + data; + data = "update " + convert(accept) + '\n' + data; bv->owner()->getDialogs().update("paragraph", data); break; } @@ -1504,6 +1522,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) setLayout(cur, tclass.defaultLayoutName()); setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0); insertInset(cur, new InsetFloatList(cmd.argument)); + cur.posRight(); } else { lyxerr << "Non-existent float type: " << cmd.argument << endl; @@ -1573,14 +1592,25 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; default: + lyxerr << BOOST_CURRENT_FUNCTION + << " Not DISPATCHED by LyXText" << endl; cur.undispatched(); break; } + + if (!needsUpdate + && &oldTopSlice.inset() == &cur.inset() + && oldTopSlice.idx() == cur.idx() + && !sel + && !cur.selection()) + cur.noUpdate(); + else + cur.needsUpdate(); } bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, - FuncStatus & flag) const + FuncStatus & flag) const { BOOST_ASSERT(cur.text() == this); LyXFont const & font = real_current_font; @@ -1597,7 +1627,8 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, break; case LFUN_INSET_OPTARG: - enable = cur.paragraph().layout()->optionalargs; + enable = numberOfOptArgs(cur.paragraph()) + < cur.paragraph().layout()->optionalargs; break; case LFUN_APPENDIX: @@ -1606,117 +1637,117 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, #if 0 // the functions which insert insets - InsetOld::Code code = InsetOld::NO_CODE; + InsetBase::Code code = InsetBase::NO_CODE; switch (cmd.action) { case LFUN_DIALOG_SHOW_NEW_INSET: if (cmd.argument == "bibitem") - code = InsetOld::BIBITEM_CODE; + code = InsetBase::BIBITEM_CODE; else if (cmd.argument == "bibtex") - code = InsetOld::BIBTEX_CODE; + code = InsetBase::BIBTEX_CODE; else if (cmd.argument == "box") - code = InsetOld::BOX_CODE; + code = InsetBase::BOX_CODE; else if (cmd.argument == "branch") - code = InsetOld::BRANCH_CODE; + code = InsetBase::BRANCH_CODE; else if (cmd.argument == "citation") - code = InsetOld::CITE_CODE; + code = InsetBase::CITE_CODE; else if (cmd.argument == "ert") - code = InsetOld::ERT_CODE; + code = InsetBase::ERT_CODE; else if (cmd.argument == "external") - code = InsetOld::EXTERNAL_CODE; + code = InsetBase::EXTERNAL_CODE; else if (cmd.argument == "float") - code = InsetOld::FLOAT_CODE; + code = InsetBase::FLOAT_CODE; else if (cmd.argument == "graphics") - code = InsetOld::GRAPHICS_CODE; + code = InsetBase::GRAPHICS_CODE; else if (cmd.argument == "include") - code = InsetOld::INCLUDE_CODE; + code = InsetBase::INCLUDE_CODE; else if (cmd.argument == "index") - code = InsetOld::INDEX_CODE; + code = InsetBase::INDEX_CODE; else if (cmd.argument == "label") - code = InsetOld::LABEL_CODE; + code = InsetBase::LABEL_CODE; else if (cmd.argument == "note") - code = InsetOld::NOTE_CODE; + code = InsetBase::NOTE_CODE; else if (cmd.argument == "ref") - code = InsetOld::REF_CODE; + code = InsetBase::REF_CODE; else if (cmd.argument == "toc") - code = InsetOld::TOC_CODE; + code = InsetBase::TOC_CODE; else if (cmd.argument == "url") - code = InsetOld::URL_CODE; + code = InsetBase::URL_CODE; else if (cmd.argument == "vspace") - code = InsetOld::VSPACE_CODE; + code = InsetBase::VSPACE_CODE; else if (cmd.argument == "wrap") - code = InsetOld::WRAP_CODE; + code = InsetBase::WRAP_CODE; break; case LFUN_INSET_ERT: - code = InsetOld::ERT_CODE; + code = InsetBase::ERT_CODE; break; case LFUN_INSET_FOOTNOTE: - code = InsetOld::FOOT_CODE; + code = InsetBase::FOOT_CODE; break; case LFUN_TABULAR_INSERT: - code = InsetOld::TABULAR_CODE; + code = InsetBase::TABULAR_CODE; break; case LFUN_INSET_MARGINAL: - code = InsetOld::MARGIN_CODE; + code = InsetBase::MARGIN_CODE; break; case LFUN_INSET_FLOAT: case LFUN_INSET_WIDE_FLOAT: - code = InsetOld::FLOAT_CODE; + code = InsetBase::FLOAT_CODE; break; case LFUN_INSET_WRAP: - code = InsetOld::WRAP_CODE; + code = InsetBase::WRAP_CODE; break; case LFUN_FLOAT_LIST: - code = InsetOld::FLOAT_LIST_CODE; + code = InsetBase::FLOAT_LIST_CODE; break; #if 0 case LFUN_INSET_LIST: - code = InsetOld::LIST_CODE; + code = InsetBase::LIST_CODE; break; case LFUN_INSET_THEOREM: - code = InsetOld::THEOREM_CODE; + code = InsetBase::THEOREM_CODE; break; #endif case LFUN_INSET_CAPTION: - code = InsetOld::CAPTION_CODE; + code = InsetBase::CAPTION_CODE; break; case LFUN_INSERT_NOTE: - code = InsetOld::NOTE_CODE; + code = InsetBase::NOTE_CODE; break; case LFUN_INSERT_CHARSTYLE: - code = InsetOld::CHARSTYLE_CODE; + code = InsetBase::CHARSTYLE_CODE; if (buf->params().getLyXTextClass().charstyles().empty()) enable = false; break; case LFUN_INSERT_BOX: - code = InsetOld::BOX_CODE; + code = InsetBase::BOX_CODE; break; case LFUN_INSERT_BRANCH: - code = InsetOld::BRANCH_CODE; + code = InsetBase::BRANCH_CODE; if (buf->params().branchlist().empty()) enable = false; break; case LFUN_INSERT_LABEL: - code = InsetOld::LABEL_CODE; + code = InsetBase::LABEL_CODE; break; case LFUN_INSET_OPTARG: - code = InsetOld::OPTARG_CODE; + code = InsetBase::OPTARG_CODE; break; case LFUN_ENVIRONMENT_INSERT: - code = InsetOld::BOX_CODE; + code = InsetBase::BOX_CODE; break; case LFUN_INDEX_INSERT: - code = InsetOld::INDEX_CODE; + code = InsetBase::INDEX_CODE; break; case LFUN_INDEX_PRINT: - code = InsetOld::INDEX_PRINT_CODE; + code = InsetBase::INDEX_PRINT_CODE; break; case LFUN_TOC_INSERT: - code = InsetOld::TOC_CODE; + code = InsetBase::TOC_CODE; break; case LFUN_HTMLURL: case LFUN_URL: - code = InsetOld::URL_CODE; + code = InsetBase::URL_CODE; break; case LFUN_QUOTE: // always allow this, since we will inset a raw quote @@ -1728,22 +1759,22 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_MENU_SEPARATOR: case LFUN_LDOTS: case LFUN_END_OF_SENTENCE: - code = InsetOld::SPECIALCHAR_CODE; + code = InsetBase::SPECIALCHAR_CODE; break; case LFUN_SPACE_INSERT: // slight hack: we know this is allowed in math mode if (cur.inTexted()) - code = InsetOld::SPACE_CODE; + code = InsetBase::SPACE_CODE; break; case LFUN_INSET_DIALOG_SHOW: { InsetBase * inset = cur.nextInset(); enable = inset; if (inset) { code = inset->lyxCode(); - if (!(code == InsetOld::INCLUDE_CODE - || code == InsetOld::BIBTEX_CODE - || code == InsetOld::FLOAT_LIST_CODE - || code == InsetOld::TOC_CODE)) + if (!(code == InsetBase::INCLUDE_CODE + || code == InsetBase::BIBTEX_CODE + || code == InsetBase::FLOAT_LIST_CODE + || code == InsetBase::TOC_CODE)) enable = false; } break; @@ -1752,7 +1783,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, break; } - if (code != InsetOld::NO_CODE + if (code != InsetBase::NO_CODE && (cur.empty() || !cur.inset().insetAllowed(code))) enable = false; @@ -1808,8 +1839,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_DELETE_LINE_FORWARD: case LFUN_WORDRIGHT: case LFUN_WORDLEFT: - case LFUN_ENDBUF: - case LFUN_BEGINNINGBUF: case LFUN_RIGHT: case LFUN_RIGHTSEL: case LFUN_LEFT: @@ -1882,6 +1911,8 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_INSERT_MATH: case LFUN_INSERT_MATRIX: case LFUN_MATH_DELIM: + case LFUN_SUBSCRIPT: + case LFUN_SUPERSCRIPT: case LFUN_DEFAULT: case LFUN_UNDERLINE: case LFUN_FONT_SIZE: @@ -1914,13 +1945,16 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_PARAGRAPH_APPLY: case LFUN_ESCAPE: case LFUN_KEYMAP_TOGGLE: + case LFUN_ENDBUF: + case LFUN_BEGINNINGBUF: + case LFUN_BEGINNINGBUFSEL: + case LFUN_ENDBUFSEL: // these are handled in our dispatch() enable = true; break; default: - enable = false; - break; + return false; } flag.enabled(enable); return true;