more cursor dispatch

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 34b9b25cba5609e2a2b5ea1a212719e96cb98b0b..fa89ca527c11461e7d96e22631fd0ac5cb083d17 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,22 +15,27 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "support/types.h"
+
 #include <boost/utility.hpp>
 
 #include <string>
 
-
 class Buffer;
 class Change;
 class Encoding;
 class ErrorList;
 class FuncRequest;
+class InsetBase;
 class InsetOld;
 class Language;
+class LCursor;
 class LyXText;
 class LyXScreen;
 class LyXView;
 class Painter;
+class ParIterator;
+class PosIterator;
 class TeXErrors;
 class UpdatableInset;
 
@@ -85,11 +90,6 @@ public:
        bool fitCursor();
        /// perform pending painting updates
        void update();
-       /** update for a particular inset. Gets a pointer and not a
-        *  reference because we really need the pointer information
-        *  to find it in the buffer.
-        */
-       void updateInset(InsetOld const *);
        /// reset the scrollbar to reflect current view position
        void updateScrollbar();
        /// FIXME
@@ -98,9 +98,6 @@ public:
        /// FIXME
        bool available() const;
 
-       /// FIXME
-       void beforeChange(LyXText *);
-
        /// Save the current position as bookmark i
        void savePosition(unsigned int i);
        /// Restore the position from bookmark i
@@ -111,22 +108,11 @@ public:
        /// return the current change at the cursor
        Change const getCurrentChange();
 
-       /**
-        * This holds the mapping between buffer paragraphs and screen rows.
-        * This should be private...but not yet. (Lgb)
-        */
-       LyXText * text;
        /// return the lyxtext we are using
        LyXText * getLyXText() const;
 
-       /// Return the current inset we are "locked" in
-       UpdatableInset * theLockingInset() const;
-       /// lock the given inset FIXME: return value ?
-       bool lockInset(UpdatableInset * inset);
-       /// unlock the given inset
-       int unlockInset(UpdatableInset * inset);
-       /// unlock the currently locked inset
-       void insetUnlock();
+       /// update paragraph dialogs
+       void updateParagraphDialog();
 
        /// return the current encoding at the cursor
        Encoding const * getEncoding() const;
@@ -136,6 +122,8 @@ public:
 
        /// replace the currently selected word
        void replaceWord(std::string const & replacestring);
+       /// simple replacing. Use the font of the first selected character 
+       void replaceSelectionWithString(std::string const & str);
 
        /// move cursor to the named label
        void gotoLabel(std::string const & label);
@@ -156,7 +144,7 @@ public:
         * Insert an inset into the buffer.
         * Place it in a layout of lout,
         */
-       bool insertInset(InsetOld * inset, std::string const & lout = std::string());
+       bool insertInset(InsetBase * inset, std::string const & lout = std::string());
 
        /// Inserts a lyx file at cursor position. return false if it fails
        bool insertLyXFile(std::string const & file);
@@ -195,34 +183,27 @@ public:
        /// execute the given function
        bool dispatch(FuncRequest const & argument);
        
-       /// set target x position of cursor
-       void BufferView::x_target(int x);
-       /// return target x position of cursor
-       int BufferView::x_target() const;
+       /// clear the X selection
+       void unsetXSel();
+
+       /// access to full cursor
+       LCursor & cursor();
+       /// access to full cursor
+       LCursor const & cursor() const;
+       ///
+       LyXText * text() const;
+       ///
+       void setCursor(ParIterator const & par, lyx::pos_type pos);
+       ///
+       void putSelectionAt(PosIterator const & cur, int length, bool backwards);
 
 private:
-       /// Set the current locking inset
-       void theLockingInset(UpdatableInset * inset);
-
+       ///
        struct Pimpl;
+       ///
        friend struct BufferView::Pimpl;
-
+       ///
        Pimpl * pimpl_;
-
-       /**
-        * The target x position of the cursor. This is used for when
-        * we have text like :
-        *
-        * blah blah blah blah| blah blah blah
-        * blah blah blah
-        * blah blah blah blah blah blah
-        *
-        * When we move onto row 3, we would like to be vertically aligned
-        * with where we were in row 1, despite the fact that row 2 is
-        * shorter than x()
-        */
-       int x_target_;
-
 };
 
 #endif // BUFFERVIEW_H