extern string current_layout;
-// the selection possible is needed, that only motion events are
-// used, where the button press event was on the drawing area too
-bool selection_possible = false;
-
namespace {
text->bidi.isBoundary(cur.buffer(), par,
cur.pos(),
text->real_current_font))
- text->setCursor(cur, cur.par(), cur.pos(),
+ text->setCursor(cur, cur.pit(), cur.pos(),
false, !cur.boundary());
}
}
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
- // -- I really hate "LyXfunc overloading"...
+ // don't do that also for LFUN_MATH_MODE
+ // unless you want end up with always changing
+ // to mathrm when opening an inlined inset --
+ // I really hate "LyXfunc overloading"...
if (display)
cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
cur.dispatch(FuncRequest(LFUN_INSERT_MATH, cmd.argument));
} else {
- // create a macro if we see "\\newcommand" somewhere, and an ordinary
- // formula otherwise
+ // create a macro if we see "\\newcommand"
+ // somewhere, and an ordinary formula
+ // otherwise
cutSelection(cur, true, true);
if (sel.find("\\newcommand") == string::npos
&& sel.find("\\def") == string::npos)
}
bool LyXText::gotoNextInset(LCursor & cur,
- vector<InsetOld_code> const & codes, string const & contents)
+ vector<InsetBase_code> const & codes, string const & contents)
{
BOOST_ASSERT(this == cur.text());
- par_type end = paragraphs().size();
- par_type pit = cur.par();
+ pit_type end = paragraphs().size();
+ pit_type pit = cur.pit();
pos_type pos = cur.pos();
InsetBase * inset;
void LyXText::gotoInset(LCursor & cur,
- vector<InsetOld_code> const & codes, bool same_content)
+ vector<InsetBase_code> const & codes, bool same_content)
{
cur.clearSelection();
}
if (!gotoNextInset(cur, codes, contents)) {
- if (cur.pos() || cur.par() != 0) {
+ if (cur.pos() || cur.pit() != 0) {
CursorSlice tmp = cur.top();
- cur.par() = 0;
+ cur.pit() = 0;
cur.pos() = 0;
if (!gotoNextInset(cur, codes, contents)) {
cur.top() = tmp;
}
-void LyXText::gotoInset(LCursor & cur, InsetOld_code code, bool same_content)
+void LyXText::gotoInset(LCursor & cur, InsetBase_code code, bool same_content)
{
- gotoInset(cur, vector<InsetOld_code>(1, code), same_content);
+ gotoInset(cur, vector<InsetBase_code>(1, code), same_content);
}
void LyXText::cursorPrevious(LCursor & cur)
{
pos_type cpos = cur.pos();
- lyx::par_type cpar = cur.par();
+ lyx::pit_type cpar = cur.pit();
int x = cur.x_target();
- int y = cur.bv().top_y();
- setCursorFromCoordinates(cur, x, y);
- if (cpar == cur.par() && cpos == cur.pos()) {
+ setCursorFromCoordinates(cur, x, 0);
+ 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.
cursorUp(cur);
void LyXText::cursorNext(LCursor & cur)
{
pos_type cpos = cur.pos();
- lyx::par_type cpar = cur.par();
+ lyx::pit_type cpar = cur.pit();
int x = cur.x_target();
- int y = cur.bv().top_y() + cur.bv().workHeight();
- setCursorFromCoordinates(cur, x, y);
+ setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+ cursorDown(cur);
- if (cpar == cur.par() && cpos == cur.pos()) {
+ 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.
cursorDown(cur);
{
lyx::cap::replaceSelection(cur);
cur.insert(new InsetSpecialChar(kind));
+ cur.posRight();
}
cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
}
+
+void update(LCursor & cur)
+{
+ //we don't call update(true, false) directly to save a metrics call
+ if (cur.bv().fitCursor())
+ cur.bv().update(false, true);
+}
+
+
} // anon namespace
bool start = !par.params().startOfAppendix();
// ensure that we have only one start_of_appendix in this document
- for (par_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
+ for (pit_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);
break;
}
}
break;
+ case LFUN_BEGINNINGBUFSEL:
+ if (cur.size() == 1) {
+ if (!cur.selection())
+ cur.resetAnchor();
+ cursorTop(cur);
+ finishChange(cur, true);
+ } else {
+ cur.undispatched();
+ }
+ break;
+
case LFUN_ENDBUF:
if (cur.size() == 1) {
if (!cur.mark())
cur.undispatched();
}
break;
+
+ case LFUN_ENDBUFSEL:
+ if (cur.size() == 1) {
+ if (!cur.selection())
+ cur.resetAnchor();
+ cursorBottom(cur);
+ finishChange(cur, true);
+ } else {
+ cur.undispatched();
+ }
+ break;
case LFUN_RIGHT:
moving = true;
case LFUN_UP:
moving = true;
case LFUN_UPSEL:
+ update(cur);
//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_UPSEL);
cursorUp(cur);
case LFUN_DOWN:
moving = true;
case LFUN_DOWNSEL:
+ update(cur);
//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_DOWNSEL);
cursorDown(cur);
break;
case LFUN_PRIORSEL:
+ update(cur);
if (!cur.selection())
cur.resetAnchor();
cursorPrevious(cur);
break;
case LFUN_NEXTSEL:
+ update(cur);
if (!cur.selection())
cur.resetAnchor();
cursorNext(cur);
break;
case LFUN_HOMESEL:
+ update(cur);
if (!cur.selection())
cur.resetAnchor();
cursorHome(cur);
break;
case LFUN_ENDSEL:
+ update(cur);
if (!cur.selection())
cur.resetAnchor();
cursorEnd(cur);
break;
case LFUN_PRIOR:
+ update(cur);
moving = true;
if (!cur.mark())
cur.clearSelection();
finishChange(cur, false);
- if (cur.par() == 0 && cur.textRow().pos() == 0) {
+ if (cur.pit() == 0 && cur.textRow().pos() == 0) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
} else {
break;
case LFUN_NEXT:
+ update(cur);
moving = true;
if (!cur.mark())
cur.clearSelection();
finishChange(cur, false);
- if (cur.par() == cur.lastpar()
+ if (cur.pit() == cur.lastpit()
&& cur.textRow().endpos() == cur.lastpos()) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_DOWN);
if (cur.pos() > cur.paragraph().beginOfBody()) {
lyx::cap::replaceSelection(cur);
cur.insert(new InsetNewline);
+ cur.posRight();
moveCursor(cur, false);
}
break;
case LFUN_PARAGRAPH_SPACING: {
Paragraph & par = cur.paragraph();
Spacing::Space cur_spacing = par.params().spacing().getSpace();
- float cur_value = 1.0;
+ string cur_value = "1.0";
if (cur_spacing == Spacing::Other)
- cur_value = par.params().spacing().getValue();
+ cur_value = par.params().spacing().getValueAsString();
istringstream is(cmd.argument);
string tmp;
is >> tmp;
Spacing::Space new_spacing = cur_spacing;
- float new_value = cur_value;
+ string new_value = cur_value;
if (tmp.empty()) {
lyxerr << "Missing argument to `paragraph-spacing'"
<< endl;
new_spacing = Spacing::Double;
} else if (tmp == "other") {
new_spacing = Spacing::Other;
- float tmpval = 0.0;
+ string tmpval = "0.0";
is >> tmpval;
lyxerr << "new_value = " << tmpval << endl;
- if (tmpval != 0.0)
+ if (tmpval != "0.0")
new_value = tmpval;
} else if (tmp == "default") {
new_spacing = Spacing::Default;
lyxerr << _("Unknown spacing argument: ")
<< cmd.argument << endl;
}
- if (cur_spacing != new_spacing || cur_value != new_value) {
+ if (cur_spacing != new_spacing || cur_value != new_value)
par.params().spacing(Spacing(new_spacing, new_value));
- redoParagraph(cur);
- }
break;
}
case LFUN_SPACE_INSERT:
if (cur.paragraph().layout()->free_spacing)
insertChar(cur, ' ');
- else
+ else {
doInsertInset(cur, this, cmd, false, false);
+ cur.posRight();
+ }
moveCursor(cur, false);
break;
case LFUN_TRANSPOSE_CHARS:
recordUndo(cur);
- redoParagraph(cur);
break;
case LFUN_PASTE:
bool change_layout = (current_layout != layout);
if (!change_layout && cur.selection() &&
- cur.selBegin().par() != cur.selEnd().par())
+ cur.selBegin().pit() != cur.selEnd().pit())
{
- par_type spit = cur.selBegin().par();
- par_type epit = cur.selEnd().par() + 1;
+ pit_type spit = cur.selBegin().pit();
+ pit_type epit = cur.selEnd().pit() + 1;
while (spit != epit) {
if (pars_[spit].layout()->name() != current_layout) {
change_layout = true;
break;
case LFUN_REFERENCE_GOTO: {
- vector<InsetOld_code> tmp;
+ vector<InsetBase_code> tmp;
tmp.push_back(InsetBase::LABEL_CODE);
tmp.push_back(InsetBase::REF_CODE);
gotoInset(cur, tmp, true);
case LFUN_MOUSE_TRIPLE:
if (cmd.button() == mouse_button::button1) {
- selection_possible = true;
cursorHome(cur);
cur.resetAnchor();
cursorEnd(cur);
case LFUN_MOUSE_DOUBLE:
if (cmd.button() == mouse_button::button1) {
- selection_possible = true;
selectWord(cur, lyx::WHOLE_WORD_STRICT);
bv->haveSelection(cur.selection());
}
// Right click on a footnote flag opens float menu
if (cmd.button() == mouse_button::button3) {
cur.clearSelection();
- selection_possible = false;
break;
}
paste_internally = true;
}
- selection_possible = true;
-
// Clear the selection
cur.clearSelection();
setCursorFromCoordinates(cur, cmd.x, cmd.y);
cur.resetAnchor();
finishUndo();
- cur.x_target() = cursorX(cur.top());
+ cur.setTargetX();
// Has the cursor just left the inset?
if (bv->cursor().inMathed() && !cur.inMathed())
// Set cursor here.
bv->cursor() = cur;
- // Don't allow selection after a big jump.
- if (bv->fitCursor())
- selection_possible = false;
-
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
// insert this
bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
else
bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
- selection_possible = false;
}
break;
// 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))
- 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())
+ 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));
+
+ setCursorFromCoordinates(cur, cmd.x, y);
+ cur.x_target() = cmd.x;
+ if (cmd.y >= wh)
cursorDown(cur);
- else if (cmd.y - bv->top_y() < 0)
+ else if (cmd.y < 0)
cursorUp(cur);
- }
+ // This is to allow jumping over large insets
+ if (cur.top() == old) {
+ if (cmd.y >= wh)
+ cursorDown(cur);
+ else if (cmd.y < 0)
+ cursorUp(cur);
+ }
- // don't set anchor_
- bv->cursor().setCursor(cur);
- bv->cursor().selection() = true;
- lyxerr << "MOTION: " << bv->cursor() << endl;
+ 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();
break;
}
case LFUN_MOUSE_RELEASE: {
- selection_possible = false;
-
if (cmd.button() == mouse_button::button2)
break;
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
- mathDispatch(cur, cmd, false);
+ if (cmd.argument == "on")
+ // don't pass "on" as argument
+ mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
+ else
+ mathDispatch(cur, cmd, false);
break;
case LFUN_MATH_MACRO:
//cur.nextInset()->edit(cur, true);
}
break;
+
+ // passthrough hat and underscore outside mathed:
+ case LFUN_SUBSCRIPT:
+ mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "_"), false);
+ break;
+ case LFUN_SUPERSCRIPT:
+ mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "^"), false);
+ break;
case LFUN_INSERT_MATH:
case LFUN_INSERT_MATRIX:
setLayout(cur, tclass.defaultLayoutName());
setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0);
insertInset(cur, new InsetFloatList(cmd.argument));
+ cur.posRight();
} else {
lyxerr << "Non-existent float type: "
<< cmd.argument << endl;
bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
- FuncStatus & flag) const
+ FuncStatus & flag) const
{
BOOST_ASSERT(cur.text() == this);
LyXFont const & font = real_current_font;
break;
case LFUN_INSET_OPTARG:
- enable = cur.paragraph().layout()->optionalargs;
+ enable = numberOfOptArgs(cur.paragraph())
+ < cur.paragraph().layout()->optionalargs;
break;
case LFUN_APPENDIX:
#if 0
// the functions which insert insets
- InsetOld::Code code = InsetOld::NO_CODE;
+ InsetBase::Code code = InsetBase::NO_CODE;
switch (cmd.action) {
case LFUN_DIALOG_SHOW_NEW_INSET:
if (cmd.argument == "bibitem")
- code = InsetOld::BIBITEM_CODE;
+ code = InsetBase::BIBITEM_CODE;
else if (cmd.argument == "bibtex")
- code = InsetOld::BIBTEX_CODE;
+ code = InsetBase::BIBTEX_CODE;
else if (cmd.argument == "box")
- code = InsetOld::BOX_CODE;
+ code = InsetBase::BOX_CODE;
else if (cmd.argument == "branch")
- code = InsetOld::BRANCH_CODE;
+ code = InsetBase::BRANCH_CODE;
else if (cmd.argument == "citation")
- code = InsetOld::CITE_CODE;
+ code = InsetBase::CITE_CODE;
else if (cmd.argument == "ert")
- code = InsetOld::ERT_CODE;
+ code = InsetBase::ERT_CODE;
else if (cmd.argument == "external")
- code = InsetOld::EXTERNAL_CODE;
+ code = InsetBase::EXTERNAL_CODE;
else if (cmd.argument == "float")
- code = InsetOld::FLOAT_CODE;
+ code = InsetBase::FLOAT_CODE;
else if (cmd.argument == "graphics")
- code = InsetOld::GRAPHICS_CODE;
+ code = InsetBase::GRAPHICS_CODE;
else if (cmd.argument == "include")
- code = InsetOld::INCLUDE_CODE;
+ code = InsetBase::INCLUDE_CODE;
else if (cmd.argument == "index")
- code = InsetOld::INDEX_CODE;
+ code = InsetBase::INDEX_CODE;
else if (cmd.argument == "label")
- code = InsetOld::LABEL_CODE;
+ code = InsetBase::LABEL_CODE;
else if (cmd.argument == "note")
- code = InsetOld::NOTE_CODE;
+ code = InsetBase::NOTE_CODE;
else if (cmd.argument == "ref")
- code = InsetOld::REF_CODE;
+ code = InsetBase::REF_CODE;
else if (cmd.argument == "toc")
- code = InsetOld::TOC_CODE;
+ code = InsetBase::TOC_CODE;
else if (cmd.argument == "url")
- code = InsetOld::URL_CODE;
+ code = InsetBase::URL_CODE;
else if (cmd.argument == "vspace")
- code = InsetOld::VSPACE_CODE;
+ code = InsetBase::VSPACE_CODE;
else if (cmd.argument == "wrap")
- code = InsetOld::WRAP_CODE;
+ code = InsetBase::WRAP_CODE;
break;
case LFUN_INSET_ERT:
- code = InsetOld::ERT_CODE;
+ code = InsetBase::ERT_CODE;
break;
case LFUN_INSET_FOOTNOTE:
- code = InsetOld::FOOT_CODE;
+ code = InsetBase::FOOT_CODE;
break;
case LFUN_TABULAR_INSERT:
- code = InsetOld::TABULAR_CODE;
+ code = InsetBase::TABULAR_CODE;
break;
case LFUN_INSET_MARGINAL:
- code = InsetOld::MARGIN_CODE;
+ code = InsetBase::MARGIN_CODE;
break;
case LFUN_INSET_FLOAT:
case LFUN_INSET_WIDE_FLOAT:
- code = InsetOld::FLOAT_CODE;
+ code = InsetBase::FLOAT_CODE;
break;
case LFUN_INSET_WRAP:
- code = InsetOld::WRAP_CODE;
+ code = InsetBase::WRAP_CODE;
break;
case LFUN_FLOAT_LIST:
- code = InsetOld::FLOAT_LIST_CODE;
+ code = InsetBase::FLOAT_LIST_CODE;
break;
#if 0
case LFUN_INSET_LIST:
- code = InsetOld::LIST_CODE;
+ code = InsetBase::LIST_CODE;
break;
case LFUN_INSET_THEOREM:
- code = InsetOld::THEOREM_CODE;
+ code = InsetBase::THEOREM_CODE;
break;
#endif
case LFUN_INSET_CAPTION:
- code = InsetOld::CAPTION_CODE;
+ code = InsetBase::CAPTION_CODE;
break;
case LFUN_INSERT_NOTE:
- code = InsetOld::NOTE_CODE;
+ code = InsetBase::NOTE_CODE;
break;
case LFUN_INSERT_CHARSTYLE:
- code = InsetOld::CHARSTYLE_CODE;
+ code = InsetBase::CHARSTYLE_CODE;
if (buf->params().getLyXTextClass().charstyles().empty())
enable = false;
break;
case LFUN_INSERT_BOX:
- code = InsetOld::BOX_CODE;
+ code = InsetBase::BOX_CODE;
break;
case LFUN_INSERT_BRANCH:
- code = InsetOld::BRANCH_CODE;
+ code = InsetBase::BRANCH_CODE;
if (buf->params().branchlist().empty())
enable = false;
break;
case LFUN_INSERT_LABEL:
- code = InsetOld::LABEL_CODE;
+ code = InsetBase::LABEL_CODE;
break;
case LFUN_INSET_OPTARG:
- code = InsetOld::OPTARG_CODE;
+ code = InsetBase::OPTARG_CODE;
break;
case LFUN_ENVIRONMENT_INSERT:
- code = InsetOld::BOX_CODE;
+ code = InsetBase::BOX_CODE;
break;
case LFUN_INDEX_INSERT:
- code = InsetOld::INDEX_CODE;
+ code = InsetBase::INDEX_CODE;
break;
case LFUN_INDEX_PRINT:
- code = InsetOld::INDEX_PRINT_CODE;
+ code = InsetBase::INDEX_PRINT_CODE;
break;
case LFUN_TOC_INSERT:
- code = InsetOld::TOC_CODE;
+ code = InsetBase::TOC_CODE;
break;
case LFUN_HTMLURL:
case LFUN_URL:
- code = InsetOld::URL_CODE;
+ code = InsetBase::URL_CODE;
break;
case LFUN_QUOTE:
// always allow this, since we will inset a raw quote
case LFUN_MENU_SEPARATOR:
case LFUN_LDOTS:
case LFUN_END_OF_SENTENCE:
- code = InsetOld::SPECIALCHAR_CODE;
+ code = InsetBase::SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
// slight hack: we know this is allowed in math mode
if (cur.inTexted())
- code = InsetOld::SPACE_CODE;
+ code = InsetBase::SPACE_CODE;
break;
case LFUN_INSET_DIALOG_SHOW: {
InsetBase * inset = cur.nextInset();
enable = inset;
if (inset) {
code = inset->lyxCode();
- if (!(code == InsetOld::INCLUDE_CODE
- || code == InsetOld::BIBTEX_CODE
- || code == InsetOld::FLOAT_LIST_CODE
- || code == InsetOld::TOC_CODE))
+ if (!(code == InsetBase::INCLUDE_CODE
+ || code == InsetBase::BIBTEX_CODE
+ || code == InsetBase::FLOAT_LIST_CODE
+ || code == InsetBase::TOC_CODE))
enable = false;
}
break;
break;
}
- if (code != InsetOld::NO_CODE
+ if (code != InsetBase::NO_CODE
&& (cur.empty() || !cur.inset().insetAllowed(code)))
enable = false;
case LFUN_INSERT_MATH:
case LFUN_INSERT_MATRIX:
case LFUN_MATH_DELIM:
+ case LFUN_SUBSCRIPT:
+ case LFUN_SUPERSCRIPT:
case LFUN_DEFAULT:
case LFUN_UNDERLINE:
case LFUN_FONT_SIZE:
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:
+ case LFUN_BEGINNINGBUFSEL:
+ case LFUN_ENDBUFSEL:
+ // these are handled in our dispatch()
enable = true;
break;
default:
- enable = false;
- break;
+ return false;
}
flag.enabled(enable);
return true;
projects / lyx.git / blobdiff