#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "pariterator.h"
-#include "rowpainter.h"
#include "toc.h"
#include "undo.h"
#include "vspace.h"
#include "insets/insettext.h"
#include "frontends/Alert.h"
-#include "frontends/Clipboard.h"
#include "frontends/Dialogs.h"
#include "frontends/FileDialog.h"
#include "frontends/font_metrics.h"
#include "frontends/Gui.h"
#include "frontends/LyXView.h"
-#include "frontends/Painter.h"
-#include "frontends/WorkArea.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 <functional>
#include <vector>
-using lyx::frontend::WorkArea;
using lyx::frontend::Clipboard;
using lyx::frontend::Gui;
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;
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 timecon;
-
/// Return an inset of this class if it exists at the current cursor position
template <class T>
T * getInsetByCode(LCursor & cur, InsetBase::Code code)
} // anon namespace
-BufferView::Pimpl::Pimpl(BufferView & bv, LyXView * owner, WorkArea * workArea)
- : bv_(&bv), owner_(owner), workArea_(workArea), buffer_(0), wh_(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;
- // 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::Painter & BufferView::Pimpl::painter() const
-{
- return workArea_->getPainter();
-}
-
-
int BufferView::Pimpl::width() const
{
return width_;
if (!buffer_)
return;
- owner_->gui().guiCursor().hide();
-
LyXText & t = *bv_->text();
float const bar = value / float(wh_ * t.paragraphs().size());
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())
- owner_->gui().guiCursor().show(*bv_);
}
xsel_cache_.set = cur.selection();
sel = cur.selectionAsString(false);
if (!sel.empty())
- owner_->gui().clipboard().put(sel);
+ owner_->gui().selection().put(sel);
}
}
void BufferView::Pimpl::selectionLost()
{
if (available()) {
- owner_->gui().guiCursor().hide();
cursor_.clearSelection();
xsel_cache_.set = false;
}
}
+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 forceupdate(flags & (Update::Force | Update::SinglePar));
+ bool singlePar = flags & Update::SinglePar;
+ needs_redraw_ = flags & (Update::Force | Update::SinglePar);
- if ((flags & Update::FitCursor) && fitCursor()) {
- forceupdate = true;
- vi = metrics();
- }
- if ((flags & Update::MultiParSel) && multiParSel()) {
- forceupdate = true;
- vi = metrics();
+ updateMetrics(singlePar);
+
+ if ((flags & (Update::FitCursor | Update::MultiParSel))
+ && (fitCursor() || multiParSel())) {
+ needs_redraw_ = true;
+ singlePar = false;
}
- if (forceupdate) {
+
+ if (needs_redraw_) {
// Second drawing step
- workArea_->redraw(*bv_, vi);
- } else {
- // Abort updating of the coord
- // cache - just restore the old one
- std::swap(theCoords, backup);
+ updateMetrics(singlePar);
}
- } else
- workArea_->greyOut();
-
- owner_->view_state_changed();
-}
-
-
-// Callback for cursor timer
-void BufferView::Pimpl::cursorToggle()
-{
- if (buffer_) {
- owner_->gui().guiCursor().toggle(*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();
- fcc.handleCompletedProcesses();
}
- cursor_timeout.restart();
+ owner_->redrawWorkArea();
+ owner_->view_state_changed();
}
}
-void BufferView::Pimpl::stuffClipboard(string const & content) const
-{
- owner_->gui().clipboard().put(content);
-}
-
void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
{
if (!available())
return false;
- owner_->gui().guiCursor().hide();
-
// Either the inset under the cursor or the
// surrounding LyXText will handle this event.
update(Update::FitCursor | Update::MultiParSel);
}
- // See workAreaKeyPress
- cursor_timeout.restart();
- owner_->gui().guiCursor().show(*bv_);
-
// Skip these when selecting
if (cmd.action != LFUN_MOUSE_MOTION) {
owner_->updateLayoutChoice();
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();
// 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);
+ 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 - text->getPar(pit).ascent();
- y2 = y + text->getPar(pit).descent();
+ y1 = y - par.ascent();
+ y2 = y + par.descent();
}
- y += text->getPar(pit).descent();
+ y += par.descent();
}
if (singlepar) {
<< "size: " << size
<< endl;
- return ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
+ metrics_info_ = ViewMetricsInfo(pit1, pit2, y1, y2, singlepar, size);
}