X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=47deee2bfd57af7b0c6a3ec68c5bc8bda97768d9;hb=82ce6a82ef2c1f1e52616e603914d4184a30e507;hp=bba675ec06853892d3591da903ad0ea43c1f9aad;hpb=c779cef938fc3720f4a912ba7356f9ffd9ff3233;p=lyx.git diff --git a/src/BufferView.h b/src/BufferView.h index bba675ec06..47deee2bfd 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -17,73 +17,98 @@ #endif #include FORMS_H_LOCATION -#include "BackStack.h" -#include "lyxtext.h" -#include "LaTeX.h" +#include "undo.h" +#include class LyXView; +class LyXText; +class TeXErrors; class Buffer; class LyXScreen; -class Inset; +class WorkArea; /// -class BufferView { +class BufferView : public noncopyable { public: + /// + enum UpdateCodes { + /// + UPDATE = 0, + /// + SELECT = 1, + /// + FITCUR = 2, + /// + CHANGE = 4 + }; + /// BufferView(LyXView * owner, int , int , int, int); /// ~BufferView(); /// - Buffer * buffer() const { return buffer_; } + Buffer * buffer() const; + /// + Painter & painter(); + /// + LyXScreen * screen() const; /// - FL_OBJECT * getWorkArea() { return work_area; } + WorkArea * workarea() const; /// void buffer(Buffer * b); /// + void resize(int, int, int, int); + /// void resize(); /// void redraw(); /// - void fitCursor(); + void fitCursor(LyXText *); /// void update(); - /// - void update(signed char f); - /// - void smallUpdate(signed char f); + // + void update(UpdateCodes uc); /// void updateScrollbar(); /// + Inset * checkInsetHit(LyXText *, int & x, int & y, + unsigned int button); + /// void redoCurrentBuffer(); /// int resizeCurrentBuffer(); /// void gotoError(); /// - void cursorPrevious(); + void cursorPrevious(LyXText *); /// - void cursorNext(); + void cursorNext(LyXText *); /// bool available() const; /// - LyXView * owner() const { return owner_; } - /// - LyXScreen * getScreen() { - fl_set_timer(timer_cursor, 0.4); - return screen; - } + LyXView * owner() const; /// void beforeChange(); /// void savePosition(); /// void restorePosition(); + /// + bool NoSavedPositions(); /** This holds the mapping between buffer paragraphs and screen rows. This should be private...but not yet. (Lgb) */ LyXText * text; /// - UpdatableInset * the_locking_inset; + LyXText * getLyXText() const; + /// + int workWidth() const; + /// + UpdatableInset * theLockingInset() const; + /// + void theLockingInset(UpdatableInset * inset); + /// + void updateInset(Inset * inset, bool mark_dirty); /// bool inset_slept; /// @@ -103,7 +128,7 @@ public: /// void selectLastWord(); /// - char * nextWord(float & value); + string const nextWord(float & value); /// void insertCorrectQuote(); /// @@ -138,127 +163,110 @@ public: void menuUndo(); /// void menuRedo(); +#ifndef NEW_INSETS /// void toggleFloat(); /// void openStuff(); +#endif /// void insertNote(); +#ifndef NEW_INSETS /// void allFloats(char flag, char figmar); +#endif /// removes all autodeletable insets bool removeAutoInsets(); /// void insertErrors(TeXErrors & terr); /// void setCursorFromRow(int row); - /** Insert an inset into the buffer - Insert inset into buffer, placing it in a layout of lout, - if no_table make sure that it doesn't end up in a table. */ - void insertInset(Inset * inset, string const & lout = string(), + /** Insert an inset into the buffer. + Placie it in a layout of lout, + if no_table make sure that it doesn't end up in a table. + */ + bool insertInset(Inset * inset, string const & lout = string(), bool no_table = false); /// open and lock an updatable inset - void open_new_inset(UpdatableInset * new_inset); - /// Inserts a lyx file at cursor position. Returns false if it fails. + bool open_new_inset(UpdatableInset * new_inset); + /** Inserts a lyx file at cursor position. + @return #false# if it fails. + */ bool insertLyXFile(string const & file); /// - int lockInset(UpdatableInset * inset); + bool lockInset(UpdatableInset * inset); /// - void showLockedInsetCursor(long x, long y, int asc, int desc); + void showLockedInsetCursor(int x, int y, int asc, int desc); /// - void hideLockedInsetCursor(long x, long y, int asc, int desc); + void hideLockedInsetCursor(); /// - void fitLockedInsetCursor(long x, long y, int asc, int desc); + void fitLockedInsetCursor(int x, int y, int asc, int desc); /// int unlockInset(UpdatableInset * inset); /// void lockedInsetStoreUndo(Undo::undo_kind kind); -private: - /// Update pixmap of screen - void updateScreen(); /// - int workAreaExpose(); + void showCursor(); /// - void create_view(int, int, int, int); + void hideCursor(); /// - Inset * checkInsetHit(int & x, int & y); - /// - int ScrollUp(long time); + void toggleSelection(bool = true); /// - int ScrollDown(long time); + void toggleToggle(); /// - void ScrollUpOnePage(long /*time*/); + void center(); + /// - void ScrollDownOnePage(long /*time*/); - -public: - /// A callback for the up arrow in the scrollbar. - static void UpCB(FL_OBJECT * ob, long); - - /// A callback for the slider in the scrollbar. - static void ScrollCB(FL_OBJECT * ob, long); - - /// A callback for the down arrow in the scrollbar. - static void DownCB(FL_OBJECT * ob, long); - + bool focus() const; /// - static void CursorToggleCB(FL_OBJECT * ob, long); - /** Work area free object handler - */ - static int work_area_handler(FL_OBJECT *, int event, - FL_Coord, FL_Coord, int key, void *xev); - + void focus(bool); /// - void SetState(); - -private: + bool active() const; /// - int WorkAreaMotionNotify(FL_OBJECT * ob, - Window win, - int w, int h, - XEvent * ev, void * d); + bool belowMouse() const; + /// A callback for the slider in the scrollbar. + void scrollCB(double); + /// - int WorkAreaSelectionNotify(FL_OBJECT *, Window win, - int /*w*/, int /*h*/, - XEvent * event, void * /*d*/); + void setState(); + /// - int WorkAreaButtonPress(FL_OBJECT * ob, - Window win, - int w, int h, - XEvent * ev, void * d); + void pushIntoUpdateList(Inset * i); /// - int WorkAreaButtonRelease(FL_OBJECT * ob, - Window win, - int w, int h, - XEvent * ev, void * d); + void workAreaExpose(); /// - LyXView * owner_; + void workAreaButtonPress(int x, int y, unsigned int button); /// - Buffer * buffer_; + void workAreaButtonRelease(int x, int y, unsigned int button); /// - LyXScreen * screen; + void workAreaMotionNotify(int x, int y, unsigned int state); /// - long current_scrollbar_value; + void doubleClick(int x, int y, unsigned int button); /// - bool lyx_focus; + void tripleClick(int x, int y, unsigned int button); /// - bool work_area_focus; + void enterView(); /// - FL_OBJECT * work_area; + void leaveView(); /// - FL_OBJECT * figinset_canvas; + bool ChangeRefs(string const & from, string const & to); /// - FL_OBJECT * scrollbar; + bool ChangeRefsIfUnique(string const & from, string const & to); /// - FL_OBJECT * button_down; + void pasteClipboard(bool asPara); /// - FL_OBJECT * button_up; + void stuffClipboard(string const &) const; +private: + struct Pimpl; /// - FL_OBJECT * timer_cursor; - /// - BackStack backstack; + friend struct BufferView::Pimpl; /// - int last_click_x, last_click_y; + Pimpl * pimpl_; }; + +/// +BufferView::UpdateCodes operator|(BufferView::UpdateCodes uc1, + BufferView::UpdateCodes uc2); + #endif