X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=e011a08990783a5bcca3d6c504d0e3e83dc12e17;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=e7cc824406954b02ed213c5d6618f24eecaac550;hpb=2a0909f47bb7e211c335b3253372102d92714b05;p=lyx.git diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index e7cc824406..e011a08990 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -13,22 +13,18 @@ #include "BufferView.h" #include "frontends/Timeout.h" #include "frontends/key_state.h" -#include "frontends/mouse_state.h" #include "frontends/LyXKeySym.h" -#include "box.h" -#include "insets/insetspecialchar.h" #include "support/types.h" #include #include -#ifdef __GNUG__ -#pragma interface -#endif +class Change; class LyXView; class WorkArea; class LyXScreen; +class FuncRequest; /// struct BufferView::Pimpl : public boost::signals::trackable { @@ -37,8 +33,6 @@ struct BufferView::Pimpl : public boost::signals::trackable { int xpos, int ypos, int width, int height); /// Painter & painter() const; - /// return the work area for this bview - WorkArea & workarea() const; /// return the screen for this bview LyXScreen & screen() const; /// @@ -65,26 +59,11 @@ struct BufferView::Pimpl : public boost::signals::trackable { /// void scrollDocView(int value); /** - * Returns an inset if inset was hit, or 0 if not. - * - * If hit, the coordinates are changed relative to the inset. + * Wheel mouse scroll, move by multiples of text->defaultRowHeight(). */ - Inset * checkInsetHit(LyXText *, int & x, int & y); - /// wheel mouse scroll - int scroll(long time); - /// - void workAreaKeyPress(LyXKeySymPtr key, - key_modifier::state state); - /// - void workAreaMotionNotify(int x, int y, mouse_button::state state); - /// - void workAreaButtonPress(int x, int y, mouse_button::state button); + void scroll(int lines); /// - void workAreaButtonRelease(int x, int y, mouse_button::state button); - /// - void doubleClick(int x, int y, mouse_button::state button); - /// - void tripleClick(int x, int y, mouse_button::state button); + void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state); /// void selectionRequested(); /// @@ -93,6 +72,8 @@ struct BufferView::Pimpl : public boost::signals::trackable { void cursorToggle(); /// bool available() const; + /// get the change at the cursor position + Change const getCurrentChange(); /// void beforeChange(LyXText *); /// @@ -122,24 +103,11 @@ struct BufferView::Pimpl : public boost::signals::trackable { /// bool dispatch(FuncRequest const & ev); private: - /** - * Return the on-screen dimensions of the inset at the cursor. - * Pre-condition: the cursor must be at an inset. - */ - Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const; - /** - * check if the given co-ordinates are inside an inset at the - * given cursor, if one exists. If so, the inset is returned, - * and the co-ordinates are made relative. Otherwise, 0 is returned. - */ - Inset * checkInset(LyXText const & text, LyXCursor const & cursor, - int & x, int & y) const; + /// track changes for the document + void trackChanges(); + /// friend class BufferView; - /// open and lock an updatable inset - bool open_new_inset(UpdatableInset * new_inset, bool behind = false); - /// - void hfill(); /// BufferView * bv_; @@ -173,11 +141,11 @@ private: }; /// std::vector saved_positions; - /// - void moveCursorUpdate(bool selecting, bool fitcur = true); /// Get next inset of this class from current cursor position Inset * getInsetByCode(Inset::Code code); /// void MenuInsertLyXFile(string const & filen); + /// our workarea + WorkArea & workarea() const; }; #endif // BUFFERVIEW_PIMPL_H