#include "support/filetools.h"
#include "support/Package.h"
#include "support/types.h"
-#include "support/fs_extras.h"
-#include <boost/bind.hpp>
#include <boost/current_function.hpp>
-#include <boost/next_prior.hpp>
-#include <boost/filesystem/operations.hpp>
#include <cerrno>
#include <fstream>
#include <functional>
+#include <iterator>
#include <vector>
using std::distance;
using std::string;
using std::vector;
-namespace fs = boost::filesystem;
-
namespace lyx {
using support::addPath;
}
-
-/// the type of outline operation
-enum OutlineOp {
- OutlineUp, // Move this header with text down
- OutlineDown, // Move this header with text up
- OutlineIn, // Make this header deeper
- OutlineOut // Make this header shallower
-};
-
-
-void outline(OutlineOp mode, Cursor & cur)
-{
- Buffer & buf = cur.buffer();
- pit_type & pit = cur.pit();
- ParagraphList & pars = buf.text().paragraphs();
- ParagraphList::iterator bgn = pars.begin();
- // The first paragraph of the area to be copied:
- ParagraphList::iterator start = boost::next(bgn, pit);
- // The final paragraph of area to be copied:
- ParagraphList::iterator finish = start;
- ParagraphList::iterator end = pars.end();
-
- TextClass::const_iterator lit =
- buf.params().getTextClass().begin();
- TextClass::const_iterator const lend =
- buf.params().getTextClass().end();
-
- int const thistoclevel = start->layout()->toclevel;
- int toclevel;
- switch (mode) {
- case OutlineUp: {
- // Move out (down) from this section header
- if (finish != end)
- ++finish;
- // Seek the one (on same level) below
- for (; finish != end; ++finish) {
- toclevel = finish->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC
- && toclevel <= thistoclevel) {
- break;
- }
- }
- ParagraphList::iterator dest = start;
- // Move out (up) from this header
- if (dest == bgn)
- break;
- // Search previous same-level header above
- do {
- --dest;
- toclevel = dest->layout()->toclevel;
- } while(dest != bgn
- && (toclevel == Layout::NOT_IN_TOC
- || toclevel > thistoclevel));
- // Not found; do nothing
- if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)
- break;
- pit_type const newpit = std::distance(bgn, dest);
- pit_type const len = std::distance(start, finish);
- pit_type const deletepit = pit + len;
- buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
- pars.insert(dest, start, finish);
- start = boost::next(pars.begin(), deletepit);
- pit = newpit;
- pars.erase(start, finish);
- break;
- }
- case OutlineDown: {
- // Go down out of current header:
- if (finish != end)
- ++finish;
- // Find next same-level header:
- for (; finish != end; ++finish) {
- toclevel = finish->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
- break;
- }
- ParagraphList::iterator dest = finish;
- // Go one down from *this* header:
- if (dest != end)
- ++dest;
- else
- break;
- // Go further down to find header to insert in front of:
- for (; dest != end; ++dest) {
- toclevel = dest->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
- break;
- }
- // One such was found:
- pit_type newpit = std::distance(bgn, dest);
- pit_type const len = std::distance(start, finish);
- buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
- pars.insert(dest, start, finish);
- start = boost::next(bgn, pit);
- pit = newpit - len;
- pars.erase(start, finish);
- break;
- }
- case OutlineIn:
- buf.undo().recordUndo(cur);
- for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel + 1 &&
- start->layout()->labeltype == (*lit)->labeltype) {
- start->layout((*lit));
- break;
- }
- }
- break;
- case OutlineOut:
- buf.undo().recordUndo(cur);
- for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel - 1 &&
- start->layout()->labeltype == (*lit)->labeltype) {
- start->layout((*lit));
- break;
- }
- }
- break;
- default:
- break;
- }
-}
-
/// A map from a Text to the associated text metrics
typedef std::map<Text const *, TextMetrics> TextMetricsCache;
struct BufferView::Private
{
Private(BufferView & bv): wh_(0), cursor_(bv),
- multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
- need_centering_(false), last_inset_(0), gui_(0)
+ anchor_ref_(0), offset_ref_(0), need_centering_(false),
+ last_inset_(0), gui_(0)
{}
///
///
Cursor cursor_;
///
- bool multiparsel_cache_;
- ///
pit_type anchor_ref_;
///
int offset_ref_;
// currently can only handle bottom (whole document) level pit and pos.
// That is to say, if a cursor is in a nested inset, it will be
// restore to the left of the top level inset.
- LyX::ref().session().lastFilePos().save(
- support::FileName(buffer_.absFileName()),
- boost::tie(d->cursor_.bottom().pit(), d->cursor_.bottom().pos()) );
+ LastFilePosSection::FilePos fp;
+ fp.pit = d->cursor_.bottom().pit();
+ fp.pos = d->cursor_.bottom().pos();
+ LyX::ref().session().lastFilePos().save(buffer_.fileName(), fp);
delete d;
}
{
if (cursorStatus(d->cursor_) == CUR_INSIDE) {
frontend::FontMetrics const & fm =
- theFontMetrics(d->cursor_.getFont());
+ theFontMetrics(d->cursor_.getFont().fontInfo());
int const asc = fm.maxAscent();
int const des = fm.maxDescent();
Point const p = getPos(d->cursor_, d->cursor_.boundary());
}
-bool BufferView::multiParSel()
-{
- if (!d->cursor_.selection())
- return false;
- bool ret = d->multiparsel_cache_;
- d->multiparsel_cache_ = d->cursor_.selBegin().pit() != d->cursor_.selEnd().pit();
- // Either this, or previous selection spans paragraphs
- return ret || d->multiparsel_cache_;
-}
-
-
void BufferView::processUpdateFlags(Update::flags flags)
{
// last_inset_ points to the last visited inset. This pointer may become
// Update macro store
if (!(cursor().inMathed() && cursor().inMacroMode()))
- buffer_.buildMacros();
+ buffer_.updateMacros();
// Now do the first drawing step if needed. This consists on updating
// the CoordCache in updateMetrics().
bool const fit_cursor = fitCursor();
// tell the frontend to update the screen if needed.
if (fit_cursor) {
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
return;
}
return;
}
- bool full_metrics = flags & Update::Force;
- if (flags & Update::MultiParSel)
- full_metrics |= multiParSel();
+ bool const full_metrics = flags & Update::Force;
- bool const single_par = !full_metrics;
- updateMetrics(single_par);
+ if (full_metrics || !singleParUpdate())
+ // We have to update the full screen metrics.
+ updateMetrics();
if (!(flags & Update::FitCursor)) {
buffer_.changed();
// The screen has been recentered around the cursor position so
// refresh it:
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
}
tm.redoParagraph(d->anchor_ref_);
int const h = tm.parMetrics(d->anchor_ref_).height();
d->offset_ref_ = int((bar * t.paragraphs().size() - d->anchor_ref_) * h);
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
}
// pit and pos will be updated with bottom level pit/pos
// when lyx exits.
LyX::ref().session().bookmarks().save(
- FileName(buffer_.absFileName()),
+ buffer_.fileName(),
d->cursor_.bottom().pit(),
d->cursor_.bottom().pos(),
d->cursor_.paragraph().id(),
case LFUN_LABEL_INSERT:
case LFUN_INFO_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_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
case LFUN_WORD_FIND:
break;
}
- case LFUN_OUTLINE_UP:
- outline(OutlineUp, d->cursor_);
- d->cursor_.text()->setCursor(d->cursor_, d->cursor_.pit(), 0);
- updateLabels(buffer_);
- break;
- case LFUN_OUTLINE_DOWN:
- outline(OutlineDown, d->cursor_);
- d->cursor_.text()->setCursor(d->cursor_, d->cursor_.pit(), 0);
- updateLabels(buffer_);
- break;
- case LFUN_OUTLINE_IN:
- outline(OutlineIn, d->cursor_);
- updateLabels(buffer_);
- break;
- case LFUN_OUTLINE_OUT:
- outline(OutlineOut, d->cursor_);
- updateLabels(buffer_);
- break;
-
case LFUN_NOTE_NEXT:
gotoInset(this, NOTE_CODE, false);
break;
if (inset) {
if (inset->isActive()) {
Cursor tmpcur = cur;
- tmpcur.pushLeft(*inset);
+ tmpcur.pushBackward(*inset);
inset->dispatch(tmpcur, tmpcmd);
if (tmpcur.result().dispatched()) {
cur.dispatched();
if (p.y_ < 0 || p.y_ > height_) {
// The cursor is off-screen so recenter before proceeding.
center();
- updateMetrics(false);
+ updateMetrics();
//FIXME: updateMetrics() does not update paragraph position
// This is done at draw() time. So we need a redraw!
+ // But no screen update is needed.
+ d->metrics_info_.update_strategy = NoScreenUpdate;
buffer_.changed();
p = getPos(cur, cur.boundary());
}
cur.forwardInset();
}
// FIXME: we need to do a redraw again because of the selection
+ // But no screen update is needed.
+ d->metrics_info_.update_strategy = NoScreenUpdate;
buffer_.changed();
updateFlags = Update::Force | Update::FitCursor;
break;
width_ = width;
height_ = height;
- updateMetrics(false);
+ updateMetrics();
}
tm.newParMetricsDown();
}
d->offset_ref_ += offset;
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
}
tm.newParMetricsUp();
}
d->offset_ref_ -= offset;
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
}
updateLabels(buffer_);
- updateMetrics(false);
+ updateMetrics();
buffer_.changed();
return true;
}
d->cursor_.clearSelection();
d->cursor_.finishUndo();
+ d->cursor_.setCurrentFont();
return update;
}
}
-void BufferView::updateMetrics(bool singlepar)
+void BufferView::updateMetrics()
{
- if (singlepar && singleParUpdate())
- // No need to update the full screen metrics.
- return;
-
Text & buftext = buffer_.text();
pit_type const npit = int(buftext.paragraphs().size());
initpath = trypath;
// FIXME UNICODE
- FileDialog fileDlg(_("Select LyX document to insert"),
- LFUN_FILE_INSERT,
- make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(),
- "examples"))));
+ FileDialog dlg(_("Select LyX document to insert"), LFUN_FILE_INSERT);
+ dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+ dlg.setButton2(_("Examples|#E#e"),
+ from_utf8(addPath(package().system_support().absFilename(),
+ "examples")));
FileDialog::Result result =
- fileDlg.open(from_utf8(initpath),
+ dlg.open(from_utf8(initpath),
FileFilterList(_("LyX Documents (*.lyx)")),
docstring());
// emit message signal.
message(bformat(res, disp_fn));
buffer_.errors("Parse");
- updateMetrics(false);
+ updateMetrics();
}
void BufferView::draw(frontend::Painter & pain)
{
+ LYXERR(Debug::PAINTING) << "\t\t*** START DRAWING ***" << endl;
+ Text & text = buffer_.text();
+ TextMetrics const & tm = d->text_metrics_[&text];
+ int const y = d->metrics_info_.y1
+ + tm.parMetrics(d->metrics_info_.p1).ascent();
PainterInfo pi(this, pain);
- // Should the whole screen, including insets, be refreshed?
- // FIXME: We should also distinguish DecorationUpdate to avoid text
- // drawing if possible. This is not possible to do easily right now
- // because of the single backing pixmap.
- pi.full_repaint = d->metrics_info_.update_strategy != SingleParUpdate;
- if (pi.full_repaint)
+ switch (d->metrics_info_.update_strategy) {
+
+ case NoScreenUpdate:
+ // If no screen painting is actually needed, only some the different
+ // coordinates of insets and paragraphs needs to be updated.
+ pi.full_repaint = true;
+ pi.pain.setDrawingEnabled(false);
+ tm.draw(pi, 0, y);
+ break;
+
+ case SingleParUpdate:
+ // Only the current outermost paragraph will be redrawn.
+ pi.full_repaint = false;
+ tm.drawParagraph(pi, d->metrics_info_.p1, 0, y);
+ break;
+
+ case DecorationUpdate:
+ // FIXME: We should also distinguish DecorationUpdate to avoid text
+ // drawing if possible. This is not possible to do easily right now
+ // because of the single backing pixmap.
+
+ case FullScreenUpdate:
+ // The whole screen, including insets, will be refreshed.
+ pi.full_repaint = true;
+
// Clear background (if not delegated to rows)
pain.fillRectangle(0, d->metrics_info_.y1, width_,
d->metrics_info_.y2 - d->metrics_info_.y1,
buffer_.inset().backgroundColor());
-
- LYXERR(Debug::PAINTING) << "\t\t*** START DRAWING ***" << endl;
- Text & text = buffer_.text();
- TextMetrics const & tm = d->text_metrics_[&text];
- int y = d->metrics_info_.y1 + tm.parMetrics(d->metrics_info_.p1).ascent();
- if (!pi.full_repaint)
- tm.drawParagraph(pi, d->metrics_info_.p1, 0, y);
- else
tm.draw(pi, 0, y);
- LYXERR(Debug::PAINTING) << "\n\t\t*** END DRAWING ***" << endl;
- // and grey out above (should not happen later)
-// lyxerr << "par ascent: " << text.getPar(d->metrics_info_.p1).ascent() << endl;
- if (d->metrics_info_.y1 > 0
- && d->metrics_info_.update_strategy == FullScreenUpdate)
- pain.fillRectangle(0, 0, width_, d->metrics_info_.y1, Color::bottomarea);
+ // and grey out above (should not happen later)
+ if (d->metrics_info_.y1 > 0)
+ pain.fillRectangle(0, 0, width_,
+ d->metrics_info_.y1, Color_bottomarea);
- // and possibly grey out below
-// lyxerr << "par descent: " << text.getPar(d->metrics_info_.p1).ascent() << endl;
- if (d->metrics_info_.y2 < height_
- && d->metrics_info_.update_strategy == FullScreenUpdate)
- pain.fillRectangle(0, d->metrics_info_.y2, width_,
- height_ - d->metrics_info_.y2, Color::bottomarea);
+ // and possibly grey out below
+ if (d->metrics_info_.y2 < height_)
+ pain.fillRectangle(0, d->metrics_info_.y2, width_,
+ height_ - d->metrics_info_.y2, Color_bottomarea);
+ break;
+ }
+
+ LYXERR(Debug::PAINTING) << "\n\t\t*** END DRAWING ***" << endl;
}
FileName fname(f);
if (fname.empty()) {
- FileDialog fileDlg(_("Select file to insert"),
+ FileDialog dlg(_("Select file to insert"),
( asParagraph
? LFUN_FILE_INSERT_PLAINTEXT_PARA
: LFUN_FILE_INSERT_PLAINTEXT) );
FileDialog::Result result =
- fileDlg.open(from_utf8(buffer().filePath()),
+ dlg.open(from_utf8(buffer().filePath()),
FileFilterList(), docstring());
if (result.first == FileDialog::Later)
return docstring();
}
- if (!fs::is_readable(fname.toFilesystemEncoding())) {
+ if (!fname.isReadable()) {
docstring const error = from_ascii(strerror(errno));
docstring const file = makeDisplayPath(fname.absFilename(), 50);
docstring const text =
projects / lyx.git / blobdiff