#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/tostr.h"
-#include "support/std_sstream.h"
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
#include <clocale>
+#include <sstream>
using lyx::pos_type;
lyxerr << "selection is: '" << sel << "'" << endl;
if (sel.empty()) {
+ const int old_pos = cur.pos();
cur.insert(new MathHullInset);
+ 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
cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
} else {
- cur.insert(new MathMacroTemplate);
- //cur.dispatch(FuncRequest(LFUN_RIGHT));
- //cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
+ istringstream is(sel);
+ cur.insert(new MathMacroTemplate(is));
}
}
cur.message(N_("Math editor mode"));
}
-
-//takes absolute x,y coordinates
-InsetBase * LyXText::checkInsetHit(int x, int y)
-{
- par_type pit;
- par_type end;
-
- getParsInRange(paragraphs(),
- bv()->top_y() - yo_,
- bv()->top_y() - yo_ + bv()->workHeight(),
- pit, end);
-
- lyxerr << "checkInsetHit: x: " << x << " y: " << y << endl;
- lyxerr << " pit: " << pit << " end: " << end << endl;
- for ( ; pit != end; ++pit) {
- InsetList::iterator iit = pars_[pit].insetlist.begin();
- InsetList::iterator iend = pars_[pit].insetlist.end();
- for ( ; iit != iend; ++iit) {
- InsetBase * inset = iit->inset;
-#if 0
- lyxerr << "examining inset " << inset
- << " xo: " << inset->xo() << "..." << inset->xo() + inset->width()
- << " yo: " << inset->yo() - inset->ascent() << "..."
- << inset->yo() + inset->descent() << endl;
-#endif
- if (inset->covers(x, y)) {
- lyxerr << "Hit inset: " << inset << endl;
- return inset;
- }
- }
- }
- //lyxerr << "No inset hit. " << endl;
- return 0;
-}
-
-
bool LyXText::gotoNextInset(LCursor & cur,
vector<InsetOld_code> const & codes, string const & contents)
{
gotsel = true;
}
text->insertInset(cur, inset);
+
if (edit)
inset->edit(cur, true);
+
if (gotsel && pastesel)
cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
}
BOOST_ASSERT(cur.text() == this);
BufferView * bv = &cur.bv();
CursorSlice sl = cur.top();
+ bool sel = cur.selection();
+ bool moving = false;
switch (cmd.action) {
break;
case LFUN_WORDRIGHT:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
if (isRTL(cur.paragraph()))
break;
case LFUN_WORDLEFT:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
if (isRTL(cur.paragraph()))
break;
case LFUN_BEGINNINGBUF:
- if (!cur.mark())
- cur.clearSelection();
- cursorTop(cur);
- finishChange(cur, false);
+ if (cur.size() == 1) {
+ if (!cur.mark())
+ cur.clearSelection();
+ cursorTop(cur);
+ finishChange(cur, false);
+ } else {
+ cur.undispatched();
+ }
break;
case LFUN_ENDBUF:
- if (!cur.mark())
- cur.clearSelection();
- cursorBottom(cur);
- finishChange(cur, false);
+ if (cur.size() == 1) {
+ if (!cur.mark())
+ cur.clearSelection();
+ cursorBottom(cur);
+ finishChange(cur, false);
+ } else {
+ cur.undispatched();
+ }
break;
case LFUN_RIGHT:
+ moving = true;
case LFUN_RIGHTSEL:
//lyxerr << "handle LFUN_RIGHT[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_RIGHTSEL);
break;
case LFUN_LEFT:
+ moving = true;
case LFUN_LEFTSEL:
//lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_LEFTSEL);
break;
case LFUN_UP:
+ moving = true;
case LFUN_UPSEL:
//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_UPSEL);
break;
case LFUN_DOWN:
+ moving = true;
case LFUN_DOWNSEL:
//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_DOWNSEL);
}
case LFUN_UP_PARAGRAPH:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
cursorUpParagraph(cur);
break;
case LFUN_DOWN_PARAGRAPH:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
cursorDownParagraph(cur);
break;
case LFUN_PRIOR:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
finishChange(cur, false);
break;
case LFUN_NEXT:
+ moving = true;
if (!cur.mark())
cur.clearSelection();
finishChange(cur, false);
case LFUN_INSET_INSERT: {
recordUndo(cur);
InsetBase * inset = createInset(bv, cmd);
- if (inset)
+ if (inset) {
insertInset(cur, inset);
+ cur.posRight();
+ }
break;
}
InsetQuotes::DoubleQ));
else
cur.insert(new InsetQuotes(c, bufparams));
+ cur.posRight();
}
else
bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
}
break;
- case LFUN_MOUSE_MOTION: {
- // 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.selection() && bvcur.anchor_.size() < cur.size())
- 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())
- cursorDown(cur);
- else if (cmd.y - bv->top_y() < 0)
- cursorUp(cur);
- }
-
- // don't set anchor_
- bv->cursor().setCursor(cur, true);
- lyxerr << "MOTION: " << bv->cursor() << endl;
- break;
- }
-
// Single-click on work area
case LFUN_MOUSE_PRESS: {
- // ok ok, this is a hack (for xforms)
- // We shouldn't go further down as we really need to. Only do the
- // scrolling and be done with this. Otherwise we may open some
- // dialogs (Jug 20020424).
- if (cmd.button() == mouse_button::button4) {
- bv->scroll(-lyxrc.wheel_jump);
- break;
- }
-
- if (cmd.button() == mouse_button::button5) {
- bv->scroll(lyxrc.wheel_jump);
- break;
- }
-
// Right click on a footnote flag opens float menu
if (cmd.button() == mouse_button::button3) {
cur.clearSelection();
break;
}
- case LFUN_MOUSE_RELEASE: {
- // do nothing if we used the mouse wheel
- if (cmd.button() == mouse_button::button4
- || cmd.button() == mouse_button::button5) {
- cur.undispatched();
+ case LFUN_MOUSE_MOTION: {
+ // 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);
+
+ // 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())
+ cursorDown(cur);
+ else if (cmd.y - bv->top_y() < 0)
+ cursorUp(cur);
+ }
+
+ // don't set anchor_
+ bv->cursor().setCursor(cur);
+ bv->cursor().selection() = true;
+ lyxerr << "MOTION: " << bv->cursor() << endl;
+ }
+ break;
+ }
+
+ case LFUN_MOUSE_RELEASE: {
selection_possible = false;
if (cmd.button() == mouse_button::button2)
bv->switchKeyMap();
bv->owner()->updateMenubar();
- bv->owner()->updateToolbar();
+ bv->owner()->updateToolbars();
break;
}
}
case LFUN_INSERT_LABEL: {
- InsetCommandParams p("label");
+ // Try to generate a valid label
+ string const contents = cmd.argument.empty() ?
+ cur.getPossibleLabel() : cmd.argument;
+
+ InsetCommandParams p("label", contents);
string const data = InsetCommandMailer::params2string("label", p);
- bv->owner()->getDialogs().show("label", data, 0);
+
+ if (cmd.argument.empty()) {
+ bv->owner()->getDialogs().show("label", data, 0);
+ } else {
+ FuncRequest fr(LFUN_INSET_INSERT, data);
+ dispatch(cur, fr);
+ }
break;
}
// Open the inset, and move the current selection
// inside it.
doInsertInset(cur, this, cmd, true, true);
+ cur.posRight();
break;
case LFUN_INDEX_INSERT:
// Just open the inset
doInsertInset(cur, this, cmd, true, false);
+ cur.posRight();
break;
case LFUN_INDEX_PRINT:
case LFUN_INSERT_PAGEBREAK:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
+ cur.posRight();
break;
case LFUN_DEPTH_MIN:
}
case LFUN_FINISHED_LEFT:
- lyxerr << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
break;
case LFUN_FINISHED_RIGHT:
- lyxerr << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
++cur.pos();
break;
case LFUN_FINISHED_UP:
- lyxerr << "handle LFUN_FINISHED_UP:\n" << cur << endl;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl;
cursorUp(cur);
break;
case LFUN_FINISHED_DOWN:
- lyxerr << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
+ lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
cursorDown(cur);
break;
cur.undispatched();
break;
}
+
+ // avoid to update when navigating
+ if (moving
+ && &sl.inset() == &cur.inset()
+ && sl.idx() == cur.idx()
+ && sel == false
+ && cur.selection() == false)
+ cur.noUpdate();
}
case LFUN_DELETE_LINE_FORWARD:
case LFUN_WORDRIGHT:
case LFUN_WORDLEFT:
- case LFUN_ENDBUF:
- case LFUN_BEGINNINGBUF:
case LFUN_RIGHT:
case LFUN_RIGHTSEL:
case LFUN_LEFT:
enable = true;
break;
+ case LFUN_ENDBUF:
+ case LFUN_BEGINNINGBUF:
+ enable = true;
+ break;
+
default:
enable = false;
break;
projects / lyx.git / blobdiff