#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "coordcache.h"
+#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "factory.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include "mathed/math_hullinset.h"
-#include "mathed/formulamacro.h"
+#include "mathed/math_macrotemplate.h"
#include <clocale>
+#include <sstream>
using lyx::pos_type;
+using lyx::cap::copySelection;
+using lyx::cap::cutSelection;
+using lyx::cap::pasteSelection;
+using lyx::cap::replaceSelection;
+
using lyx::support::isStrUnsignedInt;
using lyx::support::strToUnsignedInt;
using lyx::support::atoi;
if (font.language() != ignore_language ||
font.number() != LyXFont::IGNORE) {
Paragraph & par = cur.paragraph();
- text->bidi.computeTables(par, *cur.bv().buffer(), cur.textRow());
+ text->bidi.computeTables(par, cur.buffer(), cur.textRow());
if (cur.boundary() !=
- text->bidi.isBoundary(*cur.bv().buffer(), par,
+ text->bidi.isBoundary(cur.buffer(), par,
cur.pos(),
text->real_current_font))
text->setCursor(cur, cur.par(), cur.pos(),
}
- void mathDispatch(LCursor & cur, LyXText * text,
- FuncRequest const & cmd, bool display)
+ void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
{
recordUndo(cur);
string sel = cur.selectionAsString(false);
lyxerr << "selection is: '" << sel << "'" << endl;
if (sel.empty()) {
+ const int old_pos = cur.pos();
cur.insert(new MathHullInset);
- cur.dispatch(FuncRequest(LFUN_RIGHT));
+ 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
} else {
// create a macro if we see "\\newcommand" somewhere, and an ordinary
// formula otherwise
- text->cutSelection(cur, true, true);
+ cutSelection(cur, true, true);
if (sel.find("\\newcommand") == string::npos
&& sel.find("\\def") == string::npos)
{
cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
} else {
- cur.insert(new InsetFormulaMacro(sel));
- cur.dispatch(FuncRequest(LFUN_RIGHT));
+ istringstream is(sel);
+ cur.insert(new MathMacroTemplate(is));
}
}
cur.message(N_("Math editor mode"));
}
-
-//takes absolute x,y coordinates
-InsetBase * LyXText::checkInsetHit(int x, int y)
-{
- ParagraphList::iterator pit;
- ParagraphList::iterator end;
-
- getParsInRange(paragraphs(),
- bv()->top_y() - yo_,
- bv()->top_y() - yo_ + bv()->workHeight(),
- pit, end);
-
- lyxerr << "checkInsetHit: x: " << x << " y: " << y << endl;
- for ( ; pit != end; ++pit) {
- InsetList::iterator iit = pit->insetlist.begin();
- InsetList::iterator iend = pit->insetlist.end();
- for ( ; iit != iend; ++iit) {
- InsetBase * inset = iit->inset;
-#if 1
- lyxerr << "examining inset " << inset
- //<< " xo/yo: " << inset->xo() << "/" << inset->yo()
- << " 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<InsetOld_code> const & codes, string const & contents)
{
BOOST_ASSERT(this == cur.text());
- ParagraphList::iterator end = paragraphs().end();
- ParagraphList::iterator pit = getPar(cur.par());
+ par_type end = paragraphs().size();
+ par_type pit = cur.par();
pos_type pos = cur.pos();
InsetBase * inset;
do {
- if (pos + 1 < pit->size()) {
+ if (pos + 1 < pars_[pit].size()) {
++pos;
} else {
++pit;
}
} while (pit != end &&
- !(pit->isInset(pos) &&
- (inset = pit->getInset(pos)) != 0 &&
+ !(pars_[pit].isInset(pos) &&
+ (inset = pars_[pit].getInset(pos)) != 0 &&
find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() &&
(contents.empty() ||
- static_cast<InsetCommand *>(pit->getInset(pos))->getContents()
+ static_cast<InsetCommand *>(pars_[pit].getInset(pos))->getContents()
== contents)));
if (pit == end)
return false;
- setCursor(cur, parOffset(pit), pos, false);
+ setCursor(cur, pit, pos, false);
return true;
}
cur.message(_("No more insets"));
}
}
- cur.update();
cur.resetAnchor();
}
void LyXText::cursorPrevious(LCursor & cur)
{
pos_type cpos = cur.pos();
- lyx::paroffset_type cpar = cur.par();
+ lyx::par_type cpar = cur.par();
int x = cur.x_target();
- int y = bv()->top_y();
+ int y = cur.bv().top_y();
setCursorFromCoordinates(cur, x, y);
if (cpar == cur.par() && cpos == cur.pos()) {
cursorUp(cur);
}
- bv()->updateScrollbar();
+ cur.bv().updateScrollbar();
finishUndo();
}
void LyXText::cursorNext(LCursor & cur)
{
pos_type cpos = cur.pos();
- lyx::paroffset_type cpar = cur.par();
+ lyx::par_type cpar = cur.par();
int x = cur.x_target();
- int y = bv()->top_y() + bv()->workHeight();
+ int y = cur.bv().top_y() + cur.bv().workHeight();
setCursorFromCoordinates(cur, x, y);
if (cpar == cur.par() && cpos == cur.pos()) {
cursorDown(cur);
}
- bv()->updateScrollbar();
+ cur.bv().updateScrollbar();
finishUndo();
}
namespace {
-void specialChar(LCursor & cur, LyXText * text, InsetSpecialChar::Kind kind)
+void specialChar(LCursor & cur, InsetSpecialChar::Kind kind)
{
- text->replaceSelection(cur);
+ lyx::cap::replaceSelection(cur);
cur.insert(new InsetSpecialChar(kind));
- cur.update();
}
gotsel = true;
}
text->insertInset(cur, inset);
+
if (edit)
inset->edit(cur, true);
+
if (gotsel && pastesel)
cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
}
BOOST_ASSERT(cur.text() == this);
BufferView * bv = &cur.bv();
CursorSlice sl = cur.top();
+ bool sel = cur.selection();
+ bool moving = false;
switch (cmd.action) {
bool start = !par.params().startOfAppendix();
// ensure that we have only one start_of_appendix in this document
- ParagraphList::iterator tmp = paragraphs().begin();
- ParagraphList::iterator end = paragraphs().end();
-
- for (; tmp != end; ++tmp) {
- if (tmp->params().startOfAppendix()) {
- recUndo(parOffset(tmp));
- tmp->params().startOfAppendix(false);
+ for (par_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
+ if (pars_[tmp].params().startOfAppendix()) {
+ recUndo(tmp);
+ pars_[tmp].params().startOfAppendix(false);
redoParagraph(tmp);
break;
}
// we can set the refreshing parameters now
updateCounters();
redoParagraph(cur);
- cur.update();
break;
}
break;
case LFUN_WORDRIGHT:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
if (isRTL(cur.paragraph()))
break;
case LFUN_WORDLEFT:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
if (isRTL(cur.paragraph()))
break;
case LFUN_BEGINNINGBUF:
- if (!cur.mark())
- cur.clearSelection();
- cursorTop(cur);
- finishChange(cur, false);
+ if (cur.size() == 1) {
+ if (!cur.mark())
+ cur.clearSelection();
+ cursorTop(cur);
+ finishChange(cur, false);
+ } else {
+ cur.undispatched();
+ }
break;
case LFUN_ENDBUF:
- if (!cur.mark())
- cur.clearSelection();
- cursorBottom(cur);
- finishChange(cur, false);
+ if (cur.size() == 1) {
+ if (!cur.mark())
+ cur.clearSelection();
+ cursorBottom(cur);
+ finishChange(cur, false);
+ } else {
+ cur.undispatched();
+ }
break;
case LFUN_RIGHT:
+ moving = true;
case LFUN_RIGHTSEL:
+ //lyxerr << "handle LFUN_RIGHT[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_RIGHTSEL);
if (isRTL(cur.paragraph()))
cursorLeft(cur);
else
cursorRight(cur);
- if (sl == cur.top())
+ if (sl == cur.top()) {
+ 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);
else
cursorLeft(cur);
- if (sl == cur.top())
+ if (sl == cur.top()) {
+ cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ }
break;
case LFUN_UP:
+ moving = true;
case LFUN_UPSEL:
+ //lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_UPSEL);
cursorUp(cur);
- if (sl == cur.top())
+ if (sl == cur.top()) {
+ cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
+ }
break;
case LFUN_DOWN:
+ moving = true;
case LFUN_DOWNSEL:
+ //lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_DOWNSEL);
cursorDown(cur);
- if (sl == cur.top())
+ if (sl == cur.top()) {
+ cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_DOWN);
+ }
break;
case LFUN_UP_PARAGRAPHSEL:
}
case LFUN_UP_PARAGRAPH:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
cursorUpParagraph(cur);
break;
case LFUN_DOWN_PARAGRAPH:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
cursorDownParagraph(cur);
break;
case LFUN_PRIOR:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
finishChange(cur, false);
- if (cur.par() == 0 && cur.textRow().pos() == 0)
+ if (cur.par() == 0 && cur.textRow().pos() == 0) {
+ cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
- else
+ } else {
cursorPrevious(cur);
+ }
break;
case LFUN_NEXT:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
finishChange(cur, false);
if (cur.par() == cur.lastpar()
- && cur.textRow().endpos() == cur.lastpos())
+ && cur.textRow().endpos() == cur.lastpos()) {
+ cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_DOWN);
- else
+ } else {
cursorNext(cur);
+ }
break;
case LFUN_HOME:
case LFUN_BREAKLINE: {
// Not allowed by LaTeX (labels or empty par)
if (cur.pos() > cur.paragraph().beginOfBody()) {
- replaceSelection(cur);
+ lyx::cap::replaceSelection(cur);
cur.insert(new InsetNewline);
moveCursor(cur, false);
}
} else {
cutSelection(cur, true, false);
}
- cur.update();
break;
cutSelection(cur, true, false);
}
bv->switchKeyMap();
- cur.update();
break;
case LFUN_BACKSPACE_SKIP:
// Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
if (!cur.selection()) {
+#ifdef WITH_WARNINGS
#warning look here
+#endif
//CursorSlice cur = cursor();
backspace(cur);
//anchor() = cur;
} else {
cutSelection(cur, true, false);
}
- cur.update();
break;
case LFUN_BREAKPARAGRAPH:
- replaceSelection(cur);
+ lyx::cap::replaceSelection(cur);
breakParagraph(cur, 0);
- cur.update();
cur.resetAnchor();
bv->switchKeyMap();
break;
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- replaceSelection(cur);
+ lyx::cap::replaceSelection(cur);
breakParagraph(cur, 1);
- cur.update();
cur.resetAnchor();
bv->switchKeyMap();
break;
case LFUN_BREAKPARAGRAPH_SKIP: {
// When at the beginning of a paragraph, remove
- // indentation and add a "defskip" at the top.
- // Otherwise, do the same as LFUN_BREAKPARAGRAPH.
- replaceSelection(cur);
- if (cur.pos() == 0) {
- ParagraphParameters & params = cur.paragraph().params();
- setParagraph(cur,
- params.spacing(),
- params.align(),
- params.labelWidthString(), 1);
- } else {
+ // indentation. Otherwise, do the same as LFUN_BREAKPARAGRAPH.
+ lyx::cap::replaceSelection(cur);
+ if (cur.pos() == 0)
+ cur.paragraph().params().labelWidthString(string());
+ else
breakParagraph(cur, 0);
- }
- cur.update();
-// anchor() = cur;
+ cur.resetAnchor();
bv->switchKeyMap();
break;
}
if (cur_spacing != new_spacing || cur_value != new_value) {
par.params().spacing(Spacing(new_spacing, new_value));
redoParagraph(cur);
- cur.update();
}
break;
}
case LFUN_INSET_INSERT: {
recordUndo(cur);
InsetBase * inset = createInset(bv, cmd);
- if (inset)
+ if (inset) {
insertInset(cur, inset);
+ cur.posRight();
+ }
break;
}
cur.inset().asUpdatableInset()->showInsetDialog(bv);
break;
- case LFUN_INSET_TOGGLE:
+ case LFUN_NEXT_INSET_TOGGLE: {
+ InsetBase * inset = cur.nextInset();
+ if (inset) {
+ cur.clearSelection();
+ FuncRequest fr = cmd;
+ fr.action = LFUN_INSET_TOGGLE;
+ inset->dispatch(cur, fr);
+ }
+ break;
+ }
+
+ case LFUN_KEYMAP_TOGGLE:
cur.clearSelection();
- if (!toggleInset(cur))
- cur.undispatched();
- else
- bv->switchKeyMap();
+ bv->switchKeyMap();
break;
case LFUN_SPACE_INSERT:
break;
case LFUN_HYPHENATION:
- specialChar(cur, this, InsetSpecialChar::HYPHENATION);
+ specialChar(cur, InsetSpecialChar::HYPHENATION);
break;
case LFUN_LIGATURE_BREAK:
- specialChar(cur, this, InsetSpecialChar::LIGATURE_BREAK);
+ specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
break;
case LFUN_LDOTS:
- specialChar(cur, this, InsetSpecialChar::LDOTS);
+ specialChar(cur, InsetSpecialChar::LDOTS);
break;
case LFUN_END_OF_SENTENCE:
- specialChar(cur, this, InsetSpecialChar::END_OF_SENTENCE);
+ specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
break;
case LFUN_MENU_SEPARATOR:
- specialChar(cur, this, InsetSpecialChar::MENU_SEPARATOR);
+ specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
break;
case LFUN_UPCASE_WORD:
changeCase(cur, LyXText::text_uppercase);
- cur.update();
break;
case LFUN_LOWCASE_WORD:
changeCase(cur, LyXText::text_lowercase);
- cur.update();
break;
case LFUN_CAPITALIZE_WORD:
changeCase(cur, LyXText::text_capitalization);
- cur.update();
break;
case LFUN_TRANSPOSE_CHARS:
recordUndo(cur);
redoParagraph(cur);
- cur.update();
break;
case LFUN_PASTE:
cur.message(_("Paste"));
- replaceSelection(cur);
+ 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));
else
pasteSelection(cur, 0);
cur.clearSelection(); // bug 393
- cur.update();
bv->switchKeyMap();
finishUndo();
break;
case LFUN_CUT:
cutSelection(cur, true, true);
cur.message(_("Cut"));
- cur.update();
break;
case LFUN_COPY:
if (!change_layout && cur.selection() &&
cur.selBegin().par() != cur.selEnd().par())
{
- ParagraphList::iterator spit = getPar(cur.selBegin());
- ParagraphList::iterator epit = boost::next(getPar(cur.selEnd()));
+ par_type spit = cur.selBegin().par();
+ par_type epit = cur.selEnd().par() + 1;
while (spit != epit) {
- if (spit->layout()->name() != current_layout) {
+ if (pars_[spit].layout()->name() != current_layout) {
change_layout = true;
break;
}
current_layout = layout;
setLayout(cur, layout);
bv->owner()->setLayout(layout);
- cur.update();
bv->switchKeyMap();
}
break;
insertStringAsParagraphs(cur, clip);
else
insertStringAsLines(cur, clip);
- cur.update();
}
break;
}
}
case LFUN_QUOTE: {
- replaceSelection(cur);
+ lyx::cap::replaceSelection(cur);
Paragraph & par = cur.paragraph();
lyx::pos_type pos = cur.pos();
char c;
c = par.getChar(pos - 1);
LyXLayout_ptr const & style = par.layout();
-
+
BufferParams const & bufparams = bv->buffer()->params();
if (!style->pass_thru
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
- string arg = cmd.argument;
+ string arg = cmd.argument;
if (arg == "single")
cur.insert(new InsetQuotes(c,
- bufparams.quotes_language,
+ bufparams.quotes_language,
InsetQuotes::SingleQ));
else if (arg == "double")
cur.insert(new InsetQuotes(c,
- bufparams.quotes_language,
+ bufparams.quotes_language,
InsetQuotes::DoubleQ));
else
- cur.insert(new InsetQuotes(c, bufparams));
+ cur.insert(new InsetQuotes(c, bufparams));
+ cur.posRight();
}
else
bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
}
case LFUN_DATE_INSERT: {
- replaceSelection(cur);
+ lyx::cap::replaceSelection(cur);
time_t now_time_t = time(NULL);
struct tm * now_tm = localtime(&now_time_t);
setlocale(LC_TIME, "");
}
break;
- case LFUN_MOUSE_MOTION: {
- // Only use motion with button 1
- //if (cmd.button() != mouse_button::button1)
- // return false;
- // The test for not selection possible is needed, that
- // only motion events are used, where the bottom press
- // event was on the drawing area too
- if (!selection_possible) {
- lyxerr[Debug::ACTION] << "BufferView::Pimpl::"
- "Dispatch: no selection possible\n";
- 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, false);
- 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 should 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();
finishUndo();
cur.x_target() = cursorX(cur.top());
- // set cursor and anchor to this position
+ // 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;
+ // Don't allow selection after a big jump.
if (bv->fitCursor())
selection_possible = false;
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();
+ 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.anchor_.hasPart(cur)) {
+ 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);
+ bv->cursor().selection() = true;
+ lyxerr << "MOTION: " << bv->cursor() << endl;
+ }
+ break;
+ }
+
+ case LFUN_MOUSE_RELEASE: {
selection_possible = false;
if (cmd.button() == mouse_button::button2)
bv->switchKeyMap();
bv->owner()->updateMenubar();
- bv->owner()->updateToolbar();
+ bv->owner()->updateToolbars();
break;
}
}
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;
}
// 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:
case LFUN_INSERT_PAGEBREAK:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
+ cur.posRight();
break;
case LFUN_DEPTH_MIN:
changeDepth(cur, DEC_DEPTH);
- cur.update();
break;
case LFUN_DEPTH_PLUS:
changeDepth(cur, INC_DEPTH);
- cur.update();
break;
case LFUN_MATH_DISPLAY:
- mathDispatch(cur, this, cmd, true);
+ mathDispatch(cur, cmd, true);
break;
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
- mathDispatch(cur, this, cmd, false);
+ mathDispatch(cur, cmd, false);
break;
case LFUN_MATH_MACRO:
int const nargs = s1.empty() ? 0 : atoi(s1);
string const s2 = token(s, ' ', 2);
string const type = s2.empty() ? "newcommand" : s2;
- cur.insert(new InsetFormulaMacro(token(s, ' ', 0), nargs, s2));
- cur.nextInset()->edit(cur, true);
+ cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, s2));
+ //cur.nextInset()->edit(cur, true);
}
break;
}
case LFUN_FINISHED_LEFT:
- lyxerr << "handle LFUN_FINISHED_LEFT" << endl;
- if (isRTL(cur.paragraph()))
- cursorLeft(cur);
- cur.bv().cursor() = cur;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
break;
case LFUN_FINISHED_RIGHT:
- lyxerr << "handle LFUN_FINISHED_RIGHT" << endl;
- if (!isRTL(cur.paragraph()))
- cursorRight(cur);
- cur.bv().cursor() = cur;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
+ ++cur.pos();
break;
case LFUN_FINISHED_UP:
- lyxerr << "handle LFUN_FINISHED_UP" << endl;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl;
cursorUp(cur);
- cur.bv().cursor() = cur;
break;
case LFUN_FINISHED_DOWN:
- lyxerr << "handle LFUN_FINISHED_DOWN" << endl;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
cursorDown(cur);
- cur.bv().cursor() = cur;
break;
case LFUN_LAYOUT_PARAGRAPH: {
case LFUN_ACCEPT_CHANGE: {
acceptChange(cur);
- cur.update();
break;
}
case LFUN_REJECT_CHANGE: {
rejectChange(cur);
- cur.update();
break;
}
params.align(),
params.labelWidthString(),
params.noindent());
- cur.update();
cur.message(_("Paragraph layout set"));
break;
}
}
case LFUN_ESCAPE:
- if (cur.selection())
+ if (cur.selection()) {
cur.selection() = false;
- else
+ } else {
+ cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ }
break;
default:
cur.undispatched();
break;
}
+
+ // avoid to update when navigating
+ if (moving
+ && &sl.inset() == &cur.inset()
+ && sl.idx() == cur.idx()
+ && sel == false
+ && cur.selection() == false)
+ cur.noUpdate();
}
case LFUN_LDOTS:
case LFUN_END_OF_SENTENCE:
case LFUN_SPACE_INSERT:
- case LFUN_INSET_DIALOG_SHOW:
+ case LFUN_INSET_DIALOG_SHOW:
break;
case LFUN_EMPH:
case LFUN_DELETE_LINE_FORWARD:
case LFUN_WORDRIGHT:
case LFUN_WORDLEFT:
- case LFUN_ENDBUF:
case LFUN_RIGHT:
case LFUN_RIGHTSEL:
case LFUN_LEFT:
case LFUN_PARAGRAPH_SPACING:
case LFUN_INSET_APPLY:
case LFUN_INSET_INSERT:
- case LFUN_INSET_TOGGLE:
+ case LFUN_NEXT_INSET_TOGGLE:
case LFUN_UPCASE_WORD:
case LFUN_LOWCASE_WORD:
case LFUN_CAPITALIZE_WORD:
case LFUN_THESAURUS_ENTRY:
case LFUN_PARAGRAPH_APPLY:
case LFUN_ESCAPE:
+ case LFUN_KEYMAP_TOGGLE:
// these are handled in our dispatch()
enable = true;
break;
+ case LFUN_ENDBUF:
+ case LFUN_BEGINNINGBUF:
+ enable = true;
+ break;
+
default:
enable = false;
break;
projects / lyx.git / blobdiff