#include "bufferparams.h"
#include "coordcache.h"
#include "cursor.h"
+#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "factory.h"
#include "lyxfunc.h"
#include "lyxtext.h"
#include "lyxrc.h"
-#include "lastfiles.h"
+#include "session.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "pariterator.h"
-#include "rowpainter.h"
+#include "toc.h"
#include "undo.h"
#include "vspace.h"
+#include "insets/insetbibtex.h"
#include "insets/insetref.h"
#include "insets/insettext.h"
#include "frontends/Dialogs.h"
#include "frontends/FileDialog.h"
#include "frontends/font_metrics.h"
+#include "frontends/Gui.h"
#include "frontends/LyXView.h"
-#include "frontends/LyXScreenFactory.h"
-#include "frontends/screen.h"
-#include "frontends/WorkArea.h"
-#include "frontends/WorkAreaFactory.h"
+#include "frontends/Selection.h"
#include "graphics/Previews.h"
#include "support/convert.h"
#include "support/filefilterlist.h"
#include "support/filetools.h"
-#include "support/forkedcontr.h"
#include "support/package.h"
#include "support/types.h"
#include <boost/bind.hpp>
+#include <boost/current_function.hpp>
#include <functional>
+#include <vector>
+
+using lyx::frontend::Clipboard;
+using lyx::frontend::Gui;
using lyx::pos_type;
-using lyx::support::AddPath;
+using lyx::support::addPath;
using lyx::support::bformat;
using lyx::support::FileFilterList;
-using lyx::support::FileSearch;
-using lyx::support::ForkedcallsController;
-using lyx::support::IsDirWriteable;
-using lyx::support::MakeDisplayPath;
-using lyx::support::MakeAbsPath;
+using lyx::support::fileSearch;
+using lyx::support::isDirWriteable;
+using lyx::support::makeDisplayPath;
+using lyx::support::makeAbsPath;
using lyx::support::package;
using std::endl;
using std::max;
using std::string;
using std::mem_fun_ref;
-
+using std::vector;
extern BufferList bufferlist;
unsigned int const saved_positions_num = 20;
-// All the below connection objects are needed because of a bug in some
-// versions of GCC (<=2.96 are on the suspects list.) By having and assigning
-// to these connections we avoid a segfault upon startup, and also at exit.
-// (Lgb)
-
-boost::signals::connection dispatchcon;
-boost::signals::connection timecon;
-boost::signals::connection doccon;
-boost::signals::connection resizecon;
-boost::signals::connection kpresscon;
-boost::signals::connection selectioncon;
-boost::signals::connection lostcon;
-
-
-/// Get next inset of this class from current cursor position
+/// Return an inset of this class if it exists at the current cursor position
template <class T>
T * getInsetByCode(LCursor & cur, InsetBase::Code code)
{
return inset;
}
-
} // anon namespace
-BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner,
- int width, int height)
- : bv_(&bv), owner_(owner), buffer_(0), cursor_timeout(400),
- using_xterm_cursor(false), cursor_(bv) ,
- anchor_ref_(0), offset_ref_(0)
+BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner)
+ : bv_(&bv), owner_(owner), buffer_(0), wh_(0),
+ cursor_(bv),
+ multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0), needs_redraw_(false)
{
xsel_cache_.set = false;
- workarea_.reset(WorkAreaFactory::create(*owner_, width, height));
- screen_.reset(LyXScreenFactory::create(workarea()));
-
- // Setup the signals
- doccon = workarea().scrollDocView
- .connect(boost::bind(&BufferView::Pimpl::scrollDocView, this, _1));
- resizecon = workarea().workAreaResize
- .connect(boost::bind(&BufferView::Pimpl::workAreaResize, this));
- dispatchcon = workarea().dispatch
- .connect(boost::bind(&BufferView::Pimpl::workAreaDispatch, this, _1));
- kpresscon = workarea().workAreaKeyPress
- .connect(boost::bind(&BufferView::Pimpl::workAreaKeyPress, this, _1, _2));
- selectioncon = workarea().selectionRequested
- .connect(boost::bind(&BufferView::Pimpl::selectionRequested, this));
- lostcon = workarea().selectionLost
- .connect(boost::bind(&BufferView::Pimpl::selectionLost, this));
-
- timecon = cursor_timeout.timeout
- .connect(boost::bind(&BufferView::Pimpl::cursorToggle, this));
- cursor_timeout.start();
saved_positions.resize(saved_positions_num);
+ // load saved bookmarks
+ lyx::Session::BookmarkList & bmList = LyX::ref().session().loadBookmarks();
+ for (lyx::Session::BookmarkList::iterator bm = bmList.begin();
+ bm != bmList.end(); ++bm)
+ if (bm->get<0>() < saved_positions_num)
+ saved_positions[bm->get<0>()] = Position( bm->get<1>(), bm->get<2>(), bm->get<3>() );
+ // and then clear them
+ bmList.clear();
}
{
// Get absolute path of file and add ".lyx"
// to the filename if necessary
- string s = FileSearch(string(), filename, "lyx");
+ string s = fileSearch(string(), filename, "lyx");
bool const found = !s.empty();
// File already open?
if (bufferlist.exists(s)) {
- string const file = MakeDisplayPath(s, 20);
+ string const file = makeDisplayPath(s, 20);
string text = bformat(_("The document %1$s is already "
"loaded.\n\nDo you want to revert "
"to the saved version?"), file);
// Fall through to new load. (Asger)
}
- Buffer * b;
+ Buffer * b = 0;
if (found) {
b = bufferlist.newBuffer(s);
setBuffer(b);
bv_->showErrorList(_("Parse"));
+ // scroll to the position when the file was last closed
+ if (lyxrc.use_lastfilepos) {
+ lyx::pit_type pit;
+ lyx::pos_type pos;
+ boost::tie(pit, pos) = LyX::ref().session().loadFilePosition(s);
+ // I am not sure how to separate the following part to a function
+ // so I will leave this to Lars.
+ //
+ // check pit since the document may be externally changed.
+ if ( static_cast<size_t>(pit) < b->paragraphs().size() ) {
+ ParIterator it = b->par_iterator_begin();
+ ParIterator const end = b->par_iterator_end();
+ for (; it != end; ++it)
+ if (it.pit() == pit) {
+ // restored pos may be bigger than it->size
+ bv_->setCursor(makeDocIterator(it, min(pos, it->size())));
+ bv_->update(Update::FitCursor);
+ break;
+ }
+ }
+ }
+
if (tolastfiles)
- LyX::ref().lastfiles().newFile(b->fileName());
+ LyX::ref().session().addLastFile(b->fileName());
return true;
}
-WorkArea & BufferView::Pimpl::workarea() const
+lyx::frontend::Gui & BufferView::Pimpl::gui() const
{
- return *workarea_.get();
+ return owner_->gui();
}
-LyXScreen & BufferView::Pimpl::screen() const
+int BufferView::Pimpl::width() const
{
- return *screen_.get();
+ return width_;
}
-Painter & BufferView::Pimpl::painter() const
+int BufferView::Pimpl::height() const
{
- return workarea().getPainter();
+ return height_;
}
lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
<< "[ b = " << b << "]" << endl;
- if (buffer_)
+ if (buffer_) {
disconnectBuffer();
+ // Save the actual cursor position and anchor inside the
+ // buffer so that it can be restored in case we rechange
+ // to this buffer later on.
+ buffer_->saveCursor(cursor_.selectionBegin(),
+ cursor_.selectionEnd());
+ // current buffer is going to be switched-off, save cursor pos
+ LyX::ref().session().saveFilePosition(buffer_->fileName(),
+ boost::tie(cursor_.pit(), cursor_.pos()) );
+ }
// If we are closing current buffer, switch to the first in
// buffer list.
lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
<< "Buffer addr: " << buffer_ << endl;
connectBuffer(*buffer_);
-
cursor_.push(buffer_->inset());
cursor_.resetAnchor();
buffer_->text().init(bv_);
buffer_->text().setCurrentFont(cursor_);
+ if (buffer_->getCursor().size() > 0 &&
+ buffer_->getAnchor().size() > 0)
+ {
+ cursor_.setCursor(buffer_->getAnchor().asDocIterator(&(buffer_->inset())));
+ cursor_.resetAnchor();
+ cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
+ cursor_.setSelection();
+ }
// Buffer-dependent dialogs should be updated or
// hidden. This should go here because some dialogs (eg ToC)
}
update();
- updateScrollbar();
owner_->updateMenubar();
owner_->updateToolbars();
owner_->updateLayoutChoice();
owner_->updateWindowTitle();
// This is done after the layout combox has been populated
- if (buffer_)
- owner_->setLayout(cursor_.paragraph().layout()->name());
+ if (buffer_) {
+ size_t i = cursor_.depth() - 1;
+ // we know we'll eventually find a paragraph
+ while (true) {
+ CursorSlice const & slice = cursor_[i];
+ if (!slice.inset().inMathed()) {
+ LyXLayout_ptr const layout = slice.paragraph().layout();
+ owner_->setLayout(layout->name());
+ break;
+ }
+ BOOST_ASSERT(i>0);
+ --i;
+ }
+ }
if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
// Reset the "Formatting..." message
owner_->clearMessage();
-
- updateScrollbar();
}
if (!bv_->text()) {
lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
<< " no text in updateScrollbar" << endl;
- workarea().setScrollbarParams(0, 0, 0);
+ scrollbarParameters_.reset();
return;
}
LyXText & t = *bv_->text();
- if (anchor_ref_ > int(t.paragraphs().size()) - 1) {
- anchor_ref_ = int(t.paragraphs().size()) - 1;
+ int const parsize = int(t.paragraphs().size() - 1);
+ if (anchor_ref_ > parsize) {
+ anchor_ref_ = parsize;
offset_ref_ = 0;
}
// It would be better to fix the scrollbar to understand
// values in [0..1] and divide everything by wh
- int const wh = workarea().workHeight() / 4;
- int const h = t.getPar(anchor_ref_).height();
- workarea().setScrollbarParams(t.paragraphs().size() * wh, anchor_ref_ * wh + int(offset_ref_ * wh / float(h)), int (wh * defaultRowHeight() / float(h)));
-// workarea().setScrollbarParams(t.paragraphs().size(), anchor_ref_, 1);
+
+ // estimated average paragraph height:
+ if (wh_ == 0)
+ wh_ = height_ / 4;
+ int h = t.getPar(anchor_ref_).height();
+
+ // Normalize anchor/offset (MV):
+ while (offset_ref_ > h && anchor_ref_ < parsize) {
+ anchor_ref_++;
+ offset_ref_ -= h;
+ h = t.getPar(anchor_ref_).height();
+ }
+ // Look at paragraph heights on-screen
+ int sumh = 0;
+ int nh = 0;
+ for (lyx::pit_type pit = anchor_ref_; pit <= parsize; ++pit) {
+ if (sumh > height_)
+ break;
+ int const h2 = t.getPar(pit).height();
+ sumh += h2;
+ nh++;
+ }
+ int const hav = sumh / nh;
+ // More realistic average paragraph height
+ if (hav > wh_)
+ wh_ = hav;
+
+ scrollbarParameters_.height = (parsize + 1) * wh_;
+ scrollbarParameters_.position = anchor_ref_ * wh_ + int(offset_ref_ * wh_ / float(h));
+ scrollbarParameters_.lineScrollHeight = int(wh_ * defaultRowHeight() / float(h));
+}
+
+
+ScrollbarParameters const & BufferView::Pimpl::scrollbarParameters() const
+{
+ return scrollbarParameters_;
}
if (!buffer_)
return;
- screen().hideCursor();
-
- int const wh = workarea().workHeight() / 4;
-
LyXText & t = *bv_->text();
- float const bar = value / float(wh * t.paragraphs().size());
+ float const bar = value / float(wh_ * t.paragraphs().size());
anchor_ref_ = int(bar * t.paragraphs().size());
+ if (anchor_ref_ > int(t.paragraphs().size()) - 1)
+ anchor_ref_ = int(t.paragraphs().size()) - 1;
t.redoParagraph(anchor_ref_);
int const h = t.getPar(anchor_ref_).height();
offset_ref_ = int((bar * t.paragraphs().size() - anchor_ref_) * h);
int const height = 2 * defaultRowHeight();
int const first = height;
- int const last = workarea().workHeight() - height;
+ int const last = height_ - height;
LCursor & cur = cursor_;
bv_funcs::CurStatus st = bv_funcs::status(bv_, cur);
cur.clearSelection();
break;
case bv_funcs::CUR_INSIDE:
- int const y = bv_funcs::getPos(cur).y_;
+ int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
int const newy = min(last, max(y, first));
if (y != newy) {
cur.reset(buffer_->inset());
}
-void BufferView::Pimpl::scroll(int lines)
+void BufferView::Pimpl::scroll(int /*lines*/)
{
// if (!buffer_)
// return;
// scrollDocView(new_top_y);
//
// // Update the scrollbar.
-// workarea().setScrollbarParams(t->height(), top_y(), defaultRowHeight());
+// workArea_->setScrollbarParams(t->height(), top_y(), defaultRowHeight());
}
key_modifier::state state)
{
owner_->getLyXFunc().processKeySym(key, state);
-
- /* This is perhaps a bit of a hack. When we move
- * around, or type, it's nice to be able to see
- * the cursor immediately after the keypress. So
- * we reset the toggle timeout and force the visibility
- * of the cursor. Note we cannot do this inside
- * dispatch() itself, because that's called recursively.
- */
- if (available()) {
- cursor_timeout.restart();
- screen().showCursor(*bv_);
- }
}
}
if (!xsel_cache_.set ||
- cur.back() != xsel_cache_.cursor ||
- cur.anchor_.back() != xsel_cache_.anchor)
+ cur.top() != xsel_cache_.cursor ||
+ cur.anchor_.top() != xsel_cache_.anchor)
{
- xsel_cache_.cursor = cur.back();
- xsel_cache_.anchor = cur.anchor_.back();
+ xsel_cache_.cursor = cur.top();
+ xsel_cache_.anchor = cur.anchor_.top();
xsel_cache_.set = cur.selection();
sel = cur.selectionAsString(false);
if (!sel.empty())
- workarea().putClipboard(sel);
+ owner_->gui().selection().put(sel);
}
}
void BufferView::Pimpl::selectionLost()
{
if (available()) {
- screen().hideCursor();
cursor_.clearSelection();
xsel_cache_.set = false;
}
}
-void BufferView::Pimpl::workAreaResize()
+void BufferView::Pimpl::workAreaResize(int width, int height)
{
- static int work_area_width;
- static int work_area_height;
-
- bool const widthChange = workarea().workWidth() != work_area_width;
- bool const heightChange = workarea().workHeight() != work_area_height;
+ bool const widthChange = width != width_;
+ bool const heightChange = height != height_;
// Update from work area
- work_area_width = workarea().workWidth();
- work_area_height = workarea().workHeight();
+ width_ = width;
+ height_ = height;
if (buffer_ && widthChange) {
// The visible LyXView need a resize
if (widthChange || heightChange)
update();
- // Always make sure that the scrollbar is sane.
- updateScrollbar();
owner_->updateLayoutChoice();
}
LyXFont const font = cursor_.getFont();
int const asc = font_metrics::maxAscent(font);
int const des = font_metrics::maxDescent(font);
- Point p = bv_funcs::getPos(cursor_);
- if (p.y_ - asc >= 0 && p.y_ + des < workarea().workHeight())
+ Point const p = bv_funcs::getPos(cursor_, cursor_.boundary());
+ if (p.y_ - asc >= 0 && p.y_ + des < height_)
return false;
}
center();
}
-void BufferView::Pimpl::update(bool fitcursor, bool forceupdate)
+bool BufferView::Pimpl::multiParSel()
+{
+ if (!cursor_.selection())
+ return false;
+ bool ret = multiparsel_cache_;
+ multiparsel_cache_ = cursor_.selBegin().pit() != cursor_.selEnd().pit();
+ // Either this, or previous selection spans paragraphs
+ return ret || multiparsel_cache_;
+}
+
+
+ViewMetricsInfo const & BufferView::Pimpl::viewMetricsInfo()
+{
+ return metrics_info_;
+}
+
+
+void BufferView::Pimpl::update(Update::flags flags)
{
- lyxerr << BOOST_CURRENT_FUNCTION
- << "[fitcursor = " << fitcursor << ','
- << " forceupdate = " << forceupdate
- << "] buffer: " << buffer_ << endl;
+ // This is close to a hot-path.
+ if (lyxerr.debugging(Debug::DEBUG)) {
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << "[fitcursor = " << (flags & Update::FitCursor)
+ << ", forceupdate = " << (flags & Update::Force)
+ << ", singlepar = " << (flags & Update::SinglePar)
+ << "] buffer: " << buffer_ << endl;
+ }
// Check needed to survive LyX startup
if (buffer_) {
// Update macro store
buffer_->buildMacros();
- // First drawing step
- CoordCache backup;
- std::swap(theCoords, backup);
- theCoords.startUpdating();
+ // First drawing step
+ bool singlePar = flags & Update::SinglePar;
+ needs_redraw_ = flags & (Update::Force | Update::SinglePar);
- ViewMetricsInfo vi = metrics();
+ updateMetrics(singlePar);
- if (fitcursor && fitCursor()) {
- forceupdate = true;
- vi = metrics();
+ if ((flags & (Update::FitCursor | Update::MultiParSel))
+ && (fitCursor() || multiParSel())) {
+ needs_redraw_ = true;
+ singlePar = false;
}
- if (forceupdate) {
+
+ if (needs_redraw_) {
// Second drawing step
- screen().redraw(*bv_, vi);
- } else {
- // Abort updating of the coord cache - just restore the old one
- std::swap(theCoords, backup);
+ updateMetrics(singlePar);
}
- } else
- screen().greyOut();
-
- // And the scrollbar
- updateScrollbar();
- owner_->view_state_changed();
-}
-
-
-// Callback for cursor timer
-void BufferView::Pimpl::cursorToggle()
-{
- if (buffer_) {
- screen().toggleCursor(*bv_);
-
- // Use this opportunity to deal with any child processes that
- // have finished but are waiting to communicate this fact
- // to the rest of LyX.
- ForkedcallsController & fcc = ForkedcallsController::get();
- if (fcc.processesCompleted())
- fcc.handleCompletedProcesses();
}
- cursor_timeout.restart();
+ owner_->redrawWorkArea();
+ owner_->view_state_changed();
}
return Change(Change::UNCHANGED);
return text->getPar(cur.selBegin().pit()).
- lookupChangeFull(cur.selBegin().pos());
+ lookupChange(cur.selBegin().pos());
}
if (par == buffer_->par_iterator_end())
return;
- bv_->text()->setCursor(cursor_, par.pit(),
- min(par->size(), saved_positions[i].par_pos));
+ bv_->setCursor(makeDocIterator(par, min(par->size(), saved_positions[i].par_pos)));
if (i > 0)
owner_->message(bformat(_("Moved to bookmark %1$d"), i));
}
+void BufferView::Pimpl::saveSavedPositions()
+{
+ // save bookmarks. It is better to use the pit interface
+ // but I do not know how to effectively convert between
+ // par_id and pit.
+ for (unsigned int i=1; i < saved_positions_num; ++i) {
+ if ( isSavedPosition(i) )
+ LyX::ref().session().saveBookmark( boost::tie(
+ i,
+ saved_positions[i].filename,
+ saved_positions[i].par_id,
+ saved_positions[i].par_pos) );
+ }
+}
+
+
void BufferView::Pimpl::switchKeyMap()
{
if (!lyxrc.rtl_support)
Intl & intl = owner_->getIntl();
if (bv_->getLyXText()->real_current_font.isRightToLeft()) {
if (intl.keymap == Intl::PRIMARY)
- intl.KeyMapSec();
+ intl.keyMapSec();
} else {
if (intl.keymap == Intl::SECONDARY)
- intl.KeyMapPrim();
+ intl.keyMapPrim();
}
}
bot.text()->redoParagraph(pit);
Paragraph const & par = bot.text()->paragraphs()[pit];
anchor_ref_ = pit;
- offset_ref_ = bv_funcs::coordOffset(cursor_).y_ + par.ascent()
- - workarea().workHeight() / 2;
+ offset_ref_ = bv_funcs::coordOffset(cursor_, cursor_.boundary()).y_
+ + par.ascent() - height_ / 2;
}
-void BufferView::Pimpl::stuffClipboard(string const & content) const
-{
- workarea().putClipboard(content);
-}
-
-void BufferView::Pimpl::MenuInsertLyXFile(string const & filenm)
+void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
{
+ BOOST_ASSERT(cursor_.inTexted());
string filename = filenm;
if (filename.empty()) {
if (available()) {
string const trypath = owner_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (IsDirWriteable(trypath))
+ if (isDirWriteable(trypath))
initpath = trypath;
}
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(package().system_support(), "examples"))));
+ string(addPath(package().system_support(), "examples"))));
FileDialog::Result result =
fileDlg.open(initpath,
// Get absolute path of file and add ".lyx"
// to the filename if necessary
- filename = FileSearch(string(), filename, "lyx");
+ filename = fileSearch(string(), filename, "lyx");
- string const disp_fn = MakeDisplayPath(filename);
+ string const disp_fn = makeDisplayPath(filename);
owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
- cursor_.clearSelection();
- bv_->getLyXText()->breakParagraph(cursor_);
-
- BOOST_ASSERT(cursor_.inTexted());
+ string res;
+ Buffer buf("", false);
+ buf.error.connect(boost::bind(&BufferView::Pimpl::addError, this, _1));
+ if (::loadLyXFile(&buf, makeAbsPath(filename))) {
+ lyx::cap::pasteParagraphList(cursor_, buf.paragraphs(),
+ buf.params().textclass);
+ res = _("Document %1$s inserted.");
+ } else
+ res = _("Could not insert document %1$s");
- string const fname = MakeAbsPath(filename);
- bool const res = buffer_->readFile(fname, cursor_.pit());
+ owner_->message(bformat(res, disp_fn));
+ bv_->showErrorList(_("Document insertion"));
resizeCurrentBuffer();
-
- string s = res ? _("Document %1$s inserted.")
- : _("Could not insert document %1$s");
- owner_->message(bformat(s, disp_fn));
}
// We cannot allow undos beyond the freeze point
buffer_->undostack().clear();
} else {
- update();
- bv_->text()->setCursor(cursor_, 0, 0);
-#ifdef WITH_WARNINGS
-#warning changes FIXME
-#endif
- bool const found = lyx::find::findNextChange(bv_);
- if (found) {
+ cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
+ if (lyx::find::findNextChange(bv_)) {
owner_->getDialogs().show("changes");
return;
}
bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0)
{
- lyxerr << BOOST_CURRENT_FUNCTION
- << "[ cmd0 " << cmd0 << "]" << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION << "[ cmd0 " << cmd0 << "]" << endl;
// This is only called for mouse related events including
// LFUN_FILE_OPEN generated by drag-and-drop.
if (!available())
return false;
- screen().hideCursor();
-
// Either the inset under the cursor or the
// surrounding LyXText will handle this event.
// Build temporary cursor.
- cmd.y = min(max(cmd.y,-1), workarea().workHeight());
+ cmd.y = min(max(cmd.y, -1), height_);
InsetBase * inset = bv_->text()->editXY(cur, cmd.x, cmd.y);
- lyxerr << BOOST_CURRENT_FUNCTION
- << " * hit inset at tip: " << inset << endl;
- lyxerr << BOOST_CURRENT_FUNCTION
- << " * created temp cursor:" << cur << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION
+ // << " * hit inset at tip: " << inset << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION
+ // << " * created temp cursor:" << cur << endl;
// Put anchor at the same position.
cur.resetAnchor();
if (cur.result().dispatched()) {
// Redraw if requested or necessary.
- update(cur.result().update(), cur.result().update());
+ if (cur.result().update())
+ update(Update::FitCursor | Update::Force);
+ else
+ update(Update::FitCursor | Update::MultiParSel);
}
- // See workAreaKeyPress
- cursor_timeout.restart();
- screen().showCursor(*bv_);
-
// Skip these when selecting
if (cmd.action != LFUN_MOUSE_MOTION) {
owner_->updateLayoutChoice();
case LFUN_FILE_INSERT:
case LFUN_FILE_INSERT_ASCII_PARA:
case LFUN_FILE_INSERT_ASCII:
- case LFUN_FONT_STATE:
- case LFUN_INSERT_LABEL:
case LFUN_BOOKMARK_SAVE:
- case LFUN_REF_GOTO:
+ // FIXME: Actually, these LFUNS should be moved to LyXText
+ flag.enabled(cursor_.inTexted());
+ break;
+ case LFUN_FONT_STATE:
+ case LFUN_LABEL_INSERT:
+ case LFUN_PARAGRAPH_GOTO:
+ // FIXME handle non-trivially
+ case LFUN_OUTLINE_UP:
+ case LFUN_OUTLINE_DOWN:
+ case LFUN_OUTLINE_IN:
+ case LFUN_OUTLINE_OUT:
+ case LFUN_ERROR_NEXT:
+ case LFUN_NOTE_NEXT:
+ case LFUN_REFERENCE_NEXT:
case LFUN_WORD_FIND:
case LFUN_WORD_REPLACE:
case LFUN_MARK_OFF:
case LFUN_MARK_ON:
- case LFUN_SETMARK:
- case LFUN_CENTER:
+ case LFUN_MARK_TOGGLE:
+ case LFUN_SCREEN_RECENTER:
+ case LFUN_BIBTEX_DATABASE_ADD:
+ case LFUN_BIBTEX_DATABASE_DEL:
case LFUN_WORDS_COUNT:
flag.enabled(true);
break;
+ case LFUN_LABEL_GOTO: {
+ flag.enabled(!cmd.argument.empty()
+ || getInsetByCode<InsetRef>(cursor_, InsetBase::REF_CODE));
+ break;
+ }
+
case LFUN_BOOKMARK_GOTO:
flag.enabled(isSavedPosition(convert<unsigned int>(cmd.argument)));
break;
- case LFUN_TRACK_CHANGES:
+ case LFUN_CHANGES_TRACK:
flag.enabled(true);
flag.setOnOff(buffer_->params().tracking_changes);
break;
- case LFUN_OUTPUT_CHANGES: {
- LaTeXFeatures features(*buffer_, buffer_->params(), false);
+ case LFUN_CHANGES_OUTPUT: {
+ OutputParams runparams;
+ LaTeXFeatures features(*buffer_, buffer_->params(), runparams);
flag.enabled(buffer_ && buffer_->params().tracking_changes
&& features.isAvailable("dvipost"));
flag.setOnOff(buffer_->params().output_changes);
break;
}
- case LFUN_MERGE_CHANGES:
- case LFUN_ACCEPT_CHANGE: // what about these two
- case LFUN_REJECT_CHANGE: // what about these two
- case LFUN_ACCEPT_ALL_CHANGES:
- case LFUN_REJECT_ALL_CHANGES:
+ case LFUN_CHANGES_MERGE:
+ case LFUN_CHANGE_ACCEPT: // what about these two
+ case LFUN_CHANGE_REJECT: // what about these two
+ case LFUN_ALL_CHANGES_ACCEPT:
+ case LFUN_ALL_CHANGES_REJECT:
flag.enabled(buffer_ && buffer_->params().tracking_changes);
break;
+
+ case LFUN_BUFFER_TOGGLE_COMPRESSION: {
+ flag.setOnOff(buffer_->params().compressed);
+ break;
+ }
+
default:
flag.enabled(false);
}
break;
case LFUN_FILE_INSERT:
- MenuInsertLyXFile(cmd.argument);
+ menuInsertLyXFile(cmd.argument);
break;
case LFUN_FILE_INSERT_ASCII_PARA:
- InsertAsciiFile(bv_, cmd.argument, true);
+ insertAsciiFile(bv_, cmd.argument, true);
break;
case LFUN_FILE_INSERT_ASCII:
- InsertAsciiFile(bv_, cmd.argument, false);
+ insertAsciiFile(bv_, cmd.argument, false);
break;
case LFUN_FONT_STATE:
restorePosition(convert<unsigned int>(cmd.argument));
break;
- case LFUN_REF_GOTO: {
+ case LFUN_LABEL_GOTO: {
string label = cmd.argument;
if (label.empty()) {
InsetRef * inset =
break;
}
- case LFUN_TRACK_CHANGES:
+ case LFUN_PARAGRAPH_GOTO: {
+ int const id = convert<int>(cmd.argument);
+ ParIterator par = buffer_->getParFromID(id);
+ if (par == buffer_->par_iterator_end()) {
+ lyxerr[Debug::INFO] << "No matching paragraph found! ["
+ << id << ']' << endl;
+ break;
+ } else {
+ lyxerr[Debug::INFO] << "Paragraph " << par->id()
+ << " found." << endl;
+ }
+
+ // Set the cursor
+ bv_->setCursor(makeDocIterator(par, 0));
+
+ update();
+ switchKeyMap();
+ break;
+ }
+
+ case LFUN_OUTLINE_UP:
+ lyx::toc::outline(lyx::toc::Up, cursor_);
+ cursor_.text()->setCursor(cursor_, cursor_.pit(), 0);
+ updateLabels(*buffer_);
+ break;
+ case LFUN_OUTLINE_DOWN:
+ lyx::toc::outline(lyx::toc::Down, cursor_);
+ cursor_.text()->setCursor(cursor_, cursor_.pit(), 0);
+ updateLabels(*buffer_);
+ break;
+ case LFUN_OUTLINE_IN:
+ lyx::toc::outline(lyx::toc::In, cursor_);
+ updateLabels(*buffer_);
+ break;
+ case LFUN_OUTLINE_OUT:
+ lyx::toc::outline(lyx::toc::Out, cursor_);
+ updateLabels(*buffer_);
+ break;
+
+ case LFUN_ERROR_NEXT:
+ bv_funcs::gotoInset(bv_, InsetBase::ERROR_CODE, false);
+ break;
+
+ case LFUN_NOTE_NEXT:
+ bv_funcs::gotoInset(bv_, InsetBase::NOTE_CODE, false);
+ break;
+
+ case LFUN_REFERENCE_NEXT: {
+ vector<InsetBase_code> tmp;
+ tmp.push_back(InsetBase::LABEL_CODE);
+ tmp.push_back(InsetBase::REF_CODE);
+ bv_funcs::gotoInset(bv_, tmp, true);
+ break;
+ }
+
+ case LFUN_CHANGES_TRACK:
trackChanges();
break;
- case LFUN_OUTPUT_CHANGES: {
+ case LFUN_CHANGES_OUTPUT: {
bool const state = buffer_->params().output_changes;
buffer_->params().output_changes = !state;
break;
}
- case LFUN_MERGE_CHANGES:
- owner_->getDialogs().show("changes");
+ case LFUN_CHANGES_MERGE:
+ if (lyx::find::findNextChange(bv_))
+ owner_->getDialogs().show("changes");
break;
- case LFUN_ACCEPT_ALL_CHANGES: {
+ case LFUN_ALL_CHANGES_ACCEPT: {
cursor_.reset(buffer_->inset());
#ifdef WITH_WARNINGS
#warning FIXME changes
break;
}
- case LFUN_REJECT_ALL_CHANGES: {
+ case LFUN_ALL_CHANGES_REJECT: {
cursor_.reset(buffer_->inset());
#ifdef WITH_WARNINGS
#warning FIXME changes
cur.message(N_("Mark on"));
break;
- case LFUN_SETMARK:
+ case LFUN_MARK_TOGGLE:
cur.clearSelection();
if (cur.mark()) {
cur.mark() = false;
cur.resetAnchor();
break;
- case LFUN_CENTER:
+ case LFUN_SCREEN_RECENTER:
center();
break;
+ case LFUN_BIBTEX_DATABASE_ADD: {
+ LCursor tmpcur = cursor_;
+ bv_funcs::findInset(tmpcur, InsetBase::BIBTEX_CODE, false);
+ InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
+ InsetBase::BIBTEX_CODE);
+ if (inset) {
+ if (inset->addDatabase(cmd.argument))
+ buffer_->updateBibfilesCache();
+ }
+ break;
+ }
+
+ case LFUN_BIBTEX_DATABASE_DEL: {
+ LCursor tmpcur = cursor_;
+ bv_funcs::findInset(tmpcur, InsetBase::BIBTEX_CODE, false);
+ InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
+ InsetBase::BIBTEX_CODE);
+ if (inset) {
+ if (inset->delDatabase(cmd.argument))
+ buffer_->updateBibfilesCache();
+ }
+ break;
+ }
+
case LFUN_WORDS_COUNT: {
DocIterator from, to;
if (cur.selection()) {
Alert::information(_("Count words"), message);
}
break;
+
+ case LFUN_BUFFER_TOGGLE_COMPRESSION:
+ // turn compression on/off
+ buffer_->params().compressed = !buffer_->params().compressed;
+ break;
+
default:
return false;
}
}
-ViewMetricsInfo BufferView::Pimpl::metrics()
+void BufferView::Pimpl::updateMetrics(bool singlepar)
{
// Remove old position cache
theCoords.clear();
BufferView & bv = *bv_;
LyXText * const text = bv.text();
+ lyx::pit_type size = int(text->paragraphs().size());
+
if (anchor_ref_ > int(text->paragraphs().size() - 1)) {
anchor_ref_ = int(text->paragraphs().size() - 1);
offset_ref_ = 0;
int pit2 = pit;
size_t const npit = text->paragraphs().size();
- lyxerr << BOOST_CURRENT_FUNCTION
- << " npit: " << npit
- << " pit1: " << pit1
- << " pit2: " << pit2
- << endl;
+ // Rebreak anchor paragraph. In Single Paragraph mode, rebreak only
+ // the (main text, not inset!) paragraph containing the cursor.
+ // (if this paragraph contains insets etc., rebreaking will
+ // recursively descend)
+ if (!singlepar || pit == cursor_.bottom().pit())
+ text->redoParagraph(pit);
+ int y0 = text->getPar(pit).ascent() - offset_ref_;
- // Rebreak anchor par
- text->redoParagraph(pit);
- int y0 = text->getPar(pit1).ascent() - offset_ref_;
-
- // Redo paragraphs above cursor if necessary
+ // Redo paragraphs above anchor if necessary; again, in Single Par
+ // mode, only if we encounter the (main text) one having the cursor.
int y1 = y0;
while (y1 > 0 && pit1 > 0) {
y1 -= text->getPar(pit1).ascent();
--pit1;
- text->redoParagraph(pit1);
+ if (!singlepar || pit1 == cursor_.bottom().pit())
+ text->redoParagraph(pit1);
y1 -= text->getPar(pit1).descent();
}
anchor_ref_ = 0;
}
- // Redo paragraphs below cursor if necessary
+ // Redo paragraphs below the anchor if necessary. Single par mode:
+ // only the one containing the cursor if encountered.
int y2 = y0;
while (y2 < bv.workHeight() && pit2 < int(npit) - 1) {
y2 += text->getPar(pit2).descent();
++pit2;
- text->redoParagraph(pit2);
+ if (!singlepar || pit2 == cursor_.bottom().pit())
+ text->redoParagraph(pit2);
y2 += text->getPar(pit2).ascent();
}
// The coordinates of all these paragraphs are correct, cache them
int y = y1;
+ CoordCache::InnerParPosCache & parPos = theCoords.parPos()[text];
for (lyx::pit_type pit = pit1; pit <= pit2; ++pit) {
- y += text->getPar(pit).ascent();
- theCoords.parPos()[text][pit] = Point(0, y);
- y += text->getPar(pit).descent();
+ Paragraph & par = text->getPar(pit);
+ y += par.ascent();
+ parPos[pit] = Point(0, y);
+ if (singlepar && pit == cursor_.bottom().pit()) {
+ // In Single Paragraph mode, collect here the
+ // y1 and y2 of the (one) paragraph the cursor is in
+ y1 = y - par.ascent();
+ y2 = y + par.descent();
+ }
+ y += par.descent();
}
- lyxerr << BOOST_CURRENT_FUNCTION
- << " y1: " << y1
- << " y2: " << y2
- << endl;
+ if (singlepar) {
+ // collect cursor paragraph iter bounds
+ pit1 = cursor_.bottom().pit();
+ pit2 = cursor_.bottom().pit();
+ }
+
+ lyxerr[Debug::DEBUG]
+ << BOOST_CURRENT_FUNCTION
+ << " y1: " << y1
+ << " y2: " << y2
+ << " pit1: " << pit1
+ << " pit2: " << pit2
+ << " npit: " << npit
+ << " singlepar: " << singlepar
+ << "size: " << size
+ << endl;
- return ViewMetricsInfo(pit1, pit2, y1, y2);
+ metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
}
projects / lyx.git / blobdiff