fix off-by-two drawing error

[lyx.git] / src / mathed / MathMacro.h

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index dc90e10304543ebc907e4ef7173cc952736653e7..c09c1dd5315b3155c82b456d96ea7b2d02a4c2e7 100644 (file)
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -18,8 +18,9 @@
 #include "MacroTable.h"
 #include "MathData.h"
 
-namespace lyx {
+#include <map>
 
+namespace lyx {
 
 /// This class contains the data for a macro.
 class MathMacro : public InsetMathNest {
@@ -40,12 +41,12 @@ public:
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       int kerning() const;
+       int kerning(BufferView const * bv) const;
        /// get cursor position
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;
        ///
-       void edit(Cursor & cur, bool left);
+       void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
 
@@ -55,7 +56,7 @@ public:
        bool idxLast(Cursor &) const;
 
        ///
-       virtual bool notifyCursorLeaves(Cursor &);
+       virtual bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
        
        /// Remove cell (starting from 0)
        void removeArgument(pos_type pos);
@@ -87,7 +88,7 @@ public:
                
        enum DisplayMode {
                DISPLAY_INIT,
-               DISPLAY_NONGREEDY_INIT,
+               DISPLAY_INTERACTIVE_INIT,
                DISPLAY_UNFOLDED,
                DISPLAY_NORMAL,
        };
@@ -98,7 +99,6 @@ public:
        ///
        bool extraBraces() const { return displayMode_ == DISPLAY_NORMAL && arity() > 0; }
 
-       
        ///
        docstring name() const;
        ///
@@ -118,20 +118,22 @@ public:
                if (n <= int(nargs()))
                        optionals_ = n;
        }
-       
+       /// Return the maximal number of arguments the macro is greedy for.
+       size_t appetite() const { return appetite_; }
+
 protected:
        friend class MathData;
        friend class ArgumentProxy;
        friend class Cursor;
 
        /// update the display mode (should only be called after detaching arguments)
-       void setDisplayMode(DisplayMode mode);
+       void setDisplayMode(DisplayMode mode, int appetite = -1);
        /// compute the next display mode
-       DisplayMode computeDisplayMode(MetricsInfo const & mi) const;
+       DisplayMode computeDisplayMode() const;
        /// update macro definition
-       void updateMacro(MetricsInfo & mi);
+       void updateMacro(MacroContext const & mc);
        /// check if macro definition changed, argument changed etc. and adapt
-       void updateRepresentation(MetricsInfo & mi);
+       void updateRepresentation();
        /// empty macro, put arguments into args, possibly strip arity-attachedArgsNum_ empty ones.
        /// Includes the optional arguments.
        void detachArguments(std::vector<MathData> & args, bool strip);
@@ -139,28 +141,26 @@ protected:
        /// including the optional ones (even if it can be empty here)
        void attachArguments(std::vector<MathData> const & args, size_t arity, int optionals);
        ///
-       bool editing() { return editing_; }
-       ///
        MacroData const * macro() { return macro_; }
+       ///
+       bool editMetrics(BufferView const * bv) const;
 
 private:
        ///
        virtual Inset * clone() const;
-       /// the index of the cursor slice of the macro, or -1 if it is not edited
-       int cursorIdx(Cursor const & cur) const;
        ///
-       bool editMode(Cursor const & cur) const;
+       bool editMode(BufferView const * bv) const;
        
        /// name of macro
        docstring name_;
        /// current display mode
        DisplayMode displayMode_;
-       /// display mode before change
+       /// expanded macro with ArgumentProxies
        InsetMathSqrt expanded_;
+       /// macro definition with #1,#2,.. insets
+       MathData definition_;
        /// number of arguments that were really attached
        size_t attachedArgsNum_;
-       /// cursor position during last draw
-       idx_type previousCurIdx_;
        /// optional argument attached? (only in DISPLAY_NORMAL mode)
        size_t optionals_;
        /// fold mode to be set in next metrics call?
@@ -172,11 +172,31 @@ private:
        /// this might invalidate after metrics was called
        MacroData const * macro_;
        ///
-       bool editing_;
+       mutable std::map<BufferView const *, bool> editing_;
        ///
        std::string requires_;
        /// update macro representation
        bool needsUpdate_;
+       /// maximal number of arguments the macro is greedy for
+       size_t appetite_;
+
+public:
+       ///
+       bool completionSupported(Cursor const &) const;
+       ///
+       bool inlineCompletionSupported(Cursor const & cur) const;
+       ///
+       bool automaticInlineCompletion() const;
+       ///
+       bool automaticPopupCompletion() const;
+       ///
+       CompletionList const * createCompletionList(Cursor const & cur) const;
+       ///
+       docstring completionPrefix(Cursor const & cur) const;
+       ///
+       bool insertCompletion(Cursor & cur, docstring const & s, bool finished);
+       ///
+       void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
 };
 
 } // namespace lyx