#include "frontends/font_metrics.h"
#include "frontends/Gui.h"
#include "frontends/LyXView.h"
-#include "frontends/Painter.h"
#include "frontends/WorkArea.h"
#include "graphics/Previews.h"
} // anon namespace
-BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner, WorkArea * workArea)
- : bv_(&bv), owner_(owner), workArea_(workArea), buffer_(0), wh_(0), cursor_timeout(400),
+BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner)
+ : bv_(&bv), owner_(owner), buffer_(0), wh_(0), cursor_timeout(400),
using_xterm_cursor(false), cursor_(bv),
- anchor_ref_(0), offset_ref_(0)
+ multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0)
{
xsel_cache_.set = false;
.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();
}
-lyx::frontend::WorkArea & BufferView::Pimpl::workarea() const
-{
- return *workArea_;
-}
-
-
-lyx::frontend::Clipboard & BufferView::Pimpl::clipboard() const
-{
- return owner_->gui().clipboard();
-}
-
-
-lyx::frontend::Painter & BufferView::Pimpl::painter() const
-{
- return workArea_->getPainter();
-}
-
-
int BufferView::Pimpl::width() const
{
return width_;
xsel_cache_.set = cur.selection();
sel = cur.selectionAsString(false);
if (!sel.empty())
- clipboard().put(sel);
+ owner_->gui().clipboard().put(sel);
}
}
}
+ViewMetricsInfo const & BufferView::Pimpl::viewMetricsInfo()
+{
+ return metrics_info_;
+}
+
+
void BufferView::Pimpl::update(Update::flags flags)
{
- lyxerr[Debug::DEBUG]
- << BOOST_CURRENT_FUNCTION
- << "[fitcursor = " << (flags & Update::FitCursor)
- << ", forceupdate = " << (flags & Update::Force)
- << ", singlepar = " << (flags & Update::SinglePar)
- << "] 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();
- CoordCache backup;
- std::swap(theCoords, backup);
-
// This, together with doneUpdating(), verifies (using
// asserts) that screen redraw is not called from
// within itself.
theCoords.startUpdating();
// First drawing step
- ViewMetricsInfo vi = metrics(flags & Update::SinglePar);
+ bool singlePar = flags & Update::SinglePar;
bool forceupdate(flags & (Update::Force | Update::SinglePar));
- if ((flags & Update::FitCursor) && fitCursor()) {
+ if ((flags & (Update::FitCursor | Update::MultiParSel))
+ && (fitCursor() || multiParSel())) {
forceupdate = true;
- vi = metrics();
- }
- if ((flags & Update::MultiParSel) && multiParSel()) {
- forceupdate = true;
- vi = metrics();
+ singlePar = false;
}
+
if (forceupdate) {
// Second drawing step
- workArea_->redraw(*bv_, vi);
+ updateMetrics(singlePar);
+ owner_->workArea()->redraw(*bv_);
} else {
// Abort updating of the coord
// cache - just restore the old one
- std::swap(theCoords, backup);
+ theCoords.doneUpdating();
}
} else
- workArea_->greyOut();
+ owner_->workArea()->greyOut();
owner_->view_state_changed();
}
}
-void BufferView::Pimpl::stuffClipboard(string const & content) const
-{
- clipboard().put(content);
-}
-
void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
{
case LFUN_OUTLINE_IN:
lyx::toc::outline(lyx::toc::In, cursor_);
updateLabels(*buffer_);
- break;
+ break;
case LFUN_OUTLINE_OUT:
lyx::toc::outline(lyx::toc::Out, cursor_);
updateLabels(*buffer_);
}
-ViewMetricsInfo BufferView::Pimpl::metrics(bool singlepar)
+void BufferView::Pimpl::updateMetrics(bool singlepar)
{
// Remove old position cache
theCoords.clear();
<< "size: " << size
<< endl;
- return ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
+ metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
}