#include "support/lstrings.h"
#include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
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 {
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)
lyx::pit_type cpar = cur.pit();
int x = cur.x_target();
- int y = cur.bv().top_y();
- setCursorFromCoordinates(cur, x, y);
+
+ setCursorFromCoordinates(cur, x, 0);
+ cursorUp(cur);
if (cpar == cur.pit() && cpos == cur.pos()) {
// we have a row which is taller than the workarea. The
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.pit() && cpos == cur.pos()) {
// we have a row which is taller than the workarea. The
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
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())
}
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_RIGHTSEL:
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();
break;
case LFUN_NEXT:
+ update(cur);
moving = true;
if (!cur.mark())
cur.clearSelection();
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_TRANSPOSE_CHARS:
recordUndo(cur);
- redoParagraph(cur);
break;
case LFUN_PASTE:
break;
case LFUN_GETXY:
- cur.message(tostr(cursorX(cur.top())) + ' '
- + tostr(cursorY(cur.top())));
+ cur.message(convert<string>(cursorX(cur.top())) + ' '
+ + convert<string>(cursorY(cur.top())));
break;
case LFUN_SETXY: {
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)) {
- CursorSlice old = cur.top();
- setCursorFromCoordinates(cur, cmd.x, cmd.y);
+ 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 < 0)
+ cursorUp(cur);
// 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 (cur.top() == old) {
+ if (cmd.y >= wh)
cursorDown(cur);
- else if (cmd.y - bv->top_y() < 0)
+ 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:
}
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:
case LFUN_MATH_DELIM: {
InsetBase & inset = cur.inset();
bool const accept = !inset.forceDefaultParagraphs(&inset);
- data = "update " + tostr(accept) + '\n' + data;
+ data = "update " + convert<string>(accept) + '\n' + data;
bv->owner()->getDialogs().update("paragraph", data);
break;
}
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;
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;