}
}
// One such was found:
- pit_type newpit = std::distance(bgn, dest);
- pit_type const len = std::distance(start, finish);
+ pit_type newpit = distance(bgn, dest);
+ pit_type const len = distance(start, finish);
buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
pars.insert(dest, start, finish);
start = boost::next(bgn, pit);
case LFUN_WORD_RIGHT:
case LFUN_WORD_RIGHT_SELECT:
- //FIXME: for visual cursor mode, really move right
- if (reverseDirectionNeeded(cur)) {
- cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
- LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+ if (lyxrc.visual_cursor) {
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_RIGHT_SELECT);
+ needsUpdate |= cursorVisRightOneWord(cur);
+ if (!needsUpdate && oldTopSlice == cur.top()
+ && cur.boundary() == oldBoundary) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ }
} else {
- cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
- LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
+ LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
+ LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+ }
+ dispatch(cur, cmd);
+ return;
}
- dispatch(cur, cmd);
- return;
+ break;
case LFUN_WORD_FORWARD:
case LFUN_WORD_FORWARD_SELECT:
case LFUN_WORD_LEFT:
case LFUN_WORD_LEFT_SELECT:
- //FIXME: for visual cursor mode, really move left
- if (reverseDirectionNeeded(cur)) {
- cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
- LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+ if (lyxrc.visual_cursor) {
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_LEFT_SELECT);
+ needsUpdate |= cursorVisLeftOneWord(cur);
+ if (!needsUpdate && oldTopSlice == cur.top()
+ && cur.boundary() == oldBoundary) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ }
} else {
- cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
- LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
+ LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
+ LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+ }
+ dispatch(cur, cmd);
+ return;
}
- dispatch(cur, cmd);
- return;
+ break;
case LFUN_WORD_BACKWARD:
case LFUN_WORD_BACKWARD_SELECT:
break;
case LFUN_INSET_SETTINGS: {
- // if there is an inset at cursor, access this
- Inset * inset = cur.nextInset();
- if (inset) {
- inset->showInsetDialog(bv);
+ Inset & inset = cur.inset();
+ if (cmd.getArg(0) == insetName(inset.lyxCode())) {
+ // This inset dialog has been explicitely requested.
+ inset.showInsetDialog(bv);
+ break;
+ }
+ // else, if there is an inset at the cursor, access this
+ Inset * next_inset = cur.nextInset();
+ if (next_inset) {
+ next_inset->showInsetDialog(bv);
break;
}
- // if not work, access the underlying inset.
- cur.inset().showInsetDialog(bv);
+ // if not then access the underlying inset.
+ inset.showInsetDialog(bv);
break;
}
break;
}
- case LFUN_SERVER_GET_FONT:
- if (cur.current_font.fontInfo().shape() == ITALIC_SHAPE)
- cur.message(from_ascii("E"));
- else if (cur.current_font.fontInfo().shape() == SMALLCAPS_SHAPE)
- cur.message(from_ascii("N"));
- else
- cur.message(from_ascii("0"));
- break;
-
case LFUN_SERVER_GET_LAYOUT:
cur.message(cur.paragraph().layout().name());
break;
case LFUN_CHARS_TRANSPOSE:
case LFUN_SERVER_GET_XY:
case LFUN_SERVER_SET_XY:
- case LFUN_SERVER_GET_FONT:
case LFUN_SERVER_GET_LAYOUT:
case LFUN_LAYOUT:
case LFUN_DATE_INSERT: