void Text::dispatch(Cursor & cur, FuncRequest & cmd)
{
- LYXERR(Debug::ACTION) << "Text::dispatch: cmd: " << cmd << endl;
+ LYXERR(Debug::ACTION, "Text::dispatch: cmd: " << cmd);
// 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
case LFUN_CHAR_LEFT_SELECT:
//FIXME: for visual cursor, really move left
if (reverseDirectionNeeded(cur)) {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_LEFT_SELECT ?
- LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD));
+ cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
} else {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_LEFT_SELECT ?
- LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD));
+ cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
}
- break;
+ dispatch(cur, cmd);
+ return;
case LFUN_CHAR_RIGHT:
case LFUN_CHAR_RIGHT_SELECT:
//FIXME: for visual cursor, really move right
if (reverseDirectionNeeded(cur)) {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_RIGHT_SELECT ?
- LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD));
+ cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
} else {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_CHAR_RIGHT_SELECT ?
- LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD));
+ cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
}
- break;
+ dispatch(cur, cmd);
+ return;
case LFUN_UP_SELECT:
case LFUN_DOWN_SELECT:
case LFUN_WORD_RIGHT_SELECT:
//FIXME: for visual cursor mode, really move right
if (reverseDirectionNeeded(cur)) {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_WORD_RIGHT_SELECT ?
- LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD));
+ cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
+ LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
} else {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_WORD_RIGHT_SELECT ?
- LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD));
+ cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
+ LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
}
- break;
+ dispatch(cur, cmd);
+ return;
case LFUN_WORD_FORWARD:
case LFUN_WORD_FORWARD_SELECT:
case LFUN_WORD_LEFT_SELECT:
//FIXME: for visual cursor mode, really move left
if (reverseDirectionNeeded(cur)) {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_WORD_LEFT_SELECT ?
- LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD));
+ cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
+ LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
} else {
- lyx::dispatch(FuncRequest(
- cmd.action == LFUN_WORD_LEFT_SELECT ?
- LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD));
+ cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
+ LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
}
- break;
+ dispatch(cur, cmd);
+ return;
case LFUN_WORD_BACKWARD:
case LFUN_WORD_BACKWARD_SELECT:
case LFUN_LAYOUT: {
docstring layout = cmd.argument();
- LYXERR(Debug::INFO) << "LFUN_LAYOUT: (arg) " << to_utf8(layout) << endl;
+ LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(layout));
docstring const old_layout = cur.paragraph().layout()->name();
// ignore motions deeper nested than the real anchor
Cursor & 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));
-
- tm.setCursorFromCoordinates(cur, cmd.x, y);
- cur.setTargetX(cmd.x);
+ if (!bvcur.anchor_.hasPart(cur)) {
+ cur.undispatched();
+ break;
+ }
+ CursorSlice old = bvcur.top();
+
+ int const wh = bv->workHeight();
+ int const y = std::max(0, std::min(wh - 1, cmd.y));
+
+ tm.setCursorFromCoordinates(cur, cmd.x, y);
+ cur.setTargetX(cmd.x);
+ if (cmd.y >= wh)
+ lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
+ else if (cmd.y < 0)
+ lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
+ // This is to allow jumping over large insets
+ if (cur.top() == old) {
if (cmd.y >= wh)
lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
else if (cmd.y < 0)
lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
- // This is to allow jumping over large insets
- if (cur.top() == old) {
- if (cmd.y >= wh)
- lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
- else if (cmd.y < 0)
- lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
- }
-
- 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();
+ if (cur.top() == old)
+ cur.noUpdate();
+ else {
+ // FIXME: This is brute force! But without it the selected
+ // area is not corrected updated while moving the mouse.
+ cur.updateFlags(Update::Force | Update::FitCursor);
+ // don't set anchor_
+ bvcur.setCursor(cur);
+ bvcur.selection() = true;
+ //lyxerr << "MOTION: " << bv->cursor() << endl;
+ }
break;
}
// "auto_region_delete", which defaults to
// true (on).
- if (lyxrc.auto_region_delete && cur.selection()) {
- pit_type const begpit = cur.selBegin().pit();
- pit_type const endpit = cur.selEnd().pit();
+ if (lyxrc.auto_region_delete && cur.selection())
cutSelection(cur, false, false);
- // When a selection spans multiple paragraphs, the metrics update
- // mechanism sometimes fail to detect that a full update is needed.
- // In this case, we force the full update:
- // (see http://bugzilla.lyx.org/show_bug.cgi?id=4317)
- if (isMainText(cur.bv().buffer()) && begpit != endpit)
- cur.updateFlags(Update::Force);
- }
cur.clearSelection();
Font const old_font = cur.real_current_font;
content : cmd.argument();
string const data = InsetCommandMailer::params2string("href", p);
if (p["target"].empty()) {
- bv->showInsetDialog("href", data, 0);
+ bv->showDialog("href", data);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
string const data = InsetCommandMailer::params2string("label", p);
if (cmd.argument().empty()) {
- bv->showInsetDialog("label", data, 0);
+ bv->showDialog("label", data);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
}
case LFUN_FINISHED_LEFT:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_LEFT:\n" << cur);
if (reverseDirectionNeeded(cur)) {
++cur.pos();
cur.setCurrentFont();
break;
case LFUN_FINISHED_RIGHT:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_RIGHT:\n" << cur);
if (!reverseDirectionNeeded(cur)) {
++cur.pos();
cur.setCurrentFont();
break;
case LFUN_FINISHED_BACKWARD:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_BACKWARD:\n" << cur << endl;
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_BACKWARD:\n" << cur);
break;
case LFUN_FINISHED_FORWARD:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_FORWARD:\n" << cur << endl;
+ LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_FORWARD:\n" << cur);
++cur.pos();
cur.setCurrentFont();
break;
string data;
params2string(cur.paragraph(), data);
data = "show\n" + data;
- bv->showDialogWithData("paragraph", data);
+ bv->showDialog("paragraph", data);
break;
}
arg = cur.selectionAsString(false);
}
}
- bv->showDialogWithData("thesaurus", to_utf8(arg));
+ bv->showDialog("thesaurus", to_utf8(arg));
break;
}
break;
default:
- LYXERR(Debug::ACTION)
- << BOOST_CURRENT_FUNCTION
- << ": Command " << cmd
- << " not DISPATCHED by Text" << endl;
+ LYXERR(Debug::ACTION, BOOST_CURRENT_FUNCTION
+ << ": Command " << cmd << " not DISPATCHED by Text");
cur.undispatched();
break;
}
// Inserting characters does not change par height
ParagraphMetrics const & pms
= cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit());
- if (pms.dim().height()
- == olddim.height()) {
+ if (pms.dim().height() == olddim.height()) {
// if so, update _only_ this paragraph
cur.updateFlags(Update::SinglePar |
Update::FitCursor);
return;
- } else
- needsUpdate = true;
+ }
+ needsUpdate = true;
}
if (!needsUpdate