Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index b9f19b1a3187a1200297ba274e991c2ab4f9c9d7..c7fb4c10bc74c2ad05a99bbd5103323b77c7a903 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,8 +15,10 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "DocumentClassPtr.h"
 #include "update_flags.h"
 
+#include "support/shared_ptr.h"
 #include "support/strfwd.h"
 #include "support/types.h"
 
@@ -124,7 +126,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 +161,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 +175,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 +190,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 +247,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();
 
@@ -308,6 +314,12 @@ 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;
+       ///
+       void makeDocumentClass();
 
 private:
        /// noncopyable
@@ -324,7 +336,7 @@ private:
        /// when it is allowed to scroll below the document.
        int minVisiblePart();
 
-       /// Search recursively for the the innermost inset that covers (x, y) position.
+       /// Search recursively for the innermost inset that covers (x, y) position.
        /// \retval 0 if no inset is found.
        Inset const * getCoveringInset(
                Text const & text, //< The Text where we start searching.
@@ -337,7 +349,7 @@ private:
        void updateHoveredInset() const;
 
        ///
-       void updateDocumentClass(DocumentClass const * const olddc);
+       void updateDocumentClass(DocumentClassConstPtr olddc);
        ///
        int width_;
        ///