#include <config.h>
-#include <ctime>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <locale.h>
-
#ifdef __GNUG__
#pragma implementation
#endif
#include "lyx_gui_misc.h"
#include "lyxrc.h"
#include "intl.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
+// added for Dispatch functions
+#include "lyx_cb.h"
+#include "lyx_main.h"
+#include "FloatList.h"
+#include "gettext.h"
+#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+
#include "frontends/Dialogs.h"
#include "frontends/Alert.h"
+#include "frontends/FileDialog.h"
+
#include "insets/insetbib.h"
#include "insets/insettext.h"
-/// added for Dispatch functions
-#include "lyx_cb.h"
-#include "frontends/FileDialog.h"
-#include "lyx_main.h"
-#include "FloatList.h"
-#include "support/filetools.h"
-#include "support/lyxfunctional.h"
#include "insets/inseturl.h"
#include "insets/insetlatexaccent.h"
#include "insets/insettoc.h"
#include "insets/insetcaption.h"
#include "insets/insetfloatlist.h"
#include "insets/insetspecialchar.h"
-#include "gettext.h"
-#include "ParagraphParameters.h"
-#include "undo_funcs.h"
+
#include "mathed/formulabase.h"
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h"
+
+#include <ctime>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <locale.h>
+
+
extern lyx::layout_type current_layout;
using std::vector;
bv_->theLockingInset(the_locking_inset);
}
bv_->text->first = screen_->topCursorVisible(bv_->text);
+#if 0
buffer_->resizeInsets(bv_);
+#endif
// this will scroll the screen such that the cursor becomes visible
updateScrollbar();
redraw();
{
if (!buffer_ || !screen_.get()) return;
- Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button);
+ Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos);
// ok ok, this is a hack.
if (button == 4 || button == 5) {
{
// select a word
if (!buffer_)
- return;
+ return;
LyXText * text = bv_->getLyXText();
if (text->bv_owner && bv_->theLockingInset())
- return;
+ return;
if (screen_.get() && button == 1) {
- if (text->bv_owner) {
- screen_->hideCursor();
- screen_->toggleSelection(text, bv_);
- text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
- screen_->toggleSelection(text, bv_, false);
- } else {
- text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
- }
- /* This will fit the cursor on the screen
- * if necessary */
- update(text, BufferView::SELECT|BufferView::FITCUR);
+ if (text->bv_owner) {
+ screen_->hideCursor();
+ screen_->toggleSelection(text, bv_);
+ text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+ screen_->toggleSelection(text, bv_, false);
+ } else {
+ text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+ }
+ /* This will fit the cursor on the screen
+ * if necessary */
+ update(text, BufferView::SELECT|BufferView::FITCUR);
}
}
return;
if (screen_.get() && (button == 1)) {
- screen_->hideCursor();
- screen_->toggleSelection(text, bv_);
+ if (text->bv_owner) {
+ screen_->hideCursor();
+ screen_->toggleSelection(text, bv_);
+ }
text->cursorHome(bv_);
text->selection.cursor = text->cursor;
text->cursorEnd(bv_);
text->setSelection(bv_);
- screen_->toggleSelection(text, bv_, false);
+ if (text->bv_owner) {
+ screen_->toggleSelection(text, bv_, false);
+ }
/* This will fit the cursor on the screen
* if necessary */
update(text, BufferView::SELECT|BufferView::FITCUR);
// If we hit an inset, we have the inset coordinates in these
// and inset_hit points to the inset. If we do not hit an
// inset, inset_hit is 0, and inset_x == x, inset_y == y.
- Inset * inset_hit = checkInsetHit(bv_->text, x, y, button);
+ Inset * inset_hit = checkInsetHit(bv_->text, x, y);
if (bv_->theLockingInset()) {
// We are in inset locking mode.
}
-/*
- * Returns an inset if inset was hit. 0 otherwise.
- * If hit, the coordinates are changed relative to the inset.
- * Otherwise coordinates are not changed, and false is returned.
- */
-Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
- unsigned int /* button */)
+Box BufferView::Pimpl::insetDimensions(LyXText const & text, LyXCursor const & cursor) const
+{
+ Paragraph /*const*/ & par = *cursor.par();
+ pos_type const pos = cursor.pos();
+
+ lyx::Assert(par.getInset(pos));
+
+ Inset const & inset(*par.getInset(pos));
+
+ LyXFont const & font = text.getFont(buffer_, &par, pos);
+
+ int const width = inset.width(bv_, font);
+ int const inset_x = font.isVisibleRightToLeft()
+ ? (cursor.x() - width) : cursor.x();
+
+ return Box(
+ inset_x + inset.scroll(),
+ inset_x + width,
+ cursor.y() - inset.ascent(bv_, font),
+ cursor.y() + inset.descent(bv_, font));
+}
+
+
+Inset * BufferView::Pimpl::checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const
+{
+ pos_type const pos(cursor.pos());
+ Paragraph /*const*/ & par(*cursor.par());
+
+ if (pos >= par.size() || !par.isInset(pos)) {
+ return 0;
+ }
+
+ Inset /*const*/ * inset = par.getInset(pos);
+
+ if (!isEditableInset(inset)) {
+ return 0;
+ }
+
+ Box b(insetDimensions(text, cursor));
+
+ if (!b.contained(x, y)) {
+ return 0;
+ }
+
+ text.setCursor(bv_, &par, pos, true);
+
+ x -= b.x1;
+ // The origin of an inset is on the baseline
+ y -= (text.cursor.y());
+
+ return inset;
+}
+
+
+Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y)
{
if (!screen_.get())
return 0;
int y_tmp = y + text->first;
-
+
LyXCursor cursor;
text->setCursorFromCoordinates(bv_, cursor, x, y_tmp);
- text->setCursor(bv_, cursor, cursor.par(),cursor.pos(),true);
+
+ Inset * inset(checkInset(*text, cursor, x, y_tmp));
- lyx::pos_type pos;
+ if (inset) {
+ y = y_tmp;
+ return inset;
+ }
- if (cursor.pos() < cursor.par()->size()
- && cursor.par()->isInset(cursor.pos())
- && isEditableInset(cursor.par()->getInset(cursor.pos())))
- {
- pos = cursor.pos();
- } else if ((cursor.pos() - 1 >= 0)
- && cursor.par()->isInset(cursor.pos() - 1)
- && isEditableInset(cursor.par()->getInset(cursor.pos() - 1)))
- {
- pos = cursor.pos() - 1;
- // if the inset takes a full row, then the cursor.y()
- // at the end of the inset will be wrong. So step the cursor
- // back one
- text->setCursor(bv_, cursor, cursor.par(), cursor.pos() - 1, true);
- } else {
+ // look at previous position
+
+ if (cursor.pos() == 0) {
return 0;
}
- // Check whether the inset really was hit
- Inset * inset = cursor.par()->getInset(pos);
- LyXFont const & font = text->getFont(buffer_, cursor.par(), pos);
- int const width = inset->width(bv_, font);
- int const inset_x = font.isVisibleRightToLeft()
- ? cursor.x() - width : cursor.x();
- int const start_x = inset_x + inset->scroll();
- int const end_x = inset_x + width;
- int const start_y = cursor.y() - inset->ascent(bv_, font);
- int const end_y = cursor.y() + inset->descent(bv_, font);
-
- if (x > start_x && x < end_x && y_tmp > start_y && y < end_y) {
- text->setCursor(bv_, cursor.par(), pos, true);
- x = x - start_x;
- // The origin of an inset is on the baseline
- y = y_tmp - (text->cursor.y());
- return inset;
- }
+ // move back one
+ text->setCursor(bv_, cursor, cursor.par(), cursor.pos() - 1, true);
- return 0;
+ inset = checkInset(*text, cursor, x, y_tmp);
+ if (inset) {
+ y = y_tmp;
+ }
+ return inset;
}
LyXText::text_status st = bv_->text->status();
screen_->update(bv_->text, bv_);
bool fitc = false;
- while(bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
+ while (bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
if (bv_->text->fullRebreak(bv_)) {
st = LyXText::NEED_MORE_REFRESH;
bv_->text->setCursor(bv_, bv_->text->cursor.par(),
if (clip.empty()) return;
if (asPara) {
- bv_->text->insertStringAsParagraphs(bv_, clip);
+ bv_->getLyXText()->insertStringAsParagraphs(bv_, clip);
} else {
- bv_->text->insertStringAsLines(bv_, clip);
+ bv_->getLyXText()->insertStringAsLines(bv_, clip);
}
update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
case LFUN_PASTESELECTION:
{
bool asPara = false;
- if (argument == "paragraph") asPara = true;
+ if (argument == "paragraph")
+ asPara = true;
pasteClipboard(asPara);
}
break;