anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug #1839: Allow Ctrl+Arrow to move between table cells.

Browse Source 
see r35812.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36864 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-12-13 12:54:03 +00:00
parent e9807a7e80
commit 50e1309784
3 changed files with 69 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Text3.cpp
View File

@ -766,6 +766,25 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_WORD_FORWARD_SELECT:
needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
needsUpdate |= cursorForwardOneWord(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_FORWARD);
// we will probably be moving out the inset, so we should execute
// the depm-mechanism, but only when the cursor has a place to
// go outside this inset, i.e. in a slice above.
if (cur.depth() > 1 && cur.pos() == cur.lastpos()
&& cur.pit() == cur.lastpit()) {
// The cursor hasn't changed yet. To give the
// DEPM the possibility of doing something we must
// provide it with two different cursors.
Cursor dummy = cur;
dummy.pos() = dummy.pit() = 0;
cur.bv().checkDepm(dummy, cur);
}
}
break;
case LFUN_WORD_LEFT:
@ -795,6 +814,26 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_WORD_BACKWARD_SELECT:
needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
needsUpdate |= cursorBackwardOneWord(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
// we will probably be moving out the inset, so we should execute
// the depm-mechanism, but only when the cursor has a place to
// go outside this inset, i.e. in a slice above.
if (cur.depth() > 1 && cur.pos() == 0
&& cur.pit() == 0) {
// The cursor hasn't changed yet. To give the
// DEPM the possibility of doing something we must
// provide it with two different cursors.
Cursor dummy = cur;
dummy.pos() = cur.lastpos();
dummy.pit() = cur.lastpit();
cur.bv().checkDepm(dummy, cur);
}
}
break;
case LFUN_WORD_SELECT: {

38
src/insets/InsetTabular.cpp
View File

@ -3416,7 +3416,15 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_CHAR_RIGHT_SELECT:
case LFUN_CHAR_RIGHT:
case LFUN_CHAR_LEFT_SELECT:
case LFUN_CHAR_LEFT: {
case LFUN_CHAR_LEFT:
case LFUN_WORD_FORWARD:
case LFUN_WORD_FORWARD_SELECT:
case LFUN_WORD_BACKWARD:
case LFUN_WORD_BACKWARD_SELECT:
case LFUN_WORD_RIGHT:
case LFUN_WORD_RIGHT_SELECT:
case LFUN_WORD_LEFT:
case LFUN_WORD_LEFT_SELECT: {
// determine whether we move to next or previous cell, where to enter
// the new cell from, and which command to "finish" (i.e., exit the
// inset) with:
@ -3425,21 +3433,27 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
FuncCode finish_lfun;
if (cmd.action == LFUN_CHAR_FORWARD
|| cmd.action == LFUN_CHAR_FORWARD_SELECT) {
|| cmd.action == LFUN_CHAR_FORWARD_SELECT
|| cmd.action == LFUN_WORD_FORWARD
|| cmd.action == LFUN_WORD_FORWARD_SELECT) {
next_cell = true;
finish_lfun = LFUN_FINISHED_FORWARD;
}
else if (cmd.action == LFUN_CHAR_BACKWARD
|| cmd.action == LFUN_CHAR_BACKWARD_SELECT) {
|| cmd.action == LFUN_CHAR_BACKWARD_SELECT
|| cmd.action == LFUN_WORD_BACKWARD
|| cmd.action == LFUN_WORD_BACKWARD_SELECT) {
next_cell = false;
finish_lfun = LFUN_FINISHED_BACKWARD;
}
// LEFT or RIGHT commands --- the interpretation will depend on the
// table's direction.
else {
bool right = (cmd.action == LFUN_CHAR_RIGHT
|| cmd.action == LFUN_CHAR_RIGHT_SELECT);
next_cell = (isRightToLeft(cur) != right);
bool const right = cmd.action == LFUN_CHAR_RIGHT
|| cmd.action == LFUN_CHAR_RIGHT_SELECT
|| cmd.action == LFUN_WORD_RIGHT
|| cmd.action == LFUN_WORD_RIGHT_SELECT;
next_cell = isRightToLeft(cur) != right;
if (lyxrc.visual_cursor) {
entry_from = right ? ENTRY_DIRECTION_LEFT:ENTRY_DIRECTION_RIGHT;
@ -3451,10 +3465,14 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
finish_lfun = LFUN_FINISHED_LEFT;
}
bool const select = cmd.action == LFUN_CHAR_FORWARD_SELECT ||
cmd.action == LFUN_CHAR_BACKWARD_SELECT ||
cmd.action == LFUN_CHAR_RIGHT_SELECT ||
cmd.action == LFUN_CHAR_LEFT_SELECT;
bool const select = cmd.action == LFUN_CHAR_FORWARD_SELECT
|| cmd.action == LFUN_CHAR_BACKWARD_SELECT
|| cmd.action == LFUN_CHAR_RIGHT_SELECT
|| cmd.action == LFUN_CHAR_LEFT_SELECT
|| cmd.action == LFUN_WORD_FORWARD_SELECT
|| cmd.action == LFUN_WORD_RIGHT_SELECT
|| cmd.action == LFUN_WORD_BACKWARD_SELECT
|| cmd.action == LFUN_WORD_LEFT_SELECT;
// If we have a multicell selection or we're
// not doing some LFUN_*_SELECT thing anyway...

2
status.16x
View File

@ -35,6 +35,8 @@ What's new
+ Utilize read-only checkouts with "cvs edit".
+ Check for conflicts when doing checkIn/checkOut operation.
- Allow Ctrl+Arrow to move between table cells (bug 1839).
* DOCUMENTATION AND LOCALIZATION