X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=136e8209df73550deea4cafecec9f12118cc61d1;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=7de82ef77a28ec79bf60678615ac05aa270f95bc;hpb=797d87b4513088a66b17c7ac653b84e36ea80458;p=lyx.git diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index 7de82ef77a..136e8209df 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -5,8 +5,8 @@ #include "BufferView.h" #include "UpdateInset.h" -#include "BackStack.h" -#include "Timeout.h" +#include "commandtags.h" +#include "frontends/Timeout.h" #ifdef __GNUG__ #pragma interface @@ -36,7 +36,7 @@ struct BufferView::Pimpl : public Object { /// void redraw(); /// Return true if the cursor was fitted. - bool fitCursor(); + bool fitCursor(LyXText *); /// void redoCurrentBuffer(); /// @@ -44,9 +44,7 @@ struct BufferView::Pimpl : public Object { /// void update(); // - void update(BufferView::UpdateCodes); - /// - void gotoError(); + void update(LyXText *, BufferView::UpdateCodes); /// Update pixmap of screen void updateScreen(); /// @@ -63,6 +61,8 @@ struct BufferView::Pimpl : public Object { /// int scrollDown(long time); /// + void workAreaKeyPress(KeySym, unsigned int state); + /// void workAreaMotionNotify(int x, int y, unsigned int state); /// void workAreaButtonPress(int x, int y, unsigned int button); @@ -79,19 +79,19 @@ struct BufferView::Pimpl : public Object { /// void cursorToggle(); /// - void cursorPrevious(); + void cursorPrevious(LyXText *); /// - void cursorNext(); + void cursorNext(LyXText *); /// bool available() const; /// - void beforeChange(); + void beforeChange(LyXText *); /// - void savePosition(); + void savePosition(unsigned int i); /// - void restorePosition(); + void restorePosition(unsigned int i); /// - bool NoSavedPositions(); + bool isSavedPosition(unsigned int i); /// void setState(); /// @@ -119,6 +119,8 @@ struct BufferView::Pimpl : public Object { /// void center(); /// + bool Dispatch(kb_action action, string const & argument); + /// BufferView * bv_; /// LyXView * owner_; @@ -133,9 +135,9 @@ struct BufferView::Pimpl : public Object { /// Timeout cursor_timeout; /// - BackStack backstack; + int last_click_x; /// - int last_click_x, last_click_y; + int last_click_y; /// WorkArea * workarea_; /// @@ -147,5 +149,25 @@ struct BufferView::Pimpl : public Object { private: /// bool using_xterm_cursor; + + struct Position { + /// Filename + string filename; + /// Cursor paragraph Id + int par_id; + /// Cursor position + LyXParagraph::size_type par_pos; + /// + Position() : par_id(0), par_pos(0) {} + /// + Position(string const & f, int id, LyXParagraph::size_type pos) + : filename(f), par_id(id), par_pos(pos) {} + }; + std::vector saved_positions; + + void moveCursorUpdate(bool selecting); + /// Get next inset of this class from current cursor position + Inset * getInsetByCode(Inset::Code code); + void MenuInsertLyXFile(string const & filen); }; #endif