#include "insets/InsetText.h"
#include "frontends/alert.h"
+#include "frontends/Application.h"
#include "frontends/Delegates.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "support/convert.h"
#include "support/debug.h"
+#include "support/ExceptionMessage.h"
#include "support/FileFilterList.h"
#include "support/filetools.h"
#include "support/gettext.h"
if (height_ == 0)
return;
+ // We prefer fixed size line scrolling.
+ d->scrollbarParameters_.single_step = defaultRowHeight();
+ // We prefer full screen page scrolling.
+ d->scrollbarParameters_.page_step = height_;
+
Text & t = buffer_.text();
TextMetrics & tm = d->text_metrics_[&t];
d->par_height_.resize(parsize, defaultRowHeight() * 2);
}
- // It would be better to fix the scrollbar to understand
- // values in [0..1] and divide everything by wh
-
// Look at paragraph heights on-screen
- pit_type first_visible_pit = -1;
pair<pit_type, ParagraphMetrics const *> first = tm.first();
pair<pit_type, ParagraphMetrics const *> last = tm.last();
for (pit_type pit = first.first; pit <= last.first; ++pit) {
- ParagraphMetrics const & pm = tm.parMetrics(pit);
- d->par_height_[pit] = pm.height();
- if (first_visible_pit >= 0 || pm.position() + pm.descent() <= 0)
- continue;
- first_visible_pit = pit;
- LYXERR(Debug::SCROLLING, "first visible pit " << first_visible_pit);
- // FIXME: we should look for the first visible row within
- // the deepest inset!
- int row_pos = pm.position();
- size_t const nrows = pm.rows().size();
- for (size_t i = 0; i != nrows; ++i) {
- Row const & row = pm.rows()[i];
- if (row_pos >= 0) {
- LYXERR(Debug::SCROLLING, "first visible row " << i
- << "(row pos = " << row_pos << ");");
- break;
- }
- row_pos += row.height();
- }
- d->scrollbarParameters_.position = row_pos;
+ d->par_height_[pit] = tm.parMetrics(pit).height();
+ LYXERR(Debug::SCROLLING, "storing height for pit " << pit << " : "
+ << d->par_height_[pit]);
}
- d->scrollbarParameters_.height = 0;
- for (size_t i = 0; i != d->par_height_.size(); ++i) {
- if (i == first_visible_pit)
- d->scrollbarParameters_.position += d->scrollbarParameters_.height;
- d->scrollbarParameters_.height += d->par_height_[i];
+ int top_pos = first.second->position() - first.second->ascent();
+ int bottom_pos = last.second->position() + last.second->descent();
+ bool first_visible = first.first == 0 && top_pos >= 0;
+ bool last_visible = last.first == parsize - 1 && bottom_pos <= height_;
+ if (first_visible && last_visible) {
+ d->scrollbarParameters_.min = 0;
+ d->scrollbarParameters_.max = 0;
+ return;
}
- // We prefer fixed size line scrolling.
- d->scrollbarParameters_.lineScrollHeight = defaultRowHeight();
+ d->scrollbarParameters_.min = top_pos;
+ for (size_t i = 0; i != first.first; ++i)
+ d->scrollbarParameters_.min -= d->par_height_[i];
+ d->scrollbarParameters_.max = bottom_pos;
+ for (size_t i = last.first + 1; i != parsize; ++i)
+ d->scrollbarParameters_.max += d->par_height_[i];
+
+ d->scrollbarParameters_.position = 0;
+ // The reference is the top position so we remove one page.
+ d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
}
}
+docstring BufferView::contextMenu(int x, int y) const
+{
+ // Get inset under mouse, if there is one.
+ Inset const * covering_inset = getCoveringInset(buffer_.text(), x, y);
+ if (covering_inset)
+ return covering_inset->contextMenu(*this, x, y);
+
+ // FIXME: Do something more elaborate here.
+ return from_ascii("edit");
+}
+
+
void BufferView::scrollDocView(int value)
{
int const offset = value - d->scrollbarParameters_.position;
return;
}
- int par_pos = 0;
- for (size_t i = 0; i != d->par_height_.size(); ++i) {
+ // cut off at the top
+ if (value <= d->scrollbarParameters_.min) {
+ DocIterator dit = doc_iterator_begin(buffer_.inset());
+ showCursor(dit);
+ LYXERR(Debug::SCROLLING, "scroll to top");
+ return;
+ }
+
+ // cut off at the bottom
+ if (value >= d->scrollbarParameters_.max) {
+ DocIterator dit = doc_iterator_end(buffer_.inset());
+ dit.backwardPos();
+ showCursor(dit);
+ LYXERR(Debug::SCROLLING, "scroll to bottom");
+ return;
+ }
+
+ // find paragraph at target position
+ int par_pos = d->scrollbarParameters_.min;
+ pit_type i = 0;
+ for (; i != d->par_height_.size(); ++i) {
par_pos += d->par_height_[i];
- if (par_pos >= value) {
- d->anchor_pit_ = pit_type(i);
+ if (par_pos >= value)
break;
- }
}
- LYXERR(Debug::SCROLLING, "value = " << value
- << "\tanchor_ref_ = " << d->anchor_pit_
- << "\tpar_pos = " << par_pos);
+ if (par_pos < value) {
+ // It seems we didn't find the correct pit so stay on the safe side and
+ // scroll to bottom.
+ LYXERR0("scrolling position not found!");
+ scrollDocView(d->scrollbarParameters_.max);
+ return;
+ }
- d->anchor_ypos_ = par_pos - value;
- updateMetrics();
- buffer_.changed();
+ DocIterator dit = doc_iterator_begin(buffer_.inset());
+ dit.pit() = i;
+ LYXERR(Debug::SCROLLING, "value = " << value << " -> scroll to pit " << i);
+ showCursor(dit);
}
void BufferView::showCursor()
+{
+ showCursor(d->cursor_);
+}
+
+
+void BufferView::showCursor(DocIterator const & dit)
{
// We are not properly started yet, delay until resizing is
// done.
LYXERR(Debug::SCROLLING, "recentering!");
- CursorSlice & bot = d->cursor_.bottom();
+ CursorSlice const & bot = dit.bottom();
TextMetrics & tm = d->text_metrics_[bot.text()];
pos_type const max_pit = pos_type(bot.text()->paragraphs().size() - 1);
- int bot_pit = d->cursor_.bottom().pit();
+ int bot_pit = bot.pit();
if (bot_pit > max_pit) {
// FIXME: Why does this happen?
LYXERR0("bottom pit is greater that max pit: "
if (tm.has(bot_pit)) {
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
+ BOOST_ASSERT(!pm.rows().empty());
+ // FIXME: smooth scrolling doesn't work in mathed.
+ CursorSlice const & cs = dit.innerTextSlice();
+ int offset = coordOffset(dit, dit.boundary()).y_;
int ypos = pm.position() + offset;
- Dimension const & row_dim = d->cursor_.textRow().dimension();
+ Dimension const & row_dim =
+ pm.getRow(cs.pos(), dit.boundary()).dimension();
if (ypos - row_dim.ascent() < 0)
scrollUp(- ypos + row_dim.ascent());
else if (ypos + row_dim.descent() > height_)
tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
+ int offset = coordOffset(dit, dit.boundary()).y_;
d->anchor_pit_ = bot_pit;
- Dimension const & row_dim = d->cursor_.textRow().dimension();
+ CursorSlice const & cs = dit.innerTextSlice();
+ Dimension const & row_dim =
+ pm.getRow(cs.pos(), dit.boundary()).dimension();
if (d->anchor_pit_ == 0)
d->anchor_ypos_ = offset + pm.ascent();
else if (d->anchor_pit_ == max_pit)
d->anchor_ypos_ = height_ - offset - row_dim.descent();
else
- d->anchor_ypos_ = offset + pm.ascent() - height_ / 2;
+ d->anchor_ypos_ = defaultRowHeight() * 2 - offset - row_dim.descent();
updateMetrics();
buffer_.changed();
case LFUN_SCREEN_RECENTER:
case LFUN_BIBTEX_DATABASE_ADD:
case LFUN_BIBTEX_DATABASE_DEL:
- case LFUN_WORDS_COUNT:
+ case LFUN_STATISTICS:
case LFUN_NEXT_INSET_TOGGLE:
flag.enabled(true);
break;
case LFUN_SCREEN_UP:
case LFUN_SCREEN_DOWN:
+ case LFUN_SCROLL:
flag.enabled(true);
break;
cur.clearSelection();
if (!cur.textUndo())
cur.message(_("No further undo information"));
+ else
+ processUpdateFlags(Update::Force | Update::FitCursor);
break;
case LFUN_REDO:
cur.clearSelection();
if (!cur.textRedo())
cur.message(_("No further redo information"));
+ else
+ processUpdateFlags(Update::Force | Update::FitCursor);
break;
case LFUN_FONT_STATE:
break;
}
- case LFUN_WORDS_COUNT: {
+ case LFUN_STATISTICS: {
DocIterator from, to;
if (cur.selection()) {
from = cur.selectionBegin();
from = doc_iterator_begin(buffer_.inset());
to = doc_iterator_end(buffer_.inset());
}
- int const count = countWords(from, to);
+ int const words = countWords(from, to);
+ int const chars = countChars(from, to, false);
+ int const chars_blanks = countChars(from, to, true);
docstring message;
- if (count != 1) {
- if (cur.selection())
- message = bformat(_("%1$d words in selection."),
- count);
- else
- message = bformat(_("%1$d words in document."),
- count);
- }
- else {
- if (cur.selection())
- message = _("One word in selection.");
- else
- message = _("One word in document.");
- }
-
- Alert::information(_("Count words"), message);
+ if (cur.selection())
+ message = _("Statistics for the selection:");
+ else
+ message = _("Statistics for the document:");
+ message += "\n\n";
+ if (words != 1)
+ message += bformat(_("%1$d words"), words);
+ else
+ message += _("One word");
+ message += "\n";
+ if (chars_blanks != 1)
+ message += bformat(_("%1$d characters (including blanks)"),
+ chars_blanks);
+ else
+ message += _("One character (including blanks)");
+ message += "\n";
+ if (chars != 1)
+ message += bformat(_("%1$d characters (excluding blanks)"),
+ chars);
+ else
+ message += _("One character (excluding blanks)");
+
+ Alert::information(_("Statistics"), message);
}
break;
buffer_.params().compressed = !buffer_.params().compressed;
break;
- case LFUN_BUFFER_TOGGLE_EMBEDDING:
+ case LFUN_BUFFER_TOGGLE_EMBEDDING: {
// turn embedding on/off
- buffer_.embeddedFiles().enable(!buffer_.params().embedded);
+ try {
+ buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_);
+ } catch (ExceptionMessage const & message) {
+ Alert::error(message.title_, message.details_);
+ }
break;
+ }
case LFUN_NEXT_INSET_TOGGLE: {
// this is the real function we want to invoke
if (!cur.result().dispatched())
cur.dispatch(tmpcmd);
- if (cur.result().dispatched())
- cur.clearSelection();
-
+ if (!cur.result().dispatched())
+ // It did not work too; no action needed.
+ break;
+ cur.clearSelection();
+ processUpdateFlags(Update::SinglePar | Update::FitCursor);
break;
}
break;
}
+ case LFUN_SCROLL:
+ lfunScroll(cmd);
+ break;
+
case LFUN_SCREEN_UP_SELECT:
case LFUN_SCREEN_DOWN_SELECT: {
// Those two are not ready yet for consumption.
void BufferView::resize(int width, int height)
{
+ bool initialResize = (height_ == 0);
+
// Update from work area
width_ = width;
height_ = height;
d->par_height_.clear();
updateMetrics();
+
+ // view got his initial size, make sure that
+ // the cursor has a proper position
+ if (initialResize) {
+ updateScrollbar();
+ showCursor();
+ }
}
}
+void BufferView::lfunScroll(FuncRequest const & cmd)
+{
+ string const scroll_type = cmd.getArg(0);
+ int const scroll_step =
+ (scroll_type == "line")? d->scrollbarParameters_.single_step
+ : (scroll_type == "page")? d->scrollbarParameters_.page_step : 0;
+ if (scroll_step == 0)
+ return;
+ string const scroll_quantity = cmd.getArg(1);
+ if (scroll_quantity == "up")
+ scrollUp(scroll_step);
+ else if (scroll_quantity == "down")
+ scrollDown(scroll_step);
+ else {
+ int const scroll_value = convert<int>(scroll_quantity);
+ if (scroll_value)
+ scroll(scroll_step * scroll_value);
+ }
+}
+
+
void BufferView::scroll(int y)
{
if (y > 0)
if (!changed)
return false;
+ d->cursor_ = cur;
+
updateLabels(buffer_);
updateMetrics();
// Rebreak anchor paragraph.
tm.redoParagraph(d->anchor_pit_);
ParagraphMetrics & anchor_pm = tm.par_metrics_[d->anchor_pit_];
+
+ // position anchor
+ if (d->anchor_pit_ == 0) {
+ int scrollRange = d->scrollbarParameters_.max - d->scrollbarParameters_.min;
+
+ // Complete buffer visible? Then it's easy.
+ if (scrollRange == 0)
+ d->anchor_ypos_ = anchor_pm.ascent();
+
+ // FIXME: Some clever handling needed to show
+ // the _first_ paragraph up to the top if the cursor is
+ // in the first line.
+ }
anchor_pm.setPosition(d->anchor_ypos_);
LYXERR(Debug::PAINTING, "metrics: "