using support::addPath;
using support::bformat;
using support::FileFilterList;
+using support::FileName;
using support::fileSearch;
using support::isDirWriteable;
+using support::isFileReadable;
using support::makeDisplayPath;
using support::makeAbsPath;
using support::package;
: width_(0), height_(0), buffer_(0), wh_(0),
cursor_(*this),
multiparsel_cache_(false), anchor_ref_(0), offset_ref_(0),
- intl_(new Intl)
+ intl_(new Intl), last_inset_(0)
{
xsel_cache_.set = false;
intl_->initKeyMapper(lyxrc.use_kbmap);
buffer_->saveCursor(cursor_.selectionBegin(),
cursor_.selectionEnd());
// current buffer is going to be switched-off, save cursor pos
- LyX::ref().session().lastFilePos().save(buffer_->fileName(),
+ LyX::ref().session().lastFilePos().save(FileName(buffer_->fileName()),
boost::tie(cursor_.pit(), cursor_.pos()) );
}
}
}
- update();
+ if (buffer_)
+ updateMetrics(false);
if (buffer_ && graphics::Previews::status() != LyXRC::PREVIEW_OFF)
graphics::Previews::get().generateBufferPreviews(*buffer_);
}
-bool BufferView::loadLyXFile(string const & filename, bool tolastfiles)
+bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
{
- // Get absolute path of file and add ".lyx"
- // to the filename if necessary
- string s = fileSearch(string(), filename, "lyx");
-
- bool const found = !s.empty();
-
- if (!found)
- s = filename;
-
// File already open?
- if (theBufferList().exists(s)) {
- docstring const file = makeDisplayPath(s, 20);
+ if (theBufferList().exists(filename.absFilename())) {
+ docstring const file = makeDisplayPath(filename.absFilename(), 20);
docstring text = bformat(_("The document %1$s is already "
"loaded.\n\nDo you want to revert "
"to the saved version?"), file);
text, 0, 1, _("&Revert"), _("&Switch to document"));
if (ret != 0) {
- setBuffer(theBufferList().getBuffer(s));
+ setBuffer(theBufferList().getBuffer(filename.absFilename()));
return true;
}
// FIXME: should be LFUN_REVERT
- if (!theBufferList().close(theBufferList().getBuffer(s), false))
+ if (!theBufferList().close(theBufferList().getBuffer(filename.absFilename()), false))
return false;
// Fall through to new load. (Asger)
buffer_ = 0;
Buffer * b = 0;
- if (found) {
- b = theBufferList().newBuffer(s);
- if (!lyx::loadLyXFile(b, s)) {
+ if (isFileReadable(filename)) {
+ b = theBufferList().newBuffer(filename.absFilename());
+ if (!lyx::loadLyXFile(b, filename)) {
theBufferList().release(b);
return false;
}
} else {
docstring text = bformat(_("The document %1$s does not yet "
"exist.\n\nDo you want to create "
- "a new document?"), from_utf8(s));
+ "a new document?"), from_utf8(filename.absFilename()));
int const ret = Alert::prompt(_("Create new document?"),
text, 0, 1, _("&Create"), _("Cancel"));
if (ret == 0) {
- b = newFile(s, string(), true);
+ b = newFile(filename.absFilename(), string(), true);
if (!b)
return false;
} else
if (lyxrc.use_lastfilepos) {
pit_type pit;
pos_type pos;
- boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(s);
+ boost::tie(pit, pos) = LyX::ref().session().lastFilePos().load(filename);
// I am not sure how to separate the following part to a function
// so I will leave this to Lars.
//
if (it.pit() == pit) {
// restored pos may be bigger than it->size
setCursor(makeDocIterator(it, min(pos, it->size())));
- update(Update::FitCursor);
+ // No need to update the metrics if fitCursor returns false.
+ if (fitCursor())
+ updateMetrics(false);
break;
}
}
}
if (tolastfiles)
- LyX::ref().session().lastFiles().add(b->fileName());
+ LyX::ref().session().lastFiles().add(FileName(b->fileName()));
return true;
}
void BufferView::reload()
{
- string const fn = buffer_->fileName();
if (theBufferList().close(buffer_, false))
- loadLyXFile(fn);
+ loadLyXFile(FileName(buffer_->fileName()));
}
lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << endl;
buffer_->text().init(this);
- update();
+ updateMetrics(false);
switchKeyMap();
}
// Update macro store
buffer_->buildMacros();
- // First drawing step
- updateMetrics(flags & Update::SinglePar);
-
+ // Now do the first drawing step if needed. This consists on updating
+ // the CoordCache in updateMetrics().
// The second drawing step is done in WorkArea::redraw() if needed.
- bool const need_second_step =
- (flags & (Update::SinglePar | Update::Force | Update::FitCursor | Update::MultiParSel))
- && (fitCursor() || multiParSel());
- return need_second_step;
+ // Case when no explicit update is requested.
+ if (!flags) {
+ // no need to redraw anything.
+ return false;
+ }
+
+ if (flags == Update::FitCursor) {
+ bool const fit_cursor = fitCursor();
+ if (fit_cursor)
+ updateMetrics(false);
+ // tell the frontend to update the screen if needed.
+ return fit_cursor;
+ }
+
+ bool full_metrics = flags & Update::Force;
+ if (flags & Update::MultiParSel)
+ full_metrics |= multiParSel();
+
+ bool const single_par = !full_metrics;
+ updateMetrics(single_par);
+
+ if (flags & Update::FitCursor && fitCursor())
+ updateMetrics(false);
+
+ // tell the frontend to update the screen.
+ return true;
}
t.redoParagraph(*this, anchor_ref_);
int const h = t.getPar(anchor_ref_).height();
offset_ref_ = int((bar * t.paragraphs().size() - anchor_ref_) * h);
+ updateMetrics(false);
}
void BufferView::saveBookmark(bool persistent)
{
LyX::ref().session().bookmarks().save(
- buffer_->fileName(),
+ FileName(buffer_->fileName()),
cursor_.paragraph().id(),
cursor_.pos(),
persistent
case LFUN_CHANGE_NEXT:
case LFUN_ALL_CHANGES_ACCEPT:
case LFUN_ALL_CHANGES_REJECT:
- flag.enabled(buffer_); // FIXME: Change tracking (MG)
+ // TODO: context-sensitive enabling of LFUNs
+ // In principle, these command should only be enabled if there
+ // is a change in the document. However, without proper
+ // optimizations, this will inevitably result in poor performance.
+ flag.enabled(buffer_);
break;
case LFUN_BUFFER_TOGGLE_COMPRESSION: {
break;
case LFUN_FILE_INSERT:
- // FIXME: We don't know the encoding of filenames
+ // FIXME UNICODE
menuInsertLyXFile(to_utf8(cmd.argument()));
break;
case LFUN_FILE_INSERT_ASCII_PARA:
- // FIXME: We don't know the encoding of filenames
+ // FIXME UNICODE
insertAsciiFile(this, to_utf8(cmd.argument()), true);
break;
case LFUN_FILE_INSERT_ASCII:
- // FIXME: We don't know the encoding of filenames
+ // FIXME UNICODE
insertAsciiFile(this, to_utf8(cmd.argument()), false);
break;
case LFUN_PARAGRAPH_GOTO: {
int const id = convert<int>(to_utf8(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;
+ int i = 0;
+ for (Buffer * b = buffer_; i == 0 || b != buffer_; b = theBufferList().next(b)) {
+ ParIterator par = b->getParFromID(id);
+ if (par == b->par_iterator_end()) {
+ lyxerr[Debug::INFO]
+ << "No matching paragraph found! ["
+ << id << "]." << endl;
+ } else {
+ lyxerr[Debug::INFO]
+ << "Paragraph " << par->id()
+ << " found in buffer `"
+ << b->fileName() << "'." << endl;
+
+ if (b == buffer_) {
+ // Set the cursor
+ setCursor(makeDocIterator(par, 0));
+ update();
+ switchKeyMap();
+ } else {
+ // Switch to other buffer view and resend cmd
+ theLyXFunc().dispatch(FuncRequest(
+ LFUN_BUFFER_SWITCH, b->fileName()));
+ theLyXFunc().dispatch(cmd);
+ }
+ break;
+ }
+ ++i;
}
-
- // Set the cursor
- setCursor(makeDocIterator(par, 0));
-
- update();
- switchKeyMap();
break;
}
void BufferView::workAreaResize(int width, int height)
{
- bool const widthChange = width != width_;
- bool const heightChange = height != height_;
-
+ // A resize is triggered whenever a window gets focus,
+ // because of the shared rows() of a buffer in multiple
+ // buffer views.
+
// Update from work area
width_ = width;
height_ = height;
if (buffer_)
resize();
-
- update();
}
// LFUN_FILE_OPEN generated by drag-and-drop.
FuncRequest cmd = cmd0;
+ // E.g. Qt mouse press when no buffer
if (!buffer_)
return false;
cur.push(buffer_->inset());
cur.selection() = cursor_.selection();
- // Doesn't go through lyxfunc, so we need to update
- // the layout choice etc. ourselves
-
- // E.g. Qt mouse press when no buffer
- if (!buffer_)
- return false;
-
// Either the inset under the cursor or the
// surrounding LyXText will handle this event.
// Build temporary cursor.
cmd.y = min(max(cmd.y, -1), height_);
InsetBase * inset = buffer_->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;
+ // NOTE: editXY returns the top level inset of nested insets. If you happen
+ // to move from a text (inset=0) to a text inside an inset (e.g. an opened
+ // footnote inset, again inset=0), that inset will not be redrawn.
+ if (cmd.action == LFUN_MOUSE_MOTION && cmd.button() == mouse_button::none) {
+ bool need_redraw = false;
+
+ if (inset != last_inset_) {
+ if (last_inset_)
+ need_redraw |= last_inset_->setMouseHover(false);
+ if (inset)
+ need_redraw |= inset->setMouseHover(true);
+ last_inset_ = inset;
+ }
+
+ // if last metrics update was in singlepar mode, WorkArea::redraw() will
+ // not expose the button for redraw. We adjust here the metrics dimension
+ // to enable a full redraw.
+ // FIXME: It is possible to redraw only the area around the button!
+ if (need_redraw && metrics_info_.singlepar) {
+ // FIXME: It should be possible to redraw only the area around
+ // the button by doing this:
+ //
+ //metrics_info_.singlepar = false;
+ //metrics_info_.y1 = ymin of button;
+ //metrics_info_.y2 = ymax of button;
+ //
+ // Unfortunately, rowpainter.C:paintText() does not distinguish
+ // between background updates and text updates. So we use the hammer
+ // solution for now. We could also avoid the updateMetrics() below
+ // by using the first and last pit of the CoordCache. Have a look
+ // at LyXText::getPitNearY() to see what I mean.
+ //
+ //metrics_info_.pit1 = first pit of CoordCache;
+ //metrics_info_.pit2 = last pit of CoordCache;
+ //metrics_info_.singlepar = false;
+ //metrics_info_.y1 = 0;
+ //metrics_info_.y2 = height_;
+ //
+ updateMetrics(false);
+ }
+
+ // This event (moving without mouse click) is not passed further.
+ // This should be changed if it is further utilized.
+ return need_redraw;
+ }
+
// Put anchor at the same position.
cur.resetAnchor();
// via the temp cursor. If the inset wishes to change the real
// cursor it has to do so explicitly by using
// cur.bv().cursor() = cur; (or similar)
- if (inset)
+ if (inset) {
inset->dispatch(cur, cmd);
+ }
// Now dispatch to the temporary cursor. If the real cursor should
// be modified, the inset's dispatch has to do so explicitly.
if (!cur.result().dispatched())
cur.dispatch(cmd);
- if (cur.result().dispatched()) {
- // Redraw if requested or necessary.
- if (cur.result().update())
- update(Update::FitCursor | Update::Force);
- else
- update(Update::FitCursor | Update::MultiParSel);
- }
+ // Redraw if requested and necessary.
+ if (cur.result().dispatched() && cur.result().update())
+ return update(cur.result().update());
- return true;
+ return false;
}
}
-void BufferView::mouseSetCursor(LCursor & cur)
+bool BufferView::mouseSetCursor(LCursor & cur)
{
BOOST_ASSERT(&cur.bv() == this);
// do the dEPM magic if needed
// FIXME: move this to InsetText::notifyCursorLeaves?
+ bool update = false;
if (!badcursor && cursor_.inTexted())
- cursor_.text()->deleteEmptyParagraphMechanism(cur, cursor_);
+ update = cursor_.text()->deleteEmptyParagraphMechanism(cur, cursor_);
cursor_ = cur;
cursor_.clearSelection();
cursor_.setTargetX();
finishUndo();
-
+ return update;
}
void BufferView::updateMetrics(bool singlepar)
{
- // FIXME (Abdel 19/10/2006):
- // There's something fishy in tabular. The coord_cache_ is not
- // correctly reconstructed when a character is trying to be inserted.
- // Not clearing out the coord_cache_ fixes the crash but there is a
- // bad side effect: buffer-begin and buffer-end do not update the screen.
- //
- // Remove old position cache
- coord_cache_.clear();
+ // Clear out the position cache in case of full screen redraw.
+ if (!singlepar)
+ coord_cache_.clear();
LyXText & buftext = buffer_->text();
pit_type size = int(buftext.paragraphs().size());
// Get absolute path of file and add ".lyx"
// to the filename if necessary
- filename = fileSearch(string(), filename, "lyx");
+ filename = fileSearch(string(), filename, "lyx").absFilename();
docstring const disp_fn = makeDisplayPath(filename);
// emit message signal.
docstring res;
Buffer buf("", false);
- if (lyx::loadLyXFile(&buf, makeAbsPath(filename))) {
+ if (lyx::loadLyXFile(&buf, FileName(filename))) {
ErrorList & el = buffer_->errorList("Parse");
// Copy the inserted document error list into the current buffer one.
el = buf.errorList("Parse");