#include "bufferparams.h"
#include "BufferView.h"
#include "cursor.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
}
-
-//takes absolute x,y coordinates
-InsetBase * LyXText::checkInsetHit(int x, int y) const
-{
- 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::const_iterator iit = pars_[pit].insetlist.begin();
- InsetList::const_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)
{
{
lyx::cap::replaceSelection(cur);
cur.insert(new InsetSpecialChar(kind));
+ cur.posRight();
}
if (cur.pos() > cur.paragraph().beginOfBody()) {
lyx::cap::replaceSelection(cur);
cur.insert(new InsetNewline);
+ cur.posRight();
moveCursor(cur, false);
}
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;
}
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: {
// Right click on a footnote flag opens float menu
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.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;
}
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;
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;