Second step towards a more generic package off/auto/on handling:

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index c3e184bd4e4ec43b7b2384d34467701eabd10d1c..f6d5b1894baeca201817065cc28514681e76b281 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -124,7 +124,7 @@ public:
        /// \return Tool tip for the given position.
        docstring toolTip(int x, int y) const;
        /// \return the context menu for the given position.
-       docstring contextMenu(int x, int y) const;
+       std::string contextMenu(int x, int y) const;
 
        /// Save the current position as bookmark.
        /// if idx == 0, save to temp_bookmark
@@ -159,14 +159,13 @@ public:
        /// This method will automatically scroll and update the BufferView
        /// if needed.
        /// \param recenter Whether the cursor should be centered on screen
-       void showCursor(DocIterator const & dit, bool recenter = false);
+       void showCursor(DocIterator const & dit, bool recenter,
+               bool update);
        /// Scroll to the cursor.
        void scrollToCursor();
        /// Scroll to the cursor.
        /// \param recenter Whether the cursor should be centered on screen
        bool scrollToCursor(DocIterator const & dit, bool recenter);
-       /// LFUN_SCROLL Helper.
-       void lfunScroll(FuncRequest const & cmd);
        /// scroll down document by the given number of pixels.
        int scrollDown(int pixels);
        /// scroll up document by the given number of pixels.
@@ -174,7 +173,7 @@ public:
        /// scroll document by the given number of pixels.
        int scroll(int pixels);
        /// Scroll the view by a number of pixels.
-       void scrollDocView(int pixels);
+       void scrollDocView(int pixels, bool update);
        /// Set the cursor position based on the scrollbar one.
        void setCursorFromScrollbar();
 
@@ -189,9 +188,11 @@ public:
        size_t const & inlineCompletionUniqueChars() const;
        /// return the position in the buffer of the inline completion postfix.
        DocIterator const & inlineCompletionPos() const;
+       /// make sure inline completion position is OK
+       void resetInlineCompletionPos();
        /// set the inline completion postfix and its position in the buffer.
        /// Updates the updateFlags in \c cur.
-       void setInlineCompletion(Cursor & cur, DocIterator const & pos,
+       void setInlineCompletion(Cursor const & cur, DocIterator const & pos,
                docstring const & completion, size_t uniqueChars = 0);
 
        /// translate and insert a character, using the correct keymap.
@@ -244,6 +245,9 @@ public:
        void putSelectionAt(DocIterator const & cur,
                int length, bool backwards);
 
+       /// selects the item at cursor if its paragraph is empty.
+       bool selectIfEmpty(DocIterator & cur);
+
        /// update the internal \c ViewMetricsInfo.
        void updateMetrics();
 
@@ -259,7 +263,7 @@ public:
        CoordCache const & coordCache() const;
 
        ///
-       Point getPos(DocIterator const & dit, bool boundary) const;
+       Point getPos(DocIterator const & dit) const;
        /// is the paragraph of the cursor visible ?
        bool paragraphVisible(DocIterator const & dit) const;
        /// is the cursor currently visible in the view
@@ -308,14 +312,18 @@ public:
        Inset * editedInset(std::string const & name) const;
        /// Associate an inset associated with given dialog name.
        void editInset(std::string const & name, Inset * inset);
+       ///
+       void clearLastInset(Inset * inset) const;
+       /// Is the mouse hovering a clickable inset or element?
+       bool clickableInset() const;
 
 private:
        /// noncopyable
        BufferView(BufferView const &);
        void operator=(BufferView const &);
 
-       // the position relative to (0, baseline) of outermost paragraph
-       Point coordOffset(DocIterator const & dit, bool boundary) const;
+       /// the position relative to (0, baseline) of outermost paragraph
+       Point coordOffset(DocIterator const & dit) const;
        /// Update current paragraph metrics.
        /// \return true if no further update is needed.
        bool singleParUpdate();