}
-bool LyXText::cursorPrevious(LCursor & cur)
+void LyXText::cursorPrevious(LCursor & cur)
{
pos_type cpos = cur.pos();
pit_type cpar = cur.pit();
int x = cur.x_target();
+ // FIXME: there would maybe a need for this 'updated' boolean in the future...
bool updated = setCursorFromCoordinates(cur, x, 0);
- if (updated)
- cur.bv().update();
- updated |= cursorUp(cur);
+ if (cur.inMathed())
+ updated |= cur.up();
+ else
+ 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.
- updated |= cursorUp(cur);
+ if (cur.inMathed())
+ updated |= cur.up();
+ else
+ updated |= cursorUp(cur);
}
finishUndo();
- return updated;
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
-bool LyXText::cursorNext(LCursor & cur)
+void LyXText::cursorNext(LCursor & cur)
{
pos_type cpos = cur.pos();
pit_type cpar = cur.pit();
int x = cur.x_target();
+ // FIXME: there would maybe a need for this 'updated' boolean in the future...
bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
- if (updated)
- cur.bv().update();
- updated |= cursorDown(cur);
+ if (cur.inMathed())
+ updated |= cur.down();
+ else
+ 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.
- updated |= cursorDown(cur);
+ if (cur.inMathed())
+ updated |= cur.down();
+ else
+ updated |= cursorDown(cur);
}
finishUndo();
- return updated;
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
{
lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
+ // FIXME: We use the update flag to indicates wether a singlePar or a
+ // full screen update is needed. We reset it here but shall we restore it
+ // at the end?
+ cur.noUpdate();
+
BOOST_ASSERT(cur.text() == this);
BufferView * bv = &cur.bv();
CursorSlice oldTopSlice = cur.top();
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
} else {
- needsUpdate |= cursorPrevious(cur);
+ cursorPrevious(cur);
}
break;
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_DOWN);
} else {
- needsUpdate |= cursorNext(cur);
+ cursorNext(cur);
}
break;
paste_internally = true;
}
- bv->mouseSetCursor(cur);
+ // we have to update after dePM triggered
+ bool update = bv->mouseSetCursor(cur);
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
}
+ if (!update && cmd.button() == mouse_button::button1) {
+ needsUpdate = false;
+ cur.noUpdate();
+ }
+
break;
}
break;
// finish selection
- if (cmd.button() == mouse_button::button1)
- theSelection().haveSelection(cur.selection());
+ if (cmd.button() == mouse_button::button1) {
+ if (cur.selection())
+ theSelection().haveSelection(cur.selection());
+ needsUpdate = false;
+ cur.noUpdate();
+ }
bv->switchKeyMap();
break;
case LFUN_HFILL_INSERT:
case LFUN_LINE_INSERT:
case LFUN_PAGEBREAK_INSERT:
+ case LFUN_CLEARPAGE_INSERT:
+ case LFUN_CLEARDOUBLEPAGE_INSERT:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
cur.posRight();
}
needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
+
+ // FIXME: The cursor flag is reset two lines below
+ // so we need to check here if some of the LFUN did touch that.
+ // for now only LyXText::erase() and LyXText::backspace() do that.
+ // The plan is to verify all the LFUNs and then to remove this
+ // singleParUpdate boolean altogether.
+ if (cur.result().update() & Update::Force) {
+ singleParUpdate = false;
+ needsUpdate = true;
+ }
+
+ // FIXME: the following code should go in favor of fine grained
+ // update flag treatment.
if (singleParUpdate)
// Inserting characters does not change par height
if (cur.bottom().paragraph().dim().height()
return;
} else
needsUpdate = true;
+
if (!needsUpdate
&& &oldTopSlice.inset() == &cur.inset()
&& oldTopSlice.idx() == cur.idx()
- && !sel
+ && !sel // sel is a backup of cur.selection() at the biginning of the function.
&& !cur.selection())
- cur.noUpdate();
+ // FIXME: it would be better if we could just do this
+ //
+ //if (cur.result().update() != Update::FitCursor)
+ // cur.noUpdate();
+ //
+ // But some LFUNs do not set Update::FitCursor when needed, so we
+ // do it for all. This is not very harmfull as FitCursor will provoke
+ // a full redraw only if needed but still, a proper review of all LFUN
+ // should be done and this needsUpdate boolean can then be removed.
+ cur.updateFlags(Update::FitCursor);
else
cur.updateFlags(Update::Force | Update::FitCursor);
}
case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT:
- enable = true; // FIXME: Change tracking (MG)
+ // TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
+ // In principle, these LFUNs should only be enabled if there
+ // is a change at the current position/in the current selection.
+ // However, without proper optimizations, this will inevitably
+ // result in unacceptable performance - just imagine a user who
+ // wants to select the complete content of a long document.
+ enable = true;
break;
case LFUN_WORD_DELETE_FORWARD:
case LFUN_SELF_INSERT:
case LFUN_LINE_INSERT:
case LFUN_PAGEBREAK_INSERT:
+ case LFUN_CLEARPAGE_INSERT:
+ case LFUN_CLEARDOUBLEPAGE_INSERT:
case LFUN_MATH_DISPLAY:
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE: