X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=2032a09ec374afe611052a9dd483ef4906743473;hb=24f8676130d1e0769db394b7142dae7eeb1d955e;hp=5ced20cb094a9fd8e00d97e8a1b95bb66f74e6a1;hpb=6e00a5436e2bd7ced9275e371159409211c225ef;p=lyx.git diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index 5ced20cb09..2032a09ec3 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -1,97 +1,89 @@ // -*- C++ -*- +/** + * \file BufferView_pimpl.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Asger Alstrup + * \author Alfredo Braustein + * \author Lars Gullik Bjønnes + * \author John Levon + * \author André Pönitz + * \author Dekel Tsur + * \author Jürgen Vigna + * + * Full author contact details are available in file CREDITS. + */ #ifndef BUFFERVIEW_PIMPL_H #define BUFFERVIEW_PIMPL_H -#include - +#include "errorlist.h" #include "BufferView.h" -#include "commandtags.h" #include "frontends/Timeout.h" -#include "WorkArea.h" -#include "box.h" -#include "insets/insetspecialchar.h" +#include "frontends/key_state.h" +#include "frontends/LyXKeySym.h" #include "support/types.h" -#ifdef __GNUG__ -#pragma interface -#endif +#include +#include + +class Change; class LyXView; class WorkArea; class LyXScreen; +class FuncRequest; /// -struct BufferView::Pimpl : public SigC::Object { +struct BufferView::Pimpl : public boost::signals::trackable { /// Pimpl(BufferView * i, LyXView * o, int xpos, int ypos, int width, int height); /// - Painter & painter(); + Painter & painter() const; + /// return the screen for this bview + LyXScreen & screen() const; /// void buffer(Buffer *); - /// - void resize(int xpos, int ypos, int width, int height); - /// - void resize(); - /// - void redraw(); /// Return true if the cursor was fitted. bool fitCursor(); /// void redoCurrentBuffer(); /// - int resizeCurrentBuffer(); + void resizeCurrentBuffer(); /// void update(); - // - void update(LyXText *, BufferView::UpdateCodes); - /// Update pixmap of screen - void updateScreen(); - /// - void workAreaExpose(); - /// - void updateScrollbar(); - /// - void scrollCB(double value); /** - * Returns an inset if inset was hit, or 0 if not. - * - * If hit, the coordinates are changed relative to the inset. + * Repaint pixmap. Used for when we've made a visible + * change but don't need the full update() logic */ - Inset * checkInsetHit(LyXText *, int & x, int & y); /// - int scrollUp(long time); + bool newFile(string const &, string const &, bool); /// - int scrollDown(long time); + bool loadLyXFile(string const &, bool); /// - void workAreaKeyPress(KeySym, unsigned int state); + void workAreaResize(); /// - void workAreaMotionNotify(int x, int y, unsigned int state); - /// - void workAreaButtonPress(int x, int y, unsigned int button); - /// - void workAreaButtonRelease(int x, int y, unsigned int button); + void updateScrollbar(); /// - void doubleClick(int x, int y, unsigned int button); + void scrollDocView(int value); + /** + * Wheel mouse scroll, move by multiples of text->defaultRowHeight(). + */ + void scroll(int lines); /// - void tripleClick(int x, int y, unsigned int button); + void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state); /// void selectionRequested(); /// void selectionLost(); /// - void enterView(); - /// - void leaveView(); - /// void cursorToggle(); /// - void cursorPrevious(LyXText *); - /// - void cursorNext(LyXText *); - /// bool available() const; + /// get the change at the cursor position + Change const getCurrentChange(); /// void beforeChange(LyXText *); /// @@ -101,70 +93,56 @@ struct BufferView::Pimpl : public SigC::Object { /// bool isSavedPosition(unsigned int i); /// - void setState(); -#if 0 - /// - void insetSleep(); - /// - void insetWakeup(); -#endif + void switchKeyMap(); /// void insetUnlock(); /// - bool focus() const; - /// - void focus(bool); - /// - bool active() const; - /// - bool belowMouse() const; - /// - void showCursor(); - /// - void hideCursor(); - /// - void toggleSelection(bool = true); - /// - void toggleToggle(); - /// void center(); /// - bool insertInset(Inset * inset, string const & lout = string()); + bool insertInset(InsetOld * inset, string const & lout = string()); + /// + void updateInset(InsetOld const * inset); + /// a function should be executed from the workarea + bool workAreaDispatch(FuncRequest const & ev); + /// a function should be executed + bool dispatch(FuncRequest const & ev); /// - void updateInset(Inset * inset, bool mark_dirty); + int top_y() const; /// - bool Dispatch(kb_action action, string const & argument); + void top_y(int y); 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; + /// the y coordinate of the top of the screen + int top_y_; + /// An error list (replaces the error insets) + ErrorList errorlist_; + /// add an error to the list + void addError(ErrorItem const &); + /// buffer errors signal connection + boost::signals::connection errorConnection_; + /// buffer messages signal connection + boost::signals::connection messageConnection_; + /// buffer busy status signal connection + boost::signals::connection busyConnection_; + /// buffer title changed signal connection + boost::signals::connection titleConnection_; + /// buffer reset timers signal connection + boost::signals::connection timerConnection_; + /// buffer readonly status changed signal connection + boost::signals::connection readonlyConnection_; + /// buffer closing signal connection + boost::signals::connection closingConnection_; + /// connect to signals in the given buffer + void connectBuffer(Buffer & buf); + /// disconnect from signals in the given buffer + void disconnectBuffer(); + /// track changes for the document + void trackChanges(); + /// notify readonly status + void showReadonly(bool); + /// friend class BufferView; - /// open and lock an updatable inset - bool open_new_inset(UpdatableInset * new_inset, bool behind = false); - /// - void specialChar(InsetSpecialChar::Kind); - /// - void newline(); - /// - void hfill(); - /// - void smartQuote(); - /// - void insertAndEditInset(Inset *); - /// - void gotoInset(std::vector const & codes, - bool same_content); - /// - void gotoInset(Inset::Code codes, bool same_content); + /// BufferView * bv_; /// @@ -174,14 +152,10 @@ private: /// boost::scoped_ptr screen_; /// - long current_scrollbar_value; + boost::scoped_ptr workarea_; /// Timeout cursor_timeout; /// - WorkArea workarea_; - /// - void pasteClipboard(bool asPara); - /// void stuffClipboard(string const &) const; /// bool using_xterm_cursor; @@ -201,13 +175,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); + InsetOld * getInsetByCode(InsetOld::Code code); /// void MenuInsertLyXFile(string const & filen); - /// - bool inset_slept; + /// our workarea + WorkArea & workarea() const; }; -#endif +#endif // BUFFERVIEW_PIMPL_H