#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,
- int width, int height)
+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;
- workAreaId_ = owner_->gui().newWorkArea(width, height);
- workArea_ = & owner_->gui().workArea(workAreaId_);
-
// Setup the signals
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();
}
-lyx::frontend::WorkArea & BufferView::Pimpl::workarea() const
-{
- return *workArea_;
-}
-
-
-lyx::frontend::Clipboard & BufferView::Pimpl::clipboard() const
+int BufferView::Pimpl::width() const
{
- return owner_->gui().clipboard();
+ return width_;
}
-lyx::frontend::Painter & BufferView::Pimpl::painter() const
+int BufferView::Pimpl::height() const
{
- return workArea_->getPainter();
+ return height_;
}
}
update();
- updateScrollbar();
owner_->updateMenubar();
owner_->updateToolbars();
owner_->updateLayoutChoice();
// 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;
}
// estimated average paragraph height:
if (wh_ == 0)
- wh_ = workArea_->height() / 4;
+ wh_ = height_ / 4;
int h = t.getPar(anchor_ref_).height();
// Normalize anchor/offset (MV):
int sumh = 0;
int nh = 0;
for (lyx::pit_type pit = anchor_ref_; pit <= parsize; ++pit) {
- if (sumh > workArea_->height())
+ if (sumh > height_)
break;
int const h2 = t.getPar(pit).height();
sumh += h2;
if (hav > wh_)
wh_ = hav;
- workArea_->setScrollbarParams((parsize + 1) * wh_,
- anchor_ref_ * wh_ + int(offset_ref_ * wh_ / float(h)),
- int(wh_ * defaultRowHeight() / float(h)));
+ 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_;
}
int const height = 2 * defaultRowHeight();
int const first = height;
- int const last = workArea_->height() - height;
+ int const last = height_ - height;
LCursor & cur = cursor_;
bv_funcs::CurStatus st = bv_funcs::status(bv_, cur);
// scrollDocView(new_top_y);
//
// // Update the scrollbar.
-// workArea_->.setScrollbarParams(t->height(), top_y(), defaultRowHeight());
+// workArea_->setScrollbarParams(t->height(), top_y(), defaultRowHeight());
}
xsel_cache_.set = cur.selection();
sel = cur.selectionAsString(false);
if (!sel.empty())
- clipboard().put(sel);
+ owner_->gui().clipboard().put(sel);
}
}
}
-void BufferView::Pimpl::workAreaResize()
+void BufferView::Pimpl::workAreaResize(int width, int height)
{
- static int workArea_width;
- static int workArea_height;
-
- bool const widthChange = workArea_->width() != workArea_width;
- bool const heightChange = workArea_->height() != workArea_height;
+ bool const widthChange = width != width_;
+ bool const heightChange = height != height_;
// Update from work area
- workArea_width = workArea_->width();
- workArea_height = workArea_->height();
+ 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();
}
int const asc = font_metrics::maxAscent(font);
int const des = font_metrics::maxDescent(font);
Point const p = bv_funcs::getPos(cursor_, cursor_.boundary());
- if (p.y_ - asc >= 0 && p.y_ + des < workArea_->height())
+ if (p.y_ - asc >= 0 && p.y_ + des < height_)
return false;
}
center();
}
+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();
- // And the scrollbar
- updateScrollbar();
owner_->view_state_changed();
}
Paragraph const & par = bot.text()->paragraphs()[pit];
anchor_ref_ = pit;
offset_ref_ = bv_funcs::coordOffset(cursor_, cursor_.boundary()).y_
- + par.ascent() - workArea_->height() / 2;
+ + par.ascent() - height_ / 2;
}
-void BufferView::Pimpl::stuffClipboard(string const & content) const
-{
- clipboard().put(content);
-}
-
void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
{
// surrounding LyXText will handle this event.
// Build temporary cursor.
- cmd.y = min(max(cmd.y, -1), workArea_->height());
+ 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;
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);
}